From ff7c4efa6420783802fa1d8e9e573afe983c7361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 20 Jan 2020 08:36:50 +0000 Subject: [PATCH 1/5] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=396 --- PKGBUILD | 2 +- _service | 3 ++- build.changes | 13 +++++++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200107.tar.gz | 3 --- obs-build-20200110.tar.gz | 3 +++ 8 files changed, 22 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20200107.tar.gz create mode 100644 obs-build-20200110.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 628f00fa..3602b76b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200107 +pkgver=20200110 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index ec0d1a66..debbfbd2 100644 --- a/_service +++ b/_service @@ -1,6 +1,7 @@ - %ad + 20200110 + 20200110 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 0908fc85..b4c3a6ca 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jan 20 08:33:37 UTC 2020 - Adrian Schröter + +- fix source archive, last submit did not contain changes + => switching to git tags now to avoid this in future + +------------------------------------------------------------------- +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 1169e3b1..ee9e640a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200107 +Version: 20200110 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 3b2f0e07..09842de8 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build 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: 20200110 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index a9155936..0962f1fc 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200107) unstable; urgency=low +build (20200110) 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 3252284f..00000000 --- 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-20200110.tar.gz b/obs-build-20200110.tar.gz new file mode 100644 index 00000000..6aa45857 --- /dev/null +++ b/obs-build-20200110.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df7b26baddc2e3af962d79da420fc8ebb8351b9eba5612f15a66848e08da3533 +size 356411 From c5cba3da1a6e3d55db21575d280fadad8a324480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 22 Jan 2020 12:36:54 +0000 Subject: [PATCH 2/5] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=397 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 7 ++++--- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200110.tar.gz | 3 --- obs-build-20200122.tar.gz | 3 +++ 8 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 obs-build-20200110.tar.gz create mode 100644 obs-build-20200122.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3602b76b..bce0228e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200110 +pkgver=20200122 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index debbfbd2..52e5bbf1 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200110 - 20200110 + 20200122 + 20200122 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index b4c3a6ca..7fc7166f 100644 --- a/build.changes +++ b/build.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Mon Jan 20 08:33:37 UTC 2020 - Adrian Schröter +Wed Jan 22 12:30:41 UTC 2020 - Adrian Schröter -- fix source archive, last submit did not contain changes - => switching to git tags now to avoid this in future +- 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 diff --git a/build.dsc b/build.dsc index ee9e640a..90e2adf7 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200110 +Version: 20200122 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 09842de8..d05bb5a8 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building -Version: 20200110 +Version: 20200122 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 0962f1fc..179af396 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200110) unstable; urgency=low +build (20200122) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200110.tar.gz b/obs-build-20200110.tar.gz deleted file mode 100644 index 6aa45857..00000000 --- a/obs-build-20200110.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df7b26baddc2e3af962d79da420fc8ebb8351b9eba5612f15a66848e08da3533 -size 356411 diff --git a/obs-build-20200122.tar.gz b/obs-build-20200122.tar.gz new file mode 100644 index 00000000..bea31653 --- /dev/null +++ b/obs-build-20200122.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:244d6d126a965818a97e2a651efc68aa50675903dd0f0736a3a1107f9d105aa9 +size 356779 From d8ce548cda8b567048ac7052b85645b7b86e77d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 22 Jan 2020 12:39:17 +0000 Subject: [PATCH 3/5] new name on fedora OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=398 --- build.spec | 22 ++++++++++++++-------- obs-build-20200122.tar.gz | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/build.spec b/build.spec index d05bb5a8..815cfe6a 100644 --- a/build.spec +++ b/build.spec @@ -18,7 +18,13 @@ # 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 @@ -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/obs-build-20200122.tar.gz b/obs-build-20200122.tar.gz index bea31653..8b63fc42 100644 --- a/obs-build-20200122.tar.gz +++ b/obs-build-20200122.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:244d6d126a965818a97e2a651efc68aa50675903dd0f0736a3a1107f9d105aa9 -size 356779 +oid sha256:df2cbc1a8a9c53595b2e46fdc6977c574c6c3cb9f67f3278f38f3ba1c186d97c +size 357281 From 4485152f5da785e644c2162297bcd0ad72908cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jan 2020 14:43:57 +0000 Subject: [PATCH 4/5] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=399 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 11 +++++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200122.tar.gz | 3 --- obs-build-20200124.tar.gz | 3 +++ 8 files changed, 20 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20200122.tar.gz create mode 100644 obs-build-20200124.tar.gz diff --git a/PKGBUILD b/PKGBUILD index bce0228e..82660d19 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200122 +pkgver=20200124 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 52e5bbf1..2dd18acc 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200122 - 20200122 + 20200124 + 20200124 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 7fc7166f..cffbaa8d 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/build.dsc b/build.dsc index 90e2adf7..1b723094 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200122 +Version: 20200124 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 815cfe6a..2496c6ca 100644 --- a/build.spec +++ b/build.spec @@ -28,7 +28,7 @@ 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: 20200122 +Version: 20200124 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 179af396..67d80257 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200122) unstable; urgency=low +build (20200124) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200122.tar.gz b/obs-build-20200122.tar.gz deleted file mode 100644 index 8b63fc42..00000000 --- a/obs-build-20200122.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df2cbc1a8a9c53595b2e46fdc6977c574c6c3cb9f67f3278f38f3ba1c186d97c -size 357281 diff --git a/obs-build-20200124.tar.gz b/obs-build-20200124.tar.gz new file mode 100644 index 00000000..6815c28e --- /dev/null +++ b/obs-build-20200124.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f73a37ff00a7120d97562db9fce6cbf94d2cc79c7065a6ea01fd876ef4438c2 +size 357408 From 735f67694743c983d40cb9b8a00141010c372674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 24 Jan 2020 15:51:52 +0000 Subject: [PATCH 5/5] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=400 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 6 ++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200124.1.tar.gz | 3 +++ obs-build-20200124.tar.gz | 3 --- 8 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 obs-build-20200124.1.tar.gz delete mode 100644 obs-build-20200124.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 82660d19..7ced8a22 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200124 +pkgver=20200124.1 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 2dd18acc..79818457 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200124 - 20200124 + 20200124.1 + 20200124.1 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index cffbaa8d..8e9a2956 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/build.dsc b/build.dsc index 1b723094..9fcc7e37 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200124 +Version: 20200124.1 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 2496c6ca..56f7150a 100644 --- a/build.spec +++ b/build.spec @@ -28,7 +28,7 @@ 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: 20200124 +Version: 20200124.1 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 67d80257..b7342eed 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200124) 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-20200124.1.tar.gz b/obs-build-20200124.1.tar.gz new file mode 100644 index 00000000..b9387d76 --- /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 diff --git a/obs-build-20200124.tar.gz b/obs-build-20200124.tar.gz deleted file mode 100644 index 6815c28e..00000000 --- a/obs-build-20200124.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f73a37ff00a7120d97562db9fce6cbf94d2cc79c7065a6ea01fd876ef4438c2 -size 357408