From 9d708c81733fbd94335ed4c14369ca384d8b1db3 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 28 Jan 2021 08:22:33 +0000 Subject: [PATCH 1/6] test Rev openSUSE:Tools/430 Md5 aafe04cf564a6a48911a8d2c6ba920c5 2021-01-28 08:22:33 adrianSuSE None --- build.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build.spec b/build.spec index 76c044a3..3a4b1820 100644 --- a/build.spec +++ b/build.spec @@ -48,19 +48,16 @@ BuildRequires: perl BuildRequires: psmisc BuildRequires: tar # For testcases -BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos_version} Requires: perl-MD5 -Requires: perl-TimeDate -BuildRequires: perl-TimeDate +%else +BuildRequires: perl(Date::Parse) %endif Conflicts: bsdtar < 2.5.5 -BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -BuildRequires: perl(YAML) BuildRequires: perl(YAML::LibYAML) %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. @@ -73,7 +70,6 @@ Recommends: perl(Time::Zone) Recommends: perl(URI) Recommends: perl(XML::Parser) Recommends: perl(Net::SSL) -Recommends: perl(YAML) Recommends: perl(YAML::LibYAML) Recommends: bsdtar Recommends: qemu-linux-user From 4677eb1d958631cd4138fc32cd241325329b5308 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 28 Jan 2021 12:47:24 +0000 Subject: [PATCH 2/6] re-add TimeDate Rev openSUSE:Tools/431 Md5 bf52798a34614e4a94622f069924cfef 2021-01-28 12:47:24 adrianSuSE None --- build.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.spec b/build.spec index 3a4b1820..e02e395f 100644 --- a/build.spec +++ b/build.spec @@ -52,6 +52,8 @@ BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) %if 0%{?fedora} || 0%{?centos_version} Requires: perl-MD5 +Requires: perl-TimeDate +BuildRequires: perl-TimeDate %else BuildRequires: perl(Date::Parse) %endif From 2e2a78fef0d7ae007255a41af824913578064ff4 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 17 Feb 2021 12:14:20 +0000 Subject: [PATCH 3/6] fix Rev openSUSE:Tools/432 Md5 84d7a1239dae7de9b378d8af4886c890 2021-02-17 12:14:20 adrianSuSE None --- build.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.spec b/build.spec index e02e395f..c9423143 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build +# spec file for package obs-build # # Copyright (c) 2021 SUSE LLC # @@ -61,23 +61,23 @@ Conflicts: bsdtar < 2.5.5 BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) BuildRequires: perl(YAML::LibYAML) -%if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 +%if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 || 0%{?almalinux_version} >= 800 # None of them are actually required for core features. # Perl helper scripts use them. Recommends: perl(Date::Language) +Recommends: /sbin/mkfs.ext3 +Recommends: /usr/bin/qemu-kvm +Recommends: bsdtar +Recommends: qemu-linux-user +Recommends: zstd Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent) +Recommends: perl(Net::SSL) Recommends: perl(Pod::Usage) Recommends: perl(Time::Zone) Recommends: perl(URI) Recommends: perl(XML::Parser) -Recommends: perl(Net::SSL) 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} @@ -126,6 +126,7 @@ for generating delta rpm packages. %if "%{_host_cpu}" == "i686" %define initvm_arch i586 %endif + %package initvm-%{initvm_arch} Summary: Virtualization initializer for emulated cross architecture builds Group: Development/Tools/Building From 0925d635a14bdca3ea27c39369e4cf5c2f5a3445 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 21 May 2021 08:58:16 +0000 Subject: [PATCH 4/6] test Rev openSUSE:Tools/433 Md5 5b3d8bb2acd0495840836f7b24e61362 2021-05-21 08:58:16 adrianSuSE None --- build.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.spec b/build.spec index c9423143..7bd82c7b 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package obs-build +# spec file for package build # # Copyright (c) 2021 SUSE LLC # @@ -50,7 +50,7 @@ BuildRequires: tar # For testcases BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -%if 0%{?fedora} || 0%{?centos_version} +%if 0%{?fedora} || 0%{?centos_version} || 0%{?almalinux_version} Requires: perl-MD5 Requires: perl-TimeDate BuildRequires: perl-TimeDate @@ -60,8 +60,8 @@ BuildRequires: perl(Date::Parse) Conflicts: bsdtar < 2.5.5 BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -BuildRequires: perl(YAML::LibYAML) %if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 || 0%{?almalinux_version} >= 800 +BuildRequires: perl(YAML::LibYAML) # None of them are actually required for core features. # Perl helper scripts use them. Recommends: perl(Date::Language) From ca3fb06ebe18ad611f67faf5d06690d99968492e Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 19 Aug 2021 10:14:40 +0000 Subject: [PATCH 5/6] update Rev openSUSE:Tools/434 Md5 5ededfa8037b9278ee8dcd4a093cd647 2021-08-19 10:14:40 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 38 ++++++++++++++++++++++++++++++++++++++ build.dsc | 2 +- build.spec | 28 ++++++++++++++++------------ debian.changelog | 2 +- obs-build-20210120.tar.gz | 3 --- obs-build-20210819.tar.gz | 3 +++ 8 files changed, 62 insertions(+), 20 deletions(-) delete mode 100644 obs-build-20210120.tar.gz create mode 100644 obs-build-20210819.tar.gz diff --git a/PKGBUILD b/PKGBUILD index d09df8ad..3b418d15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20210120 +pkgver=20210819 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 7ba600f0..5d4a714f 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20210120 - 20210120 + 20210819 + 20210819 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index b33c32d9..f60918e9 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Thu Aug 19 09:44:26 UTC 2021 - Adrian Schröter + +Features: +- cross architecture build support (for rpm and kiwi) +- modulemd meta data support +- pbuild to build multiple source packages + (initial release, can not be considered stable yet) +- supporting external asset stores for source files +- support multiple post build checks placed in the directory: + /usr/lib/build/post-build-checks/ +- sccache support +- New --shell-after-fail option +- allow to disable squashfs in SimpleImage +- supporting aarch64 kernel on armv?l distributions +- kiwi: Add support for OBS-RemoteAsset and OBS-CopyToImage directives + +Improvements: +- supporting kvm builds as non-root user +- Extend stage selection support for rpm builds +- various distribution config updates +- Support "BuildFlags: cumulaterpms" + (was done only via suse_version before) + +Fixes: +- container builds + * support newer podman versions + * supporting multiple containers for multi-stage builds +- Supporting URL's in Flatpak manifests +- epoch handling in debian builds +- catch more cases where a failed build is marked as host error +- fixing wrong status reporting when a job got killed +- hugetlbfs handling fixes +- try mounting selinuxfs in VM +- Also create the /sys dir when preinstalling (to satisfy dracut) +- various XML parser fixes +- and many minor ones + ------------------------------------------------------------------- Wed Jan 20 12:37:53 UTC 2021 - Adrian Schröter diff --git a/build.dsc b/build.dsc index a37dfbd2..c54e6566 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20210120 +Version: 20210819 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 7bd82c7b..46b9dc83 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: 20210120 +Version: 20210819 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,36 +48,36 @@ BuildRequires: perl BuildRequires: psmisc BuildRequires: tar # For testcases +BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -%if 0%{?fedora} || 0%{?centos_version} || 0%{?almalinux_version} +%if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate BuildRequires: perl-TimeDate -%else -BuildRequires: perl(Date::Parse) %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 || 0%{?almalinux_version} >= 800 BuildRequires: perl(YAML::LibYAML) +%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) -Recommends: /sbin/mkfs.ext3 -Recommends: /usr/bin/qemu-kvm -Recommends: bsdtar -Recommends: qemu-linux-user -Recommends: zstd Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent) -Recommends: perl(Net::SSL) Recommends: perl(Pod::Usage) Recommends: perl(Time::Zone) Recommends: perl(URI) Recommends: perl(XML::Parser) +Recommends: perl(Net::SSL) 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} @@ -126,7 +126,6 @@ for generating delta rpm packages. %if "%{_host_cpu}" == "i686" %define initvm_arch i586 %endif - %package initvm-%{initvm_arch} Summary: Virtualization initializer for emulated cross architecture builds Group: Development/Tools/Building @@ -247,12 +246,16 @@ exit 0 %endif # we need to patch the not packaged configs, due to the buildignore sed -i 's,build-mkbaselibs,,' ../configs/*.conf +if [ ! -e /.build.packages/rpmlint-Factory.rpm ]; then + sed -i 's,rpmlint-Factory,,' ../configs/*.conf +fi ./testbuild.sh /.build.binaries/ %files %defattr(-,root,root) %doc README.md /usr/bin/build +/usr/bin/pbuild /usr/bin/buildvc /usr/bin/unrpm /usr/lib/build @@ -260,6 +263,7 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf %{_mandir}/man1/build.1* %{_mandir}/man1/unrpm.1* %{_mandir}/man1/buildvc.1* +%{_mandir}/man1/pbuild.1* %if 0%{?suse_version} %exclude /usr/lib/build/initvm.* %endif diff --git a/debian.changelog b/debian.changelog index 76856a47..b095b0af 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20210120) unstable; urgency=low +build (20210819) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20210120.tar.gz b/obs-build-20210120.tar.gz deleted file mode 100644 index 24226c6a..00000000 --- a/obs-build-20210120.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aad2410cc6bd040c91c6e5e2f738818e3e906fd7dbb730880fedd7924fdf5196 -size 382360 diff --git a/obs-build-20210819.tar.gz b/obs-build-20210819.tar.gz new file mode 100644 index 00000000..48d8e2f3 --- /dev/null +++ b/obs-build-20210819.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4bb403f70644290df26c9e1f185cadfc3a196e98dc46def98a7a644fd58fe69 +size 483500 From a020812f5faa576edd7aecf50d65662a856a995f Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 20 Aug 2021 06:48:21 +0000 Subject: [PATCH 6/6] update Rev openSUSE:Tools/435 Md5 d80d58a895554f8c816a3e03e3408c78 2021-08-20 06:48:21 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 3 ++- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20210819.tar.gz | 3 --- obs-build-20210820.tar.gz | 3 +++ 8 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20210819.tar.gz create mode 100644 obs-build-20210820.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3b418d15..a79e95fe 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20210819 +pkgver=20210820 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 5d4a714f..decbed48 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20210819 - 20210819 + 20210820 + 20210820 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index f60918e9..ef60ffb8 100644 --- a/build.changes +++ b/build.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Aug 19 09:44:26 UTC 2021 - Adrian Schröter +Fri Aug 20 07:44:26 UTC 2021 - Adrian Schröter Features: - cross architecture build support (for rpm and kiwi) @@ -14,6 +14,7 @@ Features: - allow to disable squashfs in SimpleImage - supporting aarch64 kernel on armv?l distributions - kiwi: Add support for OBS-RemoteAsset and OBS-CopyToImage directives +- container: FROM scratch build support Improvements: - supporting kvm builds as non-root user diff --git a/build.dsc b/build.dsc index c54e6566..c2e6536c 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20210819 +Version: 20210820 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 46b9dc83..fc2ac161 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: 20210819 +Version: 20210820 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index b095b0af..393e70b4 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20210819) unstable; urgency=low +build (20210820) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20210819.tar.gz b/obs-build-20210819.tar.gz deleted file mode 100644 index 48d8e2f3..00000000 --- a/obs-build-20210819.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4bb403f70644290df26c9e1f185cadfc3a196e98dc46def98a7a644fd58fe69 -size 483500 diff --git a/obs-build-20210820.tar.gz b/obs-build-20210820.tar.gz new file mode 100644 index 00000000..851d6305 --- /dev/null +++ b/obs-build-20210820.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50509e6ad3f782c5eadf2c8e4e32557fc96da9239e7e02cd8b6e5c7353249be3 +size 484099