From 2d2067cc708612fe65a9bfdbbae2b37354365222 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 30 Jan 2015 07:25:22 +0000 Subject: [PATCH 1/4] - add recommend to perl(Net::SSL) (bnc#880212) Rev openSUSE:Tools/246 Md5 a8b208d80380d86e8f357368aede1adb 2015-01-30 07:25:22 adrianSuSE None --- build.changes | 5 +++++ build.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.changes b/build.changes index 6dfd6c68..b5232c1c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 30 07:23:36 UTC 2015 - adrian@suse.de + +- add recommend to perl(Net::SSL) (bnc#880212) + ------------------------------------------------------------------- Mon Nov 24 15:45:59 UTC 2014 - adrian@suse.de diff --git a/build.spec b/build.spec index daf509b7..bf86879e 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # # spec file for package build # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,6 +49,7 @@ Recommends: perl(Pod::Usage) Recommends: perl(Time::Zone) Recommends: perl(URI) Recommends: perl(XML::Parser) +Recommends: perl(Net::SSL) Recommends: bsdtar Recommends: qemu-linux-user %endif From 20f69b16b1f3d80f349df9c297b1599a50dfcdfc Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 30 Jan 2015 07:29:22 +0000 Subject: [PATCH 2/4] update Rev openSUSE:Tools/247 Md5 e17c4b6f3afefd7e0633616c24d8ba8e 2015-01-30 07:29:22 adrianSuSE None --- PKGBUILD | 4 ++-- build.changes | 6 ++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20141120.tar.gz | 3 --- obs-build-20150115.tar.gz | 3 +++ 7 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20141120.tar.gz create mode 100644 obs-build-20150115.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 11c6b495..aeb0796c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20141120 +pkgver=20150115 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=('07405ad5bd573e5534508105a09a9677') +md5sums=('913a174848d39df902df09dedc0e1aa2') package() { msg "Installing build ..." diff --git a/build.changes b/build.changes index b5232c1c..f1658289 100644 --- a/build.changes +++ b/build.changes @@ -2,6 +2,12 @@ Fri Jan 30 07:23:36 UTC 2015 - adrian@suse.de - add recommend to perl(Net::SSL) (bnc#880212) +- add support for debian debootstrap build engine +- Update arch config +- Add support for conflicts, addselfprovides, weakdeps to query functions +- installed package handling works also for arch and debian now +- large code cleanup +- bugfixes and documentation updates ------------------------------------------------------------------- Mon Nov 24 15:45:59 UTC 2014 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 93ddb013..4893a336 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20141120 +Version: 20150115 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index bf86879e..6417e967 100644 --- a/build.spec +++ b/build.spec @@ -20,7 +20,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20141120 +Version: 20150115 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz diff --git a/debian.changelog b/debian.changelog index 71f4f3de..96266951 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20141120) unstable; urgency=low +build (20150115) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20141120.tar.gz b/obs-build-20141120.tar.gz deleted file mode 100644 index e2f300a1..00000000 --- a/obs-build-20141120.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dedf48a86f921a2e2205ad970c57581915eb3ea624f82fdb92a5c05f43be100 -size 203948 diff --git a/obs-build-20150115.tar.gz b/obs-build-20150115.tar.gz new file mode 100644 index 00000000..f841588f --- /dev/null +++ b/obs-build-20150115.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:927020b7d1346b80c8dae454732045b9086a74918a647359cb43443f7f92a665 +size 208920 From bd90629a4c39c16f136a541bbdb9261bf0d232b6 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 30 Jan 2015 07:44:02 +0000 Subject: [PATCH 3/4] sync with OBS unstable package Rev openSUSE:Tools/248 Md5 76fb21b24bdbb58f224192ccc8841bae 2015-01-30 07:44:02 adrianSuSE None --- build.spec | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/build.spec b/build.spec index 6417e967..2407ac18 100644 --- a/build.spec +++ b/build.spec @@ -14,6 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# needsrootforbuild +# needsbinariesforbuild Name: build @@ -22,13 +24,15 @@ License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building Version: 20150115 Release: 0 -#!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz -Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static AutoReqProv: off +%if 0%{?suse_version} > 1200 +# required for test suite +BuildRequires: build-mkbaselibs +%endif # Keep the following dependencies in sync with obs-worker package Requires: bash Requires: binutils @@ -139,9 +143,34 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ V=%suse_version ln -s sl${V:0:2}.${V:2:1}.conf default.conf %endif -test -e default.conf +test -e default.conf || exit 1 %endif +%check +if [ `whoami` != "root" ]; then + echo "WARNING: Not building as root, tests did not run!" + exit 0 +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: +export BUILD_IGNORE_2ND_STAGE=1 +# use our own build code +export BUILD_DIR=$PWD +cd test +# target is autodetected +%if 0%{?sles_version} +echo "SLES config differs currently on purpose between OBS and build script." +echo "Skipping test case" +exit 0 +%endif +%if 0%{?qemu_user_space_build} +echo "test suite is not prepared to run using qemu linux user" +echo "Skipping test case" +exit 0 +%endif +./testbuild.sh /.build.binaries/ + %files %defattr(-,root,root) %doc README From 601b24e09c5aebc337e4fff90ccac8811dfee60c Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 30 Jan 2015 07:50:22 +0000 Subject: [PATCH 4/4] add baselibs again Rev openSUSE:Tools/249 Md5 74b74a5dbcf79114c4f7771dd8642666 2015-01-30 07:50:22 adrianSuSE None --- build.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.spec b/build.spec index 2407ac18..693e59dc 100644 --- a/build.spec +++ b/build.spec @@ -25,6 +25,8 @@ Group: Development/Tools/Building Version: 20150115 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