From ef3aeb1f0633a6b079b12d0c47e39a94e79f69ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 3 Feb 2020 09:48:14 +0000 Subject: [PATCH 01/13] test OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=406 --- build.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build.spec b/build.spec index 29a07c0..fae19c8 100644 --- a/build.spec +++ b/build.spec @@ -50,11 +50,13 @@ BuildRequires: tar %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate +BuildRequires: perl-TimeDate %endif Conflicts: bsdtar < 2.5.5 %if 0%{?suse_version} > 1000 # None of them are actually required for core features. # Perl helper scripts use them. +BuildRequires: perl(Date::Parse) Recommends: perl(Date::Language) Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent) @@ -199,12 +201,16 @@ test -e baselibs_global.conf || exit 1 %check for i in build build-* ; do bash -n $i || exit 1 ; done + +# expect unit tests +LANG=C prove -I. -v t/*.t + if [ `whoami` != "root" ]; then - echo "WARNING: Not building as root, tests did not run!" + echo "WARNING: Not building as root, build test did not run!" exit 0 fi if [ ! -f "%{buildroot}/usr/lib/build/configs/default.conf" ]; then - echo "WARNING: No default config, tests did not run!" + echo "WARNING: No default config, build test did not run!" exit 0 fi # get back the default.conf link @@ -213,6 +219,8 @@ cp -av %{buildroot}/usr/lib/build/configs/default.conf configs/ export BUILD_IGNORE_2ND_STAGE=1 # use our own build code export BUILD_DIR=$PWD + +# simple chroot build test cd test # target is autodetected %if 0%{?sles_version} From 0e088b61cbf9b988b8ab2cf93c34462c72b6e513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 3 Feb 2020 09:57:54 +0000 Subject: [PATCH 02/13] test OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=407 --- build.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.spec b/build.spec index fae19c8..c090400 100644 --- a/build.spec +++ b/build.spec @@ -53,10 +53,11 @@ Requires: perl-TimeDate BuildRequires: perl-TimeDate %endif Conflicts: bsdtar < 2.5.5 +BuildRequires: perl(Date::Parse) +BuildRequires: perl(Test::More) %if 0%{?suse_version} > 1000 # None of them are actually required for core features. # Perl helper scripts use them. -BuildRequires: perl(Date::Parse) Recommends: perl(Date::Language) Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent) From e0a2f4fa49a5a843efaaa4612dab5d8bb9f448de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 3 Feb 2020 10:01:45 +0000 Subject: [PATCH 03/13] test OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=408 --- build.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/build.spec b/build.spec index c090400..3520aa2 100644 --- a/build.spec +++ b/build.spec @@ -54,6 +54,7 @@ BuildRequires: perl-TimeDate %endif Conflicts: bsdtar < 2.5.5 BuildRequires: perl(Date::Parse) +BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) %if 0%{?suse_version} > 1000 # None of them are actually required for core features. From 5e6a8d07d94a9b072dc6abbfa1bc5e3a64dd0054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 3 Feb 2020 10:03:48 +0000 Subject: [PATCH 04/13] abort OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=409 --- build.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.spec b/build.spec index 3520aa2..fdd25cd 100644 --- a/build.spec +++ b/build.spec @@ -205,7 +205,7 @@ test -e baselibs_global.conf || exit 1 for i in build build-* ; do bash -n $i || exit 1 ; done # expect unit tests -LANG=C prove -I. -v t/*.t +LANG=C prove -I. -v t/*.t || exit 1 if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, build test did not run!" From be6e7a647a60a7f4c479c7163f4d291d46ec6cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 5 Feb 2020 08:32:14 +0000 Subject: [PATCH 05/13] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=411 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 10 ++++++++++ build.dsc | 2 +- build.spec | 18 +++++++++++------- debian.changelog | 2 +- obs-build-20200131.tar.gz | 3 --- obs-build-20200205.tar.gz | 3 +++ 8 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 obs-build-20200131.tar.gz create mode 100644 obs-build-20200205.tar.gz diff --git a/PKGBUILD b/PKGBUILD index f9fb693..5cf00eb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200131 +pkgver=20200205 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 3bf406c..17e6b84 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200131 - 20200131 + 20200205 + 20200205 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 5e9dca0..9450af1 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Feb 5 08:23:06 UTC 2020 - Adrian Schröter + +- 15.2 config: preinstall gcrypt deps again +- Recommends for Fedora based distros +- support obsgendiff funcationality +- various smaller code cleanups +- additional test cases for spec file parsing +- various fixes for cornercases during spec file parsing + ------------------------------------------------------------------- Fri Jan 31 11:49:34 UTC 2020 - Adrian Schröter diff --git a/build.dsc b/build.dsc index fae46c8..927876c 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200131 +Version: 20200205 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index fdd25cd..3b9218b 100644 --- a/build.spec +++ b/build.spec @@ -18,17 +18,17 @@ # needsbinariesforbuild -%if 0%{?fedora} || 0%{?rhel} -%define __pkg_name obs-build -%else +%if 0%{?suse_version} %define __pkg_name build +%else +%define __pkg_name obs-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: 20200131 +Version: 20200205 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,10 @@ BuildRequires: binutils BuildRequires: perl BuildRequires: psmisc BuildRequires: tar +# For testcases +BuildRequires: perl(Date::Parse) +BuildRequires: perl(Test::Harness) +BuildRequires: perl(Test::More) %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate @@ -56,7 +60,7 @@ Conflicts: bsdtar < 2.5.5 BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -%if 0%{?suse_version} > 1000 +%if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 # None of them are actually required for core features. # Perl helper scripts use them. Recommends: perl(Date::Language) @@ -204,8 +208,8 @@ test -e baselibs_global.conf || exit 1 %check for i in build build-* ; do bash -n $i || exit 1 ; done -# expect unit tests -LANG=C prove -I. -v t/*.t || exit 1 +# run perl module unit tests +LANG=C make test || exit 1 if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, build test did not run!" diff --git a/debian.changelog b/debian.changelog index bca5d82..9a66eef 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200131) unstable; urgency=low +build (20200205) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200131.tar.gz b/obs-build-20200131.tar.gz deleted file mode 100644 index 1daea7a..0000000 --- a/obs-build-20200131.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9442bb5d6c48f987bbf6a9678537e36c26abbc451a6f76b05a8849dd4981df08 -size 342012 diff --git a/obs-build-20200205.tar.gz b/obs-build-20200205.tar.gz new file mode 100644 index 0000000..0e4c840 --- /dev/null +++ b/obs-build-20200205.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eafe941911293df7d6f5f421f02249d078df26331760b03acd035bc8985bb1cb +size 344072 From 979d10ec8586d24ba7007155a19353cdbfd15554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 10 Feb 2020 08:30:58 +0000 Subject: [PATCH 06/13] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=412 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 7 +++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200205.tar.gz | 3 --- obs-build-20200210.tar.gz | 3 +++ 8 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20200205.tar.gz create mode 100644 obs-build-20200210.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 5cf00eb..901930b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200205 +pkgver=20200210 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 17e6b84..eaf6eb4 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200205 - 20200205 + 20200210 + 20200210 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 9450af1..a5d8ed8 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 10 08:25:12 UTC 2020 - Adrian Schröter + +- Spec parser: add support for %elif, %elifarch, %elifos +- Support rpm's %include statement (EXPERIMENTAL, known limitations) +- Do not do vminstall expansion in expanddeps unless --vm is used + ------------------------------------------------------------------- Wed Feb 5 08:23:06 UTC 2020 - Adrian Schröter diff --git a/build.dsc b/build.dsc index 927876c..4e59e3a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200205 +Version: 20200210 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 3b9218b..1f639ba 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: 20200205 +Version: 20200210 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 9a66eef..53dd556 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200205) unstable; urgency=low +build (20200210) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200205.tar.gz b/obs-build-20200205.tar.gz deleted file mode 100644 index 0e4c840..0000000 --- a/obs-build-20200205.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eafe941911293df7d6f5f421f02249d078df26331760b03acd035bc8985bb1cb -size 344072 diff --git a/obs-build-20200210.tar.gz b/obs-build-20200210.tar.gz new file mode 100644 index 0000000..4c53b87 --- /dev/null +++ b/obs-build-20200210.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a22ed1a2a6327cacba05be5c9a339886b09eb882173f9b1ebeb1058e2802ba30 +size 345778 From 6d1b55a9c146fe506511e9db33491b0998755203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2020 07:02:26 +0000 Subject: [PATCH 07/13] add cpio for debian OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=413 --- build.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.dsc b/build.dsc index 4e59e3a..373d82f 100644 --- a/build.dsc +++ b/build.dsc @@ -5,5 +5,5 @@ Binary: build Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) +Build-Depends: debhelper (>= 4), cpio From 7ee3b5fe74208952523d2b0cee53cb5144207cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2020 07:16:27 +0000 Subject: [PATCH 08/13] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=414 --- build.dsc | 2 +- debian.control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.dsc b/build.dsc index 373d82f..4e59e3a 100644 --- a/build.dsc +++ b/build.dsc @@ -5,5 +5,5 @@ Binary: build Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4), cpio +Build-Depends: debhelper (>= 4) diff --git a/debian.control b/debian.control index 4823cbe..9da92c2 100644 --- a/debian.control +++ b/debian.control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: obs-build Architecture: all -Depends: ${perl:Depends}, rpm +Depends: ${perl:Depends}, rpm, cpio Recommends: rpm2cpio Conflicts: build Replaces: build From ac1a1442e5adaa8cba53da02560549212bd7b030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2020 07:38:52 +0000 Subject: [PATCH 09/13] revert OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=415 --- debian.control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.control b/debian.control index 9da92c2..4823cbe 100644 --- a/debian.control +++ b/debian.control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: obs-build Architecture: all -Depends: ${perl:Depends}, rpm, cpio +Depends: ${perl:Depends}, rpm Recommends: rpm2cpio Conflicts: build Replaces: build From 270b4fe856ba57ebdc05701207a52d80b88790dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Mar 2020 13:44:38 +0000 Subject: [PATCH 10/13] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=416 --- PKGBUILD | 2 +- _service | 4 +- build.changes | 193 +------------------------------------- build.dsc | 2 +- build.spec | 59 +++--------- debian.changelog | 2 +- obs-build-20200210.tar.gz | 3 - obs-build-20200313.tar.gz | 3 + 8 files changed, 23 insertions(+), 245 deletions(-) delete mode 100644 obs-build-20200210.tar.gz create mode 100644 obs-build-20200313.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 901930b..08fcb66 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200210 +pkgver=20200313 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index eaf6eb4..f7a5860 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200210 - 20200210 + 20200313 + 20200313 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index a5d8ed8..96c5c74 100644 --- a/build.changes +++ b/build.changes @@ -1,194 +1,3 @@ -------------------------------------------------------------------- -Mon Feb 10 08:25:12 UTC 2020 - Adrian Schröter - -- Spec parser: add support for %elif, %elifarch, %elifos -- Support rpm's %include statement (EXPERIMENTAL, known limitations) -- Do not do vminstall expansion in expanddeps unless --vm is used - -------------------------------------------------------------------- -Wed Feb 5 08:23:06 UTC 2020 - Adrian Schröter - -- 15.2 config: preinstall gcrypt deps again -- Recommends for Fedora based distros -- support obsgendiff funcationality -- various smaller code cleanups -- additional test cases for spec file parsing -- various fixes for cornercases during spec file parsing - -------------------------------------------------------------------- -Fri Jan 31 11:49:34 UTC 2020 - Adrian Schröter - -- fix regression in && operator handling of rpm spec file parser -- Correctly expand macros defined with %global - -------------------------------------------------------------------- -Wed Jan 29 12:57:22 UTC 2020 - Adrian Schröter - -- 15.2 config: temporary revert gcrypt preinstall until distro has changed -- factory config: ignore libxtables for iproute2, not needed for ip tool -- Follow upstream rpm changes in regard to logical ops -- Fix macro expansion of lines containing newlines -- add missing header file to avoid compile warnings - -------------------------------------------------------------------- -Tue Jan 28 15:20:28 UTC 2020 - Adrian Schröter - -- support OBS-Milestone comment for kiwi -- switch to preinstall expansion for factory - -------------------------------------------------------------------- -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 - -- allow to enter an existing buildroot w/o recipe -- generate milestone files also for pure online media -- fix ccache setup of non-dotted compiler versions - -------------------------------------------------------------------- -Thu Dec 5 08:57:27 UTC 2019 - Adrian Schröter - -- qemu vm_type is running qemu system emulator now. Works for: - * aarch64 - * armv7l - * ppc64/ppc64le - * s390/s390x - * riscv64 - Note: this requires a kernel and initrd in build target via - kernel-obs-build mechanic -- various --shell improvements -- new --shell-cmd to run commands in chroot/KVM/Qemu/... directly -- raising minimal required memory in qemu mode to 512MB to be able - to run Linux kernel at least -- Normalize epoch 0 away when reading the module info -- Add systemd-nspawn backend (by Oleg Girko) - -------------------------------------------------------------------- -Thu Nov 14 13:18:14 UTC 2019 - Adrian Schröter - -- Add Fedora module parser -- Rpmmd parser: set up a dummy ExternEnt handler -- Add support for modules and publish flags -- add zstd to recommends -- Support rpm's new expression expansion syntax - -------------------------------------------------------------------- -Mon Sep 23 11:57:05 UTC 2019 - Adrian Schröter - -- build-recipe-dsc: Move all build results, not just *.deb and *.changes -- Mount /sys in chroot build -- vc: Do not open the editor if content is set -- adding leap 15.2 and SLE 15 SP2 configs -- Fix some rpmlint warnings -- return exit status 9 in the genbuildreqs case -- Export SYSTEMD_OFFLINE=1 to avoid failures from systemctl - -------------------------------------------------------------------- -Tue Jul 9 13:33:36 UTC 2019 - Adrian Schröter - -- fail build on preinstall failure -- avoid dependency errors on Fedora 30 -- fixes for simpleimage vm build support -- support zstd decompression with old rpms -- license tag fixes - -------------------------------------------------------------------- -Wed Jun 26 10:41:38 UTC 2019 - Dominique Leuenberger - -- configs/15.5.conf: add libzstd1 to preinstall list: RPM is being - extended to support zstd compression, which results in an - additionaly library being linked in. - -------------------------------------------------------------------- -Tue Jun 4 08:24:31 UTC 2019 - Adrian Schröter - -- configs/15.5.conf: remove brp-extract-appdata from support package -- add "-vv" parameter in case of debbuild - -------------------------------------------------------------------- -Thu Mar 21 09:35:43 UTC 2019 - Adrian Schröter - -- Filter out 'MACRO' from Requires(pre) -- Support createrepo_c's CREATEREPO_CHECKSUMS checksum cache -- Skip unsupported GPG check on ArchLinux -- Support #!BuildRequires dependencies -- Collect more statistics -- Install policy-rc.d to prevent services from starting on Debian - -------------------------------------------------------------------- -Wed Jan 23 14:42:17 UTC 2019 - Adrian Schröter - -- add initial SLE 15 SP1 config (bsc#1122895) - -------------------------------------------------------------------- -Mon Jan 21 12:00:48 UTC 2019 - Adrian Schröter - -- update factory config for libreadline8 switch -- cleanup 15.1 config with OBS specific stuff - * should not be used for plain build usage - * workarounds for kiwi should be fixed in packages - -------------------------------------------------------------------- -Thu Dec 6 15:23:11 UTC 2018 - Adrian Schröter - -- support jumping into KVM debug shells using "--vm-type=kvm --shell" -- adapt to new containerd CLI syntax -- Support a new 'UseOBSRepositories' flag -- lxc 3 support -- power9 fixes -- Generate a .milestone artifact for kiwi product builds -- Support rpm's new '^' separator in version comparison -- Allow to specify extra image repos with -- Rework release handling of containers - -------------------------------------------------------------------- -Mon Nov 26 09:24:17 UTC 2018 - Max Lin - -- Add Leap 15.1 config - -------------------------------------------------------------------- -Mon Oct 22 09:43:20 UTC 2018 - Adrian Schröter - -- require psmisc util for fuser -- Start debian support for kiwi images/containers -- Support building with unordered repositories for kiwi/docker builds -- Write the package list of the base container in kiwi container builds -- Support kiwi's "additionaltags" attribute (added in kiwi 9.15.3) -- Add some substitutes for the extra container tags -- Support "OBS-AddTag" directive to set multiple container tags in kiwi builds -- Archlinux updates -- SLE 12 SP4 config -- Appimage: support source file parsing - ------------------------------------------------------------------- Wed Aug 29 13:57:07 UTC 2018 - Adrian Schröter @@ -279,7 +88,7 @@ Wed Jan 24 16:04:35 UTC 2018 - adrian@suse.de Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de - Fixed Dockerfile repository parsing -- Improve file name check extractbuild (CVE-2017-14804, bsc#1069904) +- Improve file name check extractbuild - track release number of containers - Define SOURCEURL and PATCHURL macros - Keep preinstalled packages diff --git a/build.dsc b/build.dsc index 4e59e3a..d0866bd 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200210 +Version: 20200313 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 1f639ba..e74b0d1 100644 --- a/build.spec +++ b/build.spec @@ -18,17 +18,11 @@ # needsbinariesforbuild -%if 0%{?suse_version} -%define __pkg_name build -%else -%define __pkg_name obs-build -%endif - -Name: %{__pkg_name} +Name: build Summary: A Script to Build SUSE Linux RPMs -License: GPL-2.0-only OR GPL-3.0-only +License: GPL-2.0-or-later AND GPL-2.0-only Group: Development/Tools/Building -Version: 20200210 +Version: 20200313 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,28 +33,12 @@ Requires: bash Requires: binutils Requires: perl Requires: tar -# needed for fuser -Requires: psmisc -# just to verify existence of packages -BuildRequires: bash -BuildRequires: binutils -BuildRequires: perl -BuildRequires: psmisc -BuildRequires: tar -# For testcases -BuildRequires: perl(Date::Parse) -BuildRequires: perl(Test::Harness) -BuildRequires: perl(Test::More) %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate -BuildRequires: perl-TimeDate %endif Conflicts: bsdtar < 2.5.5 -BuildRequires: perl(Date::Parse) -BuildRequires: perl(Test::Harness) -BuildRequires: perl(Test::More) -%if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 +%if 0%{?suse_version} > 1000 # None of them are actually required for core features. # Perl helper scripts use them. Recommends: perl(Date::Language) @@ -75,17 +53,15 @@ Recommends: perl(YAML) Recommends: perl(YAML::LibYAML) Recommends: bsdtar Recommends: qemu-linux-user -Recommends: zstd -Recommends: /usr/bin/qemu-kvm Recommends: /sbin/mkfs.ext3 %endif %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -Requires: %{__pkg_name}-mkbaselibs +Requires: build-mkbaselibs %endif %if 0%{?suse_version} > 1120 || 0%{?mdkversion} -Recommends: %{__pkg_name}-mkdrpms +Recommends: build-mkdrpms %endif %description @@ -109,7 +85,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: %{__pkg_name} +Requires: build %description mkdrpms This package contains the parts which may be installed in the inner build system @@ -124,11 +100,11 @@ for generating delta rpm packages. %package initvm-%{initvm_arch} Summary: Virtualization initializer for emulated cross architecture builds Group: Development/Tools/Building -Requires: %{__pkg_name} +Requires: build BuildRequires: gcc BuildRequires: glibc-devel -Provides: %{__pkg_name}-initvm -Obsoletes: %{__pkg_name}-initvm +Provides: build-initvm +Obsoletes: build-initvm %if 0%{?suse_version} > 1200 BuildRequires: glibc-devel-static %endif @@ -180,7 +156,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 @@ -206,17 +182,12 @@ test -e baselibs_global.conf || exit 1 %endif %check -for i in build build-* ; do bash -n $i || exit 1 ; done - -# run perl module unit tests -LANG=C make test || exit 1 - if [ `whoami` != "root" ]; then - echo "WARNING: Not building as root, build test did not run!" + echo "WARNING: Not building as root, tests did not run!" exit 0 fi if [ ! -f "%{buildroot}/usr/lib/build/configs/default.conf" ]; then - echo "WARNING: No default config, build test did not run!" + echo "WARNING: No default config, tests did not run!" exit 0 fi # get back the default.conf link @@ -225,8 +196,6 @@ cp -av %{buildroot}/usr/lib/build/configs/default.conf configs/ export BUILD_IGNORE_2ND_STAGE=1 # use our own build code export BUILD_DIR=$PWD - -# simple chroot build test cd test # target is autodetected %if 0%{?sles_version} @@ -253,7 +222,7 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf %config(noreplace) /usr/lib/build/emulator/emulator.sh %{_mandir}/man1/build.1* %{_mandir}/man1/unrpm.1* -%{_mandir}/man1/buildvc.1* +%{_mandir}/man1/vc.1* %if 0%{?suse_version} %exclude /usr/lib/build/initvm.* %endif diff --git a/debian.changelog b/debian.changelog index 53dd556..704ce38 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200210) unstable; urgency=low +build (20200313) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200210.tar.gz b/obs-build-20200210.tar.gz deleted file mode 100644 index 4c53b87..0000000 --- a/obs-build-20200210.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a22ed1a2a6327cacba05be5c9a339886b09eb882173f9b1ebeb1058e2802ba30 -size 345778 diff --git a/obs-build-20200313.tar.gz b/obs-build-20200313.tar.gz new file mode 100644 index 0000000..4ef171f --- /dev/null +++ b/obs-build-20200313.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80388efecc8913ddecde983faf5ed19ab98f5da963a066ec500b8a4e008744eb +size 303960 From 62bc55bb42e54057d814e27211cd5f23e54e87f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Mar 2020 13:47:01 +0000 Subject: [PATCH 11/13] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=417 --- build.changes | 203 +++++++++++++++++++++++++++++++++++++- build.spec | 57 ++++++++--- obs-build-20200313.tar.gz | 4 +- 3 files changed, 248 insertions(+), 16 deletions(-) diff --git a/build.changes b/build.changes index 96c5c74..13588c9 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,204 @@ +------------------------------------------------------------------- +Fri Mar 13 13:41:20 UTC 2020 - Adrian Schröter + +- Leap 15.2 config update (libzstd1 for rpm) +- handle obscpio extraction error as fatal +- Return correct exit code from systemd-nspawn build +- Spec parser: do not parse included files from end to start +- running disk full check also outside of VM +- run disk full check only for chroot + +------------------------------------------------------------------- +Mon Feb 10 08:25:12 UTC 2020 - Adrian Schröter + +- Spec parser: add support for %elif, %elifarch, %elifos +- Support rpm's %include statement (EXPERIMENTAL, known limitations) +- Do not do vminstall expansion in expanddeps unless --vm is used + +------------------------------------------------------------------- +Wed Feb 5 08:23:06 UTC 2020 - Adrian Schröter + +- 15.2 config: preinstall gcrypt deps again +- Recommends for Fedora based distros +- support obsgendiff funcationality +- various smaller code cleanups +- additional test cases for spec file parsing +- various fixes for cornercases during spec file parsing + +------------------------------------------------------------------- +Fri Jan 31 11:49:34 UTC 2020 - Adrian Schröter + +- fix regression in && operator handling of rpm spec file parser +- Correctly expand macros defined with %global + +------------------------------------------------------------------- +Wed Jan 29 12:57:22 UTC 2020 - Adrian Schröter + +- 15.2 config: temporary revert gcrypt preinstall until distro has changed +- factory config: ignore libxtables for iproute2, not needed for ip tool +- Follow upstream rpm changes in regard to logical ops +- Fix macro expansion of lines containing newlines +- add missing header file to avoid compile warnings + +------------------------------------------------------------------- +Tue Jan 28 15:20:28 UTC 2020 - Adrian Schröter + +- support OBS-Milestone comment for kiwi +- switch to preinstall expansion for factory + +------------------------------------------------------------------- +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 + +- allow to enter an existing buildroot w/o recipe +- generate milestone files also for pure online media +- fix ccache setup of non-dotted compiler versions + +------------------------------------------------------------------- +Thu Dec 5 08:57:27 UTC 2019 - Adrian Schröter + +- qemu vm_type is running qemu system emulator now. Works for: + * aarch64 + * armv7l + * ppc64/ppc64le + * s390/s390x + * riscv64 + Note: this requires a kernel and initrd in build target via + kernel-obs-build mechanic +- various --shell improvements +- new --shell-cmd to run commands in chroot/KVM/Qemu/... directly +- raising minimal required memory in qemu mode to 512MB to be able + to run Linux kernel at least +- Normalize epoch 0 away when reading the module info +- Add systemd-nspawn backend (by Oleg Girko) + +------------------------------------------------------------------- +Thu Nov 14 13:18:14 UTC 2019 - Adrian Schröter + +- Add Fedora module parser +- Rpmmd parser: set up a dummy ExternEnt handler +- Add support for modules and publish flags +- add zstd to recommends +- Support rpm's new expression expansion syntax + +------------------------------------------------------------------- +Mon Sep 23 11:57:05 UTC 2019 - Adrian Schröter + +- build-recipe-dsc: Move all build results, not just *.deb and *.changes +- Mount /sys in chroot build +- vc: Do not open the editor if content is set +- adding leap 15.2 and SLE 15 SP2 configs +- Fix some rpmlint warnings +- return exit status 9 in the genbuildreqs case +- Export SYSTEMD_OFFLINE=1 to avoid failures from systemctl + +------------------------------------------------------------------- +Tue Jul 9 13:33:36 UTC 2019 - Adrian Schröter + +- fail build on preinstall failure +- avoid dependency errors on Fedora 30 +- fixes for simpleimage vm build support +- support zstd decompression with old rpms +- license tag fixes + +------------------------------------------------------------------- +Wed Jun 26 10:41:38 UTC 2019 - Dominique Leuenberger + +- configs/15.5.conf: add libzstd1 to preinstall list: RPM is being + extended to support zstd compression, which results in an + additionaly library being linked in. + +------------------------------------------------------------------- +Tue Jun 4 08:24:31 UTC 2019 - Adrian Schröter + +- configs/15.5.conf: remove brp-extract-appdata from support package +- add "-vv" parameter in case of debbuild + +------------------------------------------------------------------- +Thu Mar 21 09:35:43 UTC 2019 - Adrian Schröter + +- Filter out 'MACRO' from Requires(pre) +- Support createrepo_c's CREATEREPO_CHECKSUMS checksum cache +- Skip unsupported GPG check on ArchLinux +- Support #!BuildRequires dependencies +- Collect more statistics +- Install policy-rc.d to prevent services from starting on Debian + +------------------------------------------------------------------- +Wed Jan 23 14:42:17 UTC 2019 - Adrian Schröter + +- add initial SLE 15 SP1 config (bsc#1122895) + +------------------------------------------------------------------- +Mon Jan 21 12:00:48 UTC 2019 - Adrian Schröter + +- update factory config for libreadline8 switch +- cleanup 15.1 config with OBS specific stuff + * should not be used for plain build usage + * workarounds for kiwi should be fixed in packages + +------------------------------------------------------------------- +Thu Dec 6 15:23:11 UTC 2018 - Adrian Schröter + +- support jumping into KVM debug shells using "--vm-type=kvm --shell" +- adapt to new containerd CLI syntax +- Support a new 'UseOBSRepositories' flag +- lxc 3 support +- power9 fixes +- Generate a .milestone artifact for kiwi product builds +- Support rpm's new '^' separator in version comparison +- Allow to specify extra image repos with +- Rework release handling of containers + +------------------------------------------------------------------- +Mon Nov 26 09:24:17 UTC 2018 - Max Lin + +- Add Leap 15.1 config + +------------------------------------------------------------------- +Mon Oct 22 09:43:20 UTC 2018 - Adrian Schröter + +- require psmisc util for fuser +- Start debian support for kiwi images/containers +- Support building with unordered repositories for kiwi/docker builds +- Write the package list of the base container in kiwi container builds +- Support kiwi's "additionaltags" attribute (added in kiwi 9.15.3) +- Add some substitutes for the extra container tags +- Support "OBS-AddTag" directive to set multiple container tags in kiwi builds +- Archlinux updates +- SLE 12 SP4 config +- Appimage: support source file parsing + ------------------------------------------------------------------- Wed Aug 29 13:57:07 UTC 2018 - Adrian Schröter @@ -88,7 +289,7 @@ Wed Jan 24 16:04:35 UTC 2018 - adrian@suse.de Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de - Fixed Dockerfile repository parsing -- Improve file name check extractbuild +- Improve file name check extractbuild (CVE-2017-14804, bsc#1069904) - track release number of containers - Define SOURCEURL and PATCHURL macros - Keep preinstalled packages diff --git a/build.spec b/build.spec index e74b0d1..445d7a2 100644 --- a/build.spec +++ b/build.spec @@ -18,9 +18,15 @@ # needsbinariesforbuild -Name: build +%if 0%{?suse_version} +%define __pkg_name build +%else +%define __pkg_name obs-build +%endif + +Name: %{__pkg_name} Summary: A Script to Build SUSE Linux RPMs -License: GPL-2.0-or-later AND GPL-2.0-only +License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building Version: 20200313 Release: 0 @@ -33,12 +39,28 @@ Requires: bash Requires: binutils Requires: perl Requires: tar +# needed for fuser +Requires: psmisc +# just to verify existence of packages +BuildRequires: bash +BuildRequires: binutils +BuildRequires: perl +BuildRequires: psmisc +BuildRequires: tar +# For testcases +BuildRequires: perl(Date::Parse) +BuildRequires: perl(Test::Harness) +BuildRequires: perl(Test::More) %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate +BuildRequires: perl-TimeDate %endif Conflicts: bsdtar < 2.5.5 -%if 0%{?suse_version} > 1000 +BuildRequires: perl(Date::Parse) +BuildRequires: perl(Test::Harness) +BuildRequires: perl(Test::More) +%if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 # None of them are actually required for core features. # Perl helper scripts use them. Recommends: perl(Date::Language) @@ -53,15 +75,17 @@ Recommends: perl(YAML) Recommends: perl(YAML::LibYAML) Recommends: bsdtar Recommends: qemu-linux-user +Recommends: zstd +Recommends: /usr/bin/qemu-kvm 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 @@ -85,7 +109,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 @@ -100,11 +124,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 @@ -156,7 +180,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 @@ -182,12 +206,17 @@ test -e baselibs_global.conf || exit 1 %endif %check +for i in build build-* ; do bash -n $i || exit 1 ; done + +# run perl module unit tests +LANG=C make test || exit 1 + if [ `whoami` != "root" ]; then - echo "WARNING: Not building as root, tests did not run!" + echo "WARNING: Not building as root, build test did not run!" exit 0 fi if [ ! -f "%{buildroot}/usr/lib/build/configs/default.conf" ]; then - echo "WARNING: No default config, tests did not run!" + echo "WARNING: No default config, build test did not run!" exit 0 fi # get back the default.conf link @@ -196,6 +225,8 @@ cp -av %{buildroot}/usr/lib/build/configs/default.conf configs/ export BUILD_IGNORE_2ND_STAGE=1 # use our own build code export BUILD_DIR=$PWD + +# simple chroot build test cd test # target is autodetected %if 0%{?sles_version} @@ -222,7 +253,7 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf %config(noreplace) /usr/lib/build/emulator/emulator.sh %{_mandir}/man1/build.1* %{_mandir}/man1/unrpm.1* -%{_mandir}/man1/vc.1* +%{_mandir}/man1/buildvc.1* %if 0%{?suse_version} %exclude /usr/lib/build/initvm.* %endif diff --git a/obs-build-20200313.tar.gz b/obs-build-20200313.tar.gz index 4ef171f..39b9660 100644 --- a/obs-build-20200313.tar.gz +++ b/obs-build-20200313.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80388efecc8913ddecde983faf5ed19ab98f5da963a066ec500b8a4e008744eb -size 303960 +oid sha256:d688f1ca95b26255b820df3df6cbe00f863e2c35e2c652d7816c12b0cfb97ad4 +size 345305 From 960fe533465aa6c7803c9f2cd585a916048f85b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Mar 2020 14:12:51 +0000 Subject: [PATCH 12/13] hack OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=418 --- build.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.spec b/build.spec index 445d7a2..b31aa28 100644 --- a/build.spec +++ b/build.spec @@ -18,10 +18,10 @@ # needsbinariesforbuild -%if 0%{?suse_version} -%define __pkg_name build -%else +%if !0%{?suse_version} %define __pkg_name obs-build +%else +%define __pkg_name build %endif Name: %{__pkg_name} From a5f9f90fa420f6f8dc19171eb97a8ebae1c9f00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 20 May 2020 16:42:18 +0000 Subject: [PATCH 13/13] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=419 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 24 ++++++++++++++++++++++++ build.dsc | 2 +- build.spec | 8 ++++---- debian.changelog | 2 +- obs-build-20200313.tar.gz | 3 --- obs-build-20200520.tar.gz | 3 +++ 8 files changed, 36 insertions(+), 12 deletions(-) delete mode 100644 obs-build-20200313.tar.gz create mode 100644 obs-build-20200520.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 08fcb66..4cfaba9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200313 +pkgver=20200520 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index f7a5860..aa7e350 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200313 - 20200313 + 20200520 + 20200520 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 13588c9..e893734 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sun May 17 14:32:52 UTC 2020 - coolo@suse.com + +- enable sysrq operations on boot +- Set kvm_serial_device to virtio-serial in the fixup +- Split console arg setting code into kvm_add_console_args +- Update for zVM to make container builds work. +- Write to /proc/sys/kernel/hostname if the hostname command is not available +- Use --cgroup-manager=cgroupfs when calling podman +- Also squash by default in podman builds +- Support different interpreters in prein/postin scriptlets +- Use grep -E instead of egrep to check for the needsbinariesforbuild flag +- Use new Build::Intrepo module +- Add new Intrepo module to read/write build's internal repo format +- remove .gz from _ccache archive as it is no longer compressed +- Add support for Arch in build-recipe-kiwi +- Autodetect whether to use --pipe option of systemd-nspawn. +- Split parse_depfile() from readdeps() +- enable compression on ccache +- add bugzilla numbers for s390 workaround +- extend --ccache to generate _ccache.tar.gz and implement --pkg-ccache +- disable transparent_hugepage on s390x guests for now, causes hangs +- set buildflavor also for Build::parse + ------------------------------------------------------------------- Fri Mar 13 13:41:20 UTC 2020 - Adrian Schröter diff --git a/build.dsc b/build.dsc index d0866bd..6258ca8 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200313 +Version: 20200520 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index b31aa28..1e4e108 100644 --- a/build.spec +++ b/build.spec @@ -18,17 +18,17 @@ # needsbinariesforbuild -%if !0%{?suse_version} -%define __pkg_name obs-build -%else +%if 0%{?suse_version} %define __pkg_name build +%else +%define __pkg_name obs-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: 20200313 +Version: 20200520 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 704ce38..fc5ef00 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200313) unstable; urgency=low +build (20200520) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200313.tar.gz b/obs-build-20200313.tar.gz deleted file mode 100644 index 39b9660..0000000 --- a/obs-build-20200313.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d688f1ca95b26255b820df3df6cbe00f863e2c35e2c652d7816c12b0cfb97ad4 -size 345305 diff --git a/obs-build-20200520.tar.gz b/obs-build-20200520.tar.gz new file mode 100644 index 0000000..c70be62 --- /dev/null +++ b/obs-build-20200520.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d37d79f55abb400d488ae0f069e2cc62019345cf2955f69f97febc2d6b38423 +size 347598