From 85985fcd2c066c84038f8807e62a76fde5927a716b8ad0c724d01f7372f56f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 15 Jun 2015 11:49:50 +0000 Subject: [PATCH 1/5] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=253 --- PKGBUILD | 4 ++-- baselibs.conf | 8 -------- build.changes | 15 +++++++++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20150317.tar.gz | 3 --- obs-build-20150615.tar.gz | 3 +++ 8 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 baselibs.conf delete mode 100644 obs-build-20150317.tar.gz create mode 100644 obs-build-20150615.tar.gz diff --git a/PKGBUILD b/PKGBUILD index c192a5c..9f7b3b3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20150317 +pkgver=20150615 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0') groups=('base-devel') depends=('perl') source=(obs-build-${pkgver}.tar.gz) -md5sums=('deaeff7a854cb1668560813f55980587') +md5sums=('fa2ad796c1407587342ac2a6339a1659') package() { msg "Installing build ..." diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index dcb9dcf..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,8 +0,0 @@ -arch i386 targets x86_64:i386 -arch i586 targets x86_64:i586 -build-initvm - targetname - - targettype i386 provides "build-initvm" - targettype i586 provides "build-initvm" - targettype i386 +/usr - targettype i586 +/usr diff --git a/build.changes b/build.changes index ee8b0ef..da5e709 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 15 11:41:12 UTC 2015 - adrian@suse.de + +- support build time source services +- docker VM support +- Simple image creation support +- vc: create changelog file only in case of a change +- get hostarch based on preinstalled kernel image +- architecture CanDo updates +- avoid endless loops during in binfmt misc registration +- debian debootstrap fixes +- added support of debbuild build engine +- optional support of network inside of KVM +- allow lintian to break the build + ------------------------------------------------------------------- Tue Mar 17 07:20:36 UTC 2015 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 4ae6155..d56076a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20150317 +Version: 20150615 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index b9834b9..8847d97 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+ and GPL-2.0 Group: Development/Tools/Building -Version: 20150317 +Version: 20150615 Release: 0 Source: obs-build-%{version}.tar.gz #!BuildIgnore: build-mkbaselibs diff --git a/debian.changelog b/debian.changelog index 220b4dd..a1f894f 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20150317) unstable; urgency=low +build (20150615) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20150317.tar.gz b/obs-build-20150317.tar.gz deleted file mode 100644 index 57a655b..0000000 --- a/obs-build-20150317.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58b11594a94071019410bc8350703baaea8760de83a4f05d9021413257258d18 -size 210590 diff --git a/obs-build-20150615.tar.gz b/obs-build-20150615.tar.gz new file mode 100644 index 0000000..a969d2c --- /dev/null +++ b/obs-build-20150615.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29f269e5cbd5b884867404ee855fd4bb7386b4947be31ea7e6ab00a45877485b +size 214755 From d4261e8a9f76872a3ffc525125871b9d0fff91b91173f86b468a69fb05ced425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 16 Jun 2015 14:49:34 +0000 Subject: [PATCH 2/5] build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=254 --- build.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/build.spec b/build.spec index 8847d97..a0556b8 100644 --- a/build.spec +++ b/build.spec @@ -26,7 +26,6 @@ Version: 20150615 Release: 0 Source: obs-build-%{version}.tar.gz #!BuildIgnore: build-mkbaselibs -Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static From 52f5330d6ce1d0948a0bdb35bf610611c7623442517809353c90ae39e4dfea84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 16 Jun 2015 14:52:45 +0000 Subject: [PATCH 3/5] sync OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=255 --- build.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/build.spec b/build.spec index a0556b8..4fe0e34 100644 --- a/build.spec +++ b/build.spec @@ -25,7 +25,6 @@ Group: Development/Tools/Building Version: 20150615 Release: 0 Source: obs-build-%{version}.tar.gz -#!BuildIgnore: build-mkbaselibs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static From a622536256313410ceb1e53639ff1dd2483e93cdb00d64e22a7a4bc878eabf0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 16 Jun 2015 14:58:07 +0000 Subject: [PATCH 4/5] tests optional on non-suse OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=256 --- build.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.spec b/build.spec index 4fe0e34..4cf0424 100644 --- a/build.spec +++ b/build.spec @@ -151,6 +151,15 @@ if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 fi +if [ -e $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf ]; then +%if 0%{?suse_version} + echo "ERROR: No default build conf, tests did not run!" + exit 1 +%else + echo "WARNING: No default build conf, tests did not run!" + exit 0 +%endif +fi # get back the default.conf link cp -av $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf configs/ # do not get confused when building this already with build: From 19963d6083953484c6252e462a95df0a8cfa5956022dbc97fc4579fbe9e7918d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 17 Jun 2015 15:02:56 +0000 Subject: [PATCH 5/5] go OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=257 --- build.changes | 5 +++++ build.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.changes b/build.changes index da5e709..602df83 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 17 15:01:43 UTC 2015 - adrian@suse.de + +- fixing test suite call + ------------------------------------------------------------------- Mon Jun 15 11:41:12 UTC 2015 - adrian@suse.de diff --git a/build.spec b/build.spec index 4cf0424..f3cc7be 100644 --- a/build.spec +++ b/build.spec @@ -151,7 +151,7 @@ if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 fi -if [ -e $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf ]; then +if [ ! -e $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf ]; then %if 0%{?suse_version} echo "ERROR: No default build conf, tests did not run!" exit 1