From c6f815a94fb2adcecfffeeeaf7a17ceba56bb493 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 19 Oct 2018 07:17:41 +0000 Subject: [PATCH 1/5] Require fuser at runtime to kill processes fuser is used in build since commit 93cfd50b3823799fd8791940bfaf8aca63d2b81c Author: Ludwig Nussel Date: Thu Jun 26 14:00:14 2008 +0000 kill qemu and uml via fuser Rev openSUSE:Tools/362 Md5 64bfb857df17c0d7f11d5d09e479b3a0 2018-10-19 07:17:41 adrianSuSE 636385 --- build.changes | 5 +++++ build.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/build.changes b/build.changes index 96c5c74b..a60c46e9 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 18 11:35:42 UTC 2018 - bwiedemann@suse.com + +- Require fuser at runtime to kill processes + ------------------------------------------------------------------- Wed Aug 29 13:57:07 UTC 2018 - Adrian Schröter diff --git a/build.spec b/build.spec index b1480e07..8334ffa1 100644 --- a/build.spec +++ b/build.spec @@ -33,6 +33,7 @@ Requires: bash Requires: binutils Requires: perl Requires: tar +Requires: /bin/fuser %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate From f704b69440a2eedded2cde235992100019b00701 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 22 Oct 2018 09:46:11 +0000 Subject: [PATCH 2/5] update Rev openSUSE:Tools/363 Md5 5206e530e6dcdd8fbe9a8e61f5133d0f 2018-10-22 09:46:11 adrianSuSE None --- PKGBUILD | 2 +- build.changes | 13 +++++++++++-- build.dsc | 2 +- build.spec | 5 +++-- debian.changelog | 2 +- obs-build-20180830.tar.gz | 3 --- obs-build-20181022.tar.gz | 3 +++ 7 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20180830.tar.gz create mode 100644 obs-build-20181022.tar.gz diff --git a/PKGBUILD b/PKGBUILD index a362cbb0..c47e42ce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20180830 +pkgver=20181022 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index a60c46e9..029217cb 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,16 @@ ------------------------------------------------------------------- -Tue Sep 18 11:35:42 UTC 2018 - bwiedemann@suse.com +Mon Oct 22 09:43:20 UTC 2018 - Adrian Schröter -- Require fuser at runtime to kill processes +- 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 diff --git a/build.dsc b/build.dsc index 0ead939f..c6c569ce 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20180830 +Version: 20181022 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 8334ffa1..e3babd5d 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-or-later AND GPL-2.0-only Group: Development/Tools/Building -Version: 20180830 +Version: 20181022 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,7 +33,8 @@ Requires: bash Requires: binutils Requires: perl Requires: tar -Requires: /bin/fuser +# needed for fuser +Requires: psmisc %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate diff --git a/debian.changelog b/debian.changelog index 98e74c17..0e80914d 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20180830) unstable; urgency=low +build (20181022) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20180830.tar.gz b/obs-build-20180830.tar.gz deleted file mode 100644 index 6a83f37f..00000000 --- a/obs-build-20180830.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:578533fae2f037fa3fa6702a0e04f6c3d362f25ed0aacc4d4674f586e42ec96d -size 303802 diff --git a/obs-build-20181022.tar.gz b/obs-build-20181022.tar.gz new file mode 100644 index 00000000..b509b340 --- /dev/null +++ b/obs-build-20181022.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e35bd6549a36f384082c1d0fc71c9790c2829d983b5af3d2b537ab064839c104 +size 306185 From 544ccb213acded28c087c8243b7a50f99fc69960 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 22 Oct 2018 09:50:53 +0000 Subject: [PATCH 3/5] testing Rev openSUSE:Tools/364 Md5 a4527f413557d521ab205806b9c5e58a 2018-10-22 09:50:53 adrianSuSE None --- build.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.spec b/build.spec index e3babd5d..d453e076 100644 --- a/build.spec +++ b/build.spec @@ -33,7 +33,8 @@ Requires: bash Requires: binutils Requires: perl Requires: tar -# needed for fuser +# needed for fuser, buildrequires for validating the distros +BuildRequires: psmisc Requires: psmisc %if 0%{?fedora} Requires: perl-MD5 From 4aa72783e76592a8af8f90296b6fecee2ae04d34 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 22 Oct 2018 10:10:21 +0000 Subject: [PATCH 4/5] update Rev openSUSE:Tools/365 Md5 f20b80cd96fb87f219b7dd1aeb518380 2018-10-22 10:10:21 adrianSuSE None --- build.spec | 9 +++++++-- obs-build-20181022.tar.gz | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.spec b/build.spec index d453e076..8e9828d6 100644 --- a/build.spec +++ b/build.spec @@ -33,9 +33,14 @@ Requires: bash Requires: binutils Requires: perl Requires: tar -# needed for fuser, buildrequires for validating the distros -BuildRequires: psmisc +# needed for fuser Requires: psmisc +# just to verify existence of packages +BuildRequires: bash +BuildRequires: binutiles +BuildRequires: perl +BuildRequires: psmisc +BuildRequires: tar %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate diff --git a/obs-build-20181022.tar.gz b/obs-build-20181022.tar.gz index b509b340..0224da6f 100644 --- a/obs-build-20181022.tar.gz +++ b/obs-build-20181022.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e35bd6549a36f384082c1d0fc71c9790c2829d983b5af3d2b537ab064839c104 -size 306185 +oid sha256:81023de09dbee5419669ff93e00387a345f58ff76d2c116099c83221a82215e0 +size 305910 From 3db94adf515cfe7e6607fb219d7ddcefeeea52d7 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 22 Oct 2018 10:12:48 +0000 Subject: [PATCH 5/5] ups Rev openSUSE:Tools/366 Md5 b7dc310a2fbc93a10f4a81c23aa862be 2018-10-22 10:12:48 adrianSuSE None --- build.spec | 2 +- obs-build-20181022.tar.gz | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.spec b/build.spec index 8e9828d6..9e3f86cb 100644 --- a/build.spec +++ b/build.spec @@ -37,7 +37,7 @@ Requires: tar Requires: psmisc # just to verify existence of packages BuildRequires: bash -BuildRequires: binutiles +BuildRequires: binutils BuildRequires: perl BuildRequires: psmisc BuildRequires: tar diff --git a/obs-build-20181022.tar.gz b/obs-build-20181022.tar.gz index 0224da6f..f1966d7d 100644 --- a/obs-build-20181022.tar.gz +++ b/obs-build-20181022.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81023de09dbee5419669ff93e00387a345f58ff76d2c116099c83221a82215e0 -size 305910 +oid sha256:bbe8a4a85d9ed77cab35f2479d331753d24991c263ac1bfce4e49fa0380ab7e2 +size 305402