From e2b28508a1ea4187eb46eb4594039fd2c85e0d964c14a7c9e3819881fc2d139b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 27 Oct 2015 07:50:19 +0000 Subject: [PATCH 1/4] fix debian builds OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=270 --- debian.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian.tar.gz diff --git a/debian.tar.gz b/debian.tar.gz new file mode 100644 index 0000000..01281ed --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524 From 0c3aa352add86be47d3519c1549a447ebf3ce510d57a6232a793f0f4080490f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Nov 2015 15:02:43 +0000 Subject: [PATCH 2/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=271 --- PKGBUILD | 2 +- build.changes | 8 ++++++++ build.dsc | 2 +- build.spec | 7 ++++++- debian.changelog | 2 +- obs-build-20151006.tar.gz | 3 --- obs-build-20151105.tar.gz | 3 +++ 7 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 obs-build-20151006.tar.gz create mode 100644 obs-build-20151105.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3e6dd3e..72759dc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20151006 +pkgver=20151105 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 984bb2a..b79a8e1 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 5 14:59:24 UTC 2015 - adrian@suse.de + +- add openSUSE 42.1 config +- avoid full path in sha256 files of products +- support virtio-rng device in kvm builds +- lxc 1.1 support + ------------------------------------------------------------------- Fri Oct 9 08:41:04 UTC 2015 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 01fb1b0..437d0ac 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20151006 +Version: 20151105 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 39cba94..d7c28c9 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: 20151006 +Version: 20151105 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,6 +136,10 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* # main make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +%if "0%{?suse_version}" == "1315" && 0%{?is_opensuse} +# super special leap distro + ln -s sl42.1.conf default.conf +%else %if 0%{?suse_version} %if 0%{?sles_version} ln -s sles%{sles_version}.conf default.conf @@ -145,6 +149,7 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ %endif test -e default.conf || exit 1 %endif +%endif %check if [ `whoami` != "root" ]; then diff --git a/debian.changelog b/debian.changelog index 514490d..9853bde 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20151006) unstable; urgency=low +build (20151105) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20151006.tar.gz b/obs-build-20151006.tar.gz deleted file mode 100644 index 36161f5..0000000 --- a/obs-build-20151006.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32767a33b3d9ae318a4a4f07987053202bc071ac852fe662bbae084a075eab5f -size 225669 diff --git a/obs-build-20151105.tar.gz b/obs-build-20151105.tar.gz new file mode 100644 index 0000000..3b7b56d --- /dev/null +++ b/obs-build-20151105.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e498bd32223b88bece019abfa23501bca7343ce1e8156e00f94200bb3ff24079 +size 231249 From a28eeeed014b31fbc9c40e46ed16164771e167d565c4c55a4168320ba40e2a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Nov 2015 15:04:41 +0000 Subject: [PATCH 3/4] add bnc OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=272 --- build.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.changes b/build.changes index b79a8e1..a39762f 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Nov 5 14:59:24 UTC 2015 - adrian@suse.de -- add openSUSE 42.1 config +- add openSUSE 42.1 config (bnc#953782) - avoid full path in sha256 files of products - support virtio-rng device in kvm builds - lxc 1.1 support From 3953d92fca2d050775566c5eb664acdee7611387ed879ac7f28aed5f47e5ec20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Nov 2015 15:09:30 +0000 Subject: [PATCH 4/4] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=273 --- build.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.spec b/build.spec index d7c28c9..53a7848 100644 --- a/build.spec +++ b/build.spec @@ -136,7 +136,7 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* # main make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if "0%{?suse_version}" == "1315" && 0%{?is_opensuse} +%if "%{?suse_version}" == "1315" && 0%{?is_opensuse} # super special leap distro ln -s sl42.1.conf default.conf %else