diff --git a/PKGBUILD b/PKGBUILD index 628f00f..7ced8a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200107 +pkgver=20200124.1 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index ec0d1a6..7981845 100644 --- a/_service +++ b/_service @@ -1,6 +1,7 @@ - %ad + 20200124.1 + 20200124.1 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 0908fc8..8e9a295 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Jan 24 15:44:00 UTC 2020 - Adrian Schröter + +- fix SLE 15 configurations +- Fix dist autodetection for sle15-sp2 + +------------------------------------------------------------------- +Fri Jan 24 14:38:29 UTC 2020 - Adrian Schröter + +- Fix crash when using preinstall dependency expansion in OBS +- build-vm-kvm: use /boot/kernel.obs.build and /boot/initrd.obs.build + as fallback regardless of the platform to have a global fallback + kernel to use for distros that do not use the "kernel-obs-build" + package to provide the guests kernel and initrd as the system + binaries are not reliable for use in a guest system +- use abuild user if $NOROOTFORBUILD is set. + +------------------------------------------------------------------- +Wed Jan 22 12:30:41 UTC 2020 - Adrian Schröter + +- fix createrepo existens check for appimager and docker builds + in chroot +- support to use virt-make-fs for ext3 VM builds + +------------------------------------------------------------------- +Fri Jan 10 09:28:39 UTC 2020 - Adrian Schröter + +- Arch Linux zstd format support +- fix testbuild fail with latest rpm in SP2 and Leap 15.2 +- do not retry automatically on disk full error + ------------------------------------------------------------------- Tue Jan 7 12:54:44 UTC 2020 - Adrian Schröter diff --git a/build.dsc b/build.dsc index 1169e3b..9fcc7e3 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200107 +Version: 20200124.1 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 3b2f0e0..56f7150 100644 --- a/build.spec +++ b/build.spec @@ -18,11 +18,17 @@ # needsbinariesforbuild -Name: build +%if 0%{?fedora} || 0%{?rhel} +%define __pkg_name obs-build +%else +%define __pkg_name build +%endif + +Name: %{__pkg_name} Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building -Version: 20200107 +Version: 20200124.1 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,11 +73,11 @@ Recommends: /sbin/mkfs.ext3 %endif %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -Requires: build-mkbaselibs +Requires: %{__pkg_name}-mkbaselibs %endif %if 0%{?suse_version} > 1120 || 0%{?mdkversion} -Recommends: build-mkdrpms +Recommends: %{__pkg_name}-mkdrpms %endif %description @@ -95,7 +101,7 @@ Summary: Tools to generate delta rpms Group: Development/Tools/Building Requires: deltarpm # XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq -Requires: build +Requires: %{__pkg_name} %description mkdrpms This package contains the parts which may be installed in the inner build system @@ -110,11 +116,11 @@ for generating delta rpm packages. %package initvm-%{initvm_arch} Summary: Virtualization initializer for emulated cross architecture builds Group: Development/Tools/Building -Requires: build +Requires: %{__pkg_name} BuildRequires: gcc BuildRequires: glibc-devel -Provides: build-initvm -Obsoletes: build-initvm +Provides: %{__pkg_name}-initvm +Obsoletes: %{__pkg_name}-initvm %if 0%{?suse_version} > 1200 BuildRequires: glibc-devel-static %endif @@ -166,7 +172,7 @@ ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf %endif %if 0%{?sles_version} == 1110 -# this is SUSE SLE 11 +# this is SUSE SLE 11 ln -s sles11sp2.conf default.conf %endif # make sure that we have a config diff --git a/debian.changelog b/debian.changelog index a915593..b7342ee 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200107) unstable; urgency=low +build (20200124.1) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200107.tar.gz b/obs-build-20200107.tar.gz deleted file mode 100644 index 3252284..0000000 --- a/obs-build-20200107.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50bca045bb7aa3cff0addeb9b9410d20f0727659c1708cca7559533d8e022aeb -size 355877 diff --git a/obs-build-20200124.1.tar.gz b/obs-build-20200124.1.tar.gz new file mode 100644 index 0000000..b9387d7 --- /dev/null +++ b/obs-build-20200124.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:798d77a7f3c9fa7f6b12bdfeb0026774cd39c6b7f56f88181ae5d40a5ac35752 +size 340455