From 73161dd487227b7babaaab873e8941b10ca77014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 23 Aug 2021 11:57:38 +0000 Subject: [PATCH 1/3] Accepting request 913737 from home:dgollubATT:branches:openSUSE:Tools Depend on libarchive-tools or bsdtar for Debian based builds. This became mandatory on Debian with following commit: https://github.com/openSUSE/obs-build/commit/ca5bb105774739f3b719768ae553147e6d660293 Btw.: Ich hab die openSUSE Account Migration verpasst. Koennte jemand bitte fuer den Account die Mailaddresse auf dgollub AT exsuse.de zurueck setzen? Wahrscheinlich ist die Addresse noch auf brocade.com gesetzt oder so. Danke! OBS-URL: https://build.opensuse.org/request/show/913737 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=436 --- debian.control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.control b/debian.control index 4823cbe..f8d144a 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, libarchive-tools | bsdtar Recommends: rpm2cpio Conflicts: build Replaces: build From 23924fcd6cf54eede84cb41c4e8b40be5797c520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 30 Aug 2021 12:48:47 +0000 Subject: [PATCH 2/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=437 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 17 +++++++++-------- debian.changelog | 2 +- obs-build-20210820.tar.gz | 3 --- obs-build-20210830.tar.gz | 3 +++ 8 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 obs-build-20210820.tar.gz create mode 100644 obs-build-20210830.tar.gz diff --git a/PKGBUILD b/PKGBUILD index a79e95f..fd757e0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20210820 +pkgver=20210830 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index decbed4..6c1ee7f 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20210820 - 20210820 + 20210830 + 20210830 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index ef60ffb..da9286e 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 30 12:44:52 UTC 2021 - Adrian Schröter + +- fixed regression in multiline macro evaluation from 20th August release + ------------------------------------------------------------------- Fri Aug 20 07:44:26 UTC 2021 - Adrian Schröter diff --git a/build.dsc b/build.dsc index c2e6536..3198387 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20210820 +Version: 20210830 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index fc2ac16..5ee877d 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 # @@ -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: 20210820 +Version: 20210830 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,19 +65,19 @@ BuildRequires: perl(YAML::LibYAML) # 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 diff --git a/debian.changelog b/debian.changelog index 393e70b..24d5aea 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20210820) unstable; urgency=low +build (20210830) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20210820.tar.gz b/obs-build-20210820.tar.gz deleted file mode 100644 index 851d630..0000000 --- a/obs-build-20210820.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50509e6ad3f782c5eadf2c8e4e32557fc96da9239e7e02cd8b6e5c7353249be3 -size 484099 diff --git a/obs-build-20210830.tar.gz b/obs-build-20210830.tar.gz new file mode 100644 index 0000000..5c4c7c2 --- /dev/null +++ b/obs-build-20210830.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26bf0b719930ff69a053a41a80651cdcdce5e872575ef37496bdcdf544e77ede +size 483899 From bffb8381f72bb5fcfd768ab777f6cdf30e38ccd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Sep 2021 09:53:00 +0000 Subject: [PATCH 3/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=438 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 4 ++-- debian.changelog | 2 +- obs-build-20210830.tar.gz | 3 --- obs-build-20210902.tar.gz | 3 +++ 8 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20210830.tar.gz create mode 100644 obs-build-20210902.tar.gz diff --git a/PKGBUILD b/PKGBUILD index fd757e0..cb5d766 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20210830 +pkgver=20210902 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 6c1ee7f..40bb5ce 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20210830 - 20210830 + 20210902 + 20210902 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index da9286e..76c235a 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 2 09:18:33 UTC 2021 - Adrian Schröter + +- Fix unpacking of deb/arch archives without bsdtar + ------------------------------------------------------------------- Mon Aug 30 12:44:52 UTC 2021 - Adrian Schröter diff --git a/build.dsc b/build.dsc index 3198387..33db819 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20210830 +Version: 20210902 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 5ee877d..d7bc764 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package obs-build +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -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: 20210830 +Version: 20210902 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 24d5aea..102e06b 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20210830) unstable; urgency=low +build (20210902) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20210830.tar.gz b/obs-build-20210830.tar.gz deleted file mode 100644 index 5c4c7c2..0000000 --- a/obs-build-20210830.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26bf0b719930ff69a053a41a80651cdcdce5e872575ef37496bdcdf544e77ede -size 483899 diff --git a/obs-build-20210902.tar.gz b/obs-build-20210902.tar.gz new file mode 100644 index 0000000..93ac7c0 --- /dev/null +++ b/obs-build-20210902.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb9a22f9467483119dce811bfdc758fbd3140efb1f05f4db5f11b1814a934874 +size 485561