From 3d9793bfacfcedb8dda0c8637070a1df475255b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Sep 2022 08:31:35 +0000 Subject: [PATCH 1/6] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=459 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 21 ++++++++++++++++++--- build.dsc | 2 +- build.spec | 7 ++++--- debian.changelog | 2 +- obs-build-20220613.tar.gz | 3 --- obs-build-20220926.tar.gz | 3 +++ 8 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 obs-build-20220613.tar.gz create mode 100644 obs-build-20220926.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8bdf6263..aea055e6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20220613 +pkgver=20220926 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 74421952..9cc8d74a 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20220613 - 20220613 + 20220926 + 20220926 https://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 73b7e10e..4d367130 100644 --- a/build.changes +++ b/build.changes @@ -1,8 +1,23 @@ ------------------------------------------------------------------- -Mon Jun 13 12:39:58 UTC 2022 - Adrian Schröter +Mon Sep 26 08:15:38 UTC 2022 - Adrian Schröter -- regression fix for Debian Source format 3.0 (quilt), also adding - changelog modification now +- build-recipe-livebuild: run as root +- vm_kill_kvm: Use SIGKILL after 3 minutes if the kvm process is not going away +- Zip: Allow extraction of symlink targets +- Convert obsolete egrep/fgrep calls to grep -E/-F +- Add RemoteAsset support for Dockerfile based builds +- new image format: mkosi +- Support stacked container builds +- Revert "build-vm-kvm: enable l3-cache on i386/x86_64 builds" +- handling of non-compressed tar when creating Debian archive for DSC 3.0 + +------------------------------------------------------------------- +Mon Jun 20 09:33:55 UTC 2022 - Adrian Schröter + +- kvm: exclude powerpc from io_uring, enable iothreads always (#829) +- kvm: enable more performant I/O also for s390(x) (#828) +- Changelog patching when building DSC format 3.0. (#831) +- support for building from slsa provenance files ------------------------------------------------------------------- Tue May 31 09:10:07 UTC 2022 - Adrian Schröter diff --git a/build.dsc b/build.dsc index dd57f5a2..a8c7fdf9 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20220613 +Version: 20220926 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 82bbc1e1..4091f516 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: 20220613 +Version: 20220926 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,12 +68,14 @@ 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: perl(Archive::Tar) Recommends: /sbin/mkfs.ext3 Recommends: /usr/bin/qemu-kvm Recommends: bsdtar Recommends: qemu-linux-user Recommends: zstd +Recommends: perl(Config::IniFiles) +Recommends: perl(Date::Language) Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent) Recommends: perl(Net::SSL) @@ -162,7 +164,6 @@ make CFLAGS="$RPM_BUILD_FLAGS" initvm-all make DESTDIR=%{buildroot} initvm-install strip %{buildroot}/usr/lib/build/initvm.* export NO_BRP_STRIP_DEBUG="true" -chmod 0644 %{buildroot}/usr/lib/build/initvm.* %endif # main diff --git a/debian.changelog b/debian.changelog index a8924236..e15e5e33 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20220613) unstable; urgency=low +build (20220926) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20220613.tar.gz b/obs-build-20220613.tar.gz deleted file mode 100644 index fa7933fc..00000000 --- a/obs-build-20220613.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa0bec84a03bbebf18fb5bc923716d7951cf64e23e00da51de1ea82f1f1ee918 -size 578371 diff --git a/obs-build-20220926.tar.gz b/obs-build-20220926.tar.gz new file mode 100644 index 00000000..d1d77ae7 --- /dev/null +++ b/obs-build-20220926.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f0deba6369443c36ee4227a791951660d3e074ef2a611e7151195c75c07699f +size 583472 From c71d699ce94109d868f29a326e079c1cc1671851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Sep 2022 09:15:28 +0000 Subject: [PATCH 2/6] fix on sle 11 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=460 --- build.spec | 2 ++ obs-build-20220926.tar.gz | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.spec b/build.spec index 4091f516..07ed7053 100644 --- a/build.spec +++ b/build.spec @@ -64,7 +64,9 @@ Conflicts: qemu < 2.5.0 BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) +%if 0%{?suse_version} >= 1200 BuildRequires: perl(YAML::LibYAML) +%endif %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. diff --git a/obs-build-20220926.tar.gz b/obs-build-20220926.tar.gz index d1d77ae7..5be1aa95 100644 --- a/obs-build-20220926.tar.gz +++ b/obs-build-20220926.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0deba6369443c36ee4227a791951660d3e074ef2a611e7151195c75c07699f -size 583472 +oid sha256:30abbba8f0b6c6b97c3a9a23bafb2ca91ada75ade56ccf23b1eccb340ce6025f +size 583555 From fa544cc1d1a5d4c6b4eaec4a713b69f7d6f7beb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Sep 2022 11:12:30 +0000 Subject: [PATCH 3/6] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=461 --- build.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.spec b/build.spec index 07ed7053..4091f516 100644 --- a/build.spec +++ b/build.spec @@ -64,9 +64,7 @@ Conflicts: qemu < 2.5.0 BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -%if 0%{?suse_version} >= 1200 BuildRequires: perl(YAML::LibYAML) -%endif %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. From c0c1327b953202bac5fed7fa3934b00e15c0358c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Sep 2022 11:22:10 +0000 Subject: [PATCH 4/6] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=462 --- build.changes | 1 + build.spec | 2 ++ obs-build-20220926.tar.gz | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.changes b/build.changes index 4d367130..8644a9e5 100644 --- a/build.changes +++ b/build.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Sep 26 08:15:38 UTC 2022 - Adrian Schröter +- sync factory build config - build-recipe-livebuild: run as root - vm_kill_kvm: Use SIGKILL after 3 minutes if the kvm process is not going away - Zip: Allow extraction of symlink targets diff --git a/build.spec b/build.spec index 4091f516..07ed7053 100644 --- a/build.spec +++ b/build.spec @@ -64,7 +64,9 @@ Conflicts: qemu < 2.5.0 BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) +%if 0%{?suse_version} >= 1200 BuildRequires: perl(YAML::LibYAML) +%endif %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. diff --git a/obs-build-20220926.tar.gz b/obs-build-20220926.tar.gz index 5be1aa95..0213c862 100644 --- a/obs-build-20220926.tar.gz +++ b/obs-build-20220926.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30abbba8f0b6c6b97c3a9a23bafb2ca91ada75ade56ccf23b1eccb340ce6025f -size 583555 +oid sha256:2f68e2dceaf560ae755adc4d987080685834ef9b5fe2284705196437358789fb +size 584369 From b8b08e243c042389e8fb3b448d34be220d50d301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 27 Sep 2022 07:03:17 +0000 Subject: [PATCH 5/6] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=463 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20220926.tar.gz | 3 --- obs-build-20220927.tar.gz | 3 +++ 8 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20220926.tar.gz create mode 100644 obs-build-20220927.tar.gz diff --git a/PKGBUILD b/PKGBUILD index aea055e6..0ec378d3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20220926 +pkgver=20220927 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 9cc8d74a..79d6b3b7 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20220926 - 20220926 + 20220927 + 20220927 https://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 8644a9e5..15c51858 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 27 07:01:33 UTC 2022 - Adrian Schröter + +- fix build of testsuite spec file + ------------------------------------------------------------------- Mon Sep 26 08:15:38 UTC 2022 - Adrian Schröter diff --git a/build.dsc b/build.dsc index a8c7fdf9..d1a22b30 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20220926 +Version: 20220927 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 07ed7053..941a49d0 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: 20220926 +Version: 20220927 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index e15e5e33..a395f5d5 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20220926) unstable; urgency=low +build (20220927) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20220926.tar.gz b/obs-build-20220926.tar.gz deleted file mode 100644 index 0213c862..00000000 --- a/obs-build-20220926.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f68e2dceaf560ae755adc4d987080685834ef9b5fe2284705196437358789fb -size 584369 diff --git a/obs-build-20220927.tar.gz b/obs-build-20220927.tar.gz new file mode 100644 index 00000000..5e3c03e3 --- /dev/null +++ b/obs-build-20220927.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71fe2dd78e2e4a56455803f447a0eaf8fb2b6c6e74a4045e0802809a1ac74c31 +size 584265 From 6c0ec406a6f6f0156caae60a0ab47c40ef205ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 27 Sep 2022 11:35:12 +0000 Subject: [PATCH 6/6] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=464 --- build.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.spec b/build.spec index 941a49d0..5a4ad366 100644 --- a/build.spec +++ b/build.spec @@ -260,6 +260,9 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf if [ ! -e /.build.packages/rpmlint-Factory.rpm ]; then sed -i 's,rpmlint-Factory,,' ../configs/*.conf fi +if [ ! -e /.build.packages/rpmlint-strict.rpm ]; then + sed -i 's,rpmlint-strict,,' ../configs/*.conf +fi ./testbuild.sh /.build.binaries/ %files