From cca61569ac706eec84f1accab6f8d1d509377326 Mon Sep 17 00:00:00 2001 From: OBS User mlschroe Date: Mon, 10 Oct 2011 17:41:54 +0000 Subject: [PATCH 1/9] - add sles11sp2 build config and adapt autodetection [bnc#711770] Rev openSUSE:Tools/150 Md5 047fdb54f6f64e44cca48aa732ac2e17 2011-10-10 17:41:54 mlschroe None --- _service | 2 +- build-2011.09.26.tar.gz | 3 --- build-2011.10.10.tar.gz | 3 +++ build-mkbaselibs-sle.spec | 2 +- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 7 +++++++ 8 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 build-2011.09.26.tar.gz create mode 100644 build-2011.10.10.tar.gz diff --git a/_service b/_service index 6311f063..a52dfd44 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.09.26 + 2011.10.10 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.09.26.tar.gz b/build-2011.09.26.tar.gz deleted file mode 100644 index 93610e5a..00000000 --- a/build-2011.09.26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94473d8ca028f2dc7640d2220290fb5d85315d78c6f55fccb7d7c0b5678c8f69 -size 122310 diff --git a/build-2011.10.10.tar.gz b/build-2011.10.10.tar.gz new file mode 100644 index 00000000..5b469983 --- /dev/null +++ b/build-2011.10.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d6d266cbc23fd326e09f1b3884165beb9340c3ec6fa967616d14bde09f27c9 +size 268519 diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 53a5c6a8..78f26e70 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages -Version: 2011.09.26 +Version: 2011.10.10 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 0e4e04b5..b611270c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 10 19:29:20 CEST 2011 - mls@suse.de + +- add sles11sp2 build config and adapt autodetection [bnc#711770] + ------------------------------------------------------------------- Mon Sep 26 20:33:59 UTC 2011 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 650f77e8..04ba7754 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.09.26 +Version: 2011.10.10 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 636fff59..d5118499 100644 --- a/build.spec +++ b/build.spec @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.09.26 +Version: 2011.10.10 Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz diff --git a/debian.changelog b/debian.changelog index 705acdcb..aecd64cf 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,10 @@ +build (2011.10.10-1) unstable; urgency=low + + * Update to current git trunk + - add sles11sp2 build config and adapt autodetection + + -- Michael Schroeder Mon, 10 Oct 2011 19:30:22 +0200 + build (2011.09.26-1) unstable; urgency=low * Update to current git trunk From 8eb11b161f5240fe3f7cc3109279b988ec093648 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 25 Oct 2011 13:24:31 +0000 Subject: [PATCH 2/9] add build-initvm Rev openSUSE:Tools/151 Md5 bd665a8e735521823685fc0a14e9df31 2011-10-25 13:24:31 adrianSuSE None --- baselibs.conf | 8 +++++++ build-initvm.changes | 12 ++++++++++ build-initvm.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++ build.changes | 35 ++++++++++++---------------- 4 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 baselibs.conf create mode 100644 build-initvm.changes create mode 100644 build-initvm.spec diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 00000000..951e38eb --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,8 @@ +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-initvm.changes b/build-initvm.changes new file mode 100644 index 00000000..d18eb7d2 --- /dev/null +++ b/build-initvm.changes @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Tue Oct 4 12:43:27 UTC 2011 - adrian@suse.de + +- use new qemu-*-binfmt handler to run commands with correct $0 +- fix build for Factory + +------------------------------------------------------------------- +Mon Mar 21 07:02:52 UTC 2011 - adrian@suse.de + +- initial package for new cross build support for OBS. Done by + James Perkins from LinuxFoundation + diff --git a/build-initvm.spec b/build-initvm.spec new file mode 100644 index 00000000..5807c8af --- /dev/null +++ b/build-initvm.spec @@ -0,0 +1,54 @@ +# +# spec file for package build-initvm +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + + +Name: build-initvm +License: GPLv2+ +Group: Development/Tools/Building +AutoReqProv: on +Summary: A Script to Build SUSE Linux RPMs +Version: 2011.07.01 +Release: 0 +Source: build-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +AutoReqProv: off +Requires: build +BuildRequires: gcc glibc-devel +%if 0%{?suse_version} > 1200 +BuildRequires: glibc-devel-static +%endif + +%description +This package provides a script for building RPMs for SUSE Linux in a +chroot or a secure virtualized environment. + + +%prep +%setup -q -n build-%version + +%build +make CFLAGS="$RPM_BUILD_FLAGS" initvm-all + +%install +make DESTDIR=$RPM_BUILD_ROOT initvm-install + +%files +%defattr(-,root,root) +/usr/lib/build/initvm + +%changelog diff --git a/build.changes b/build.changes index b611270c..c96a2388 100644 --- a/build.changes +++ b/build.changes @@ -3,6 +3,12 @@ Mon Oct 10 19:29:20 CEST 2011 - mls@suse.de - add sles11sp2 build config and adapt autodetection [bnc#711770] +------------------------------------------------------------------- +Tue Oct 4 12:43:27 UTC 2011 - adrian@suse.de + +- use new qemu-*-binfmt handler to run commands with correct $0 +- fix build for Factory + ------------------------------------------------------------------- Mon Sep 26 20:33:59 UTC 2011 - adrian@suse.de @@ -51,6 +57,13 @@ Wed Apr 27 12:34:17 UTC 2011 - adrian@suse.de - revert to single cpu build default for debian packages +------------------------------------------------------------------- +Fri Apr 15 08:55:14 UTC 2011 - adrian@suse.de + +- switch back to single process build for debian to be conform with + their policy +- use cpuid kvm64 on kvm for 64bit as workaround for a cpuid bug + ------------------------------------------------------------------- Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de @@ -59,26 +72,8 @@ Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de ------------------------------------------------------------------- Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de -- fix xen build support - -------------------------------------------------------------------- -Mon Feb 28 09:02:32 UTC 2011 - adrian@suse.de - -- do not use current git branch for stable build package in distributions -- require bsdtar for vm builds to ensure a safe build - -------------------------------------------------------------------- -Wed Dec 15 14:05:09 CET 2010 - mls@suse.de - -- also use -o when using bsdtar --chroot - -------------------------------------------------------------------- -Thu Dec 9 11:51:40 UTC 2010 - adrian@suse.de - -- support bsdtar for setting up build enviroment -- make expanddeps use the highest version of a package if multiple - versions aver available in a repository [bnc#656599] -- support other file formats (esp. for .ZIP and .EXE export for crossbuild) +- support new cross build initvm. Done by James Perkins from LinuxFoundation +- do not use loop device anymore when using block devices directly ------------------------------------------------------------------- Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de From 84b510e46683b890451b471453b56d5066e4b566 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 25 Oct 2011 14:17:37 +0000 Subject: [PATCH 3/9] fix sle build Rev openSUSE:Tools/152 Md5 52f3d7b1f3f20a76489d1391c66b429b 2011-10-25 14:17:37 adrianSuSE None --- build.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.spec b/build.spec index d5118499..36da82c1 100644 --- a/build.spec +++ b/build.spec @@ -96,15 +96,15 @@ for generating delta rpm packages. %install make DESTDIR=$RPM_BUILD_ROOT install -cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%{?suse_version} -%if 0%{?sles_version} - ln -s sles%{sles_version}.conf default.conf %if 0%{?sles_version} < 12 # use sle variation with IA64 compat package generation install -m 0644 baselibs_global-sle.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf %endif +cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +%if 0%{?suse_version} +%if 0%{?sles_version} + ln -s sles%{sles_version}.conf default.conf %else V=%suse_version ln -s sl${V:0:2}.${V:2:1}.conf default.conf From eea07eeb4a19476c6bd7e95cc66329da88fe1017 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 25 Oct 2011 14:40:31 +0000 Subject: [PATCH 4/9] fix buid for rpm v5 Rev openSUSE:Tools/153 Md5 e6f77415b78d2bb7dcf0b14f822475ba 2011-10-25 14:40:31 adrianSuSE None --- _service | 4 ++-- build-2011.10.10.tar.gz | 3 --- build-initvm.spec | 6 +++--- build-mkbaselibs-sle.spec | 6 +++--- build.changes | 6 ++++++ build.dsc | 2 +- build.spec | 6 +++--- obs-build-2011.10.25.tar.gz | 3 +++ 8 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 build-2011.10.10.tar.gz create mode 100644 obs-build-2011.10.25.tar.gz diff --git a/_service b/_service index a52dfd44..091b701c 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 2011.10.10 - git://gitorious.org/opensuse/build.git + 2011.10.25 + git://github.com/openSUSE/obs-build.git git diff --git a/build-2011.10.10.tar.gz b/build-2011.10.10.tar.gz deleted file mode 100644 index 5b469983..00000000 --- a/build-2011.10.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31d6d266cbc23fd326e09f1b3884165beb9340c3ec6fa967616d14bde09f27c9 -size 268519 diff --git a/build-initvm.spec b/build-initvm.spec index 5807c8af..20c91ca2 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -22,9 +22,9 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.07.01 +Version: 2011.10.25 Release: 0 -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: off Requires: build @@ -39,7 +39,7 @@ chroot or a secure virtualized environment. %prep -%setup -q -n build-%version +%setup -q -n obs-build-%version %build make CFLAGS="$RPM_BUILD_FLAGS" initvm-all diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 78f26e70..5477e099 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -23,11 +23,11 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages -Version: 2011.10.10 +Version: 2011.10.25 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -40,7 +40,7 @@ for generating base lib packages. This is the SLE variant including IA64 binary generation. %prep -%setup -q -n build-%{version} +%setup -q -n obs-build-%{version} %build diff --git a/build.changes b/build.changes index c96a2388..8c6c1579 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 25 14:40:05 UTC 2011 - adrian@suse.de + +- use github.com as git repo now +- fix build for rpmv5 + ------------------------------------------------------------------- Mon Oct 10 19:29:20 CEST 2011 - mls@suse.de diff --git a/build.dsc b/build.dsc index 04ba7754..6038364a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.10.10 +Version: 2011.10.25 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 36da82c1..bb00b14e 100644 --- a/build.spec +++ b/build.spec @@ -23,10 +23,10 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.10.10 +Version: 2011.10.25 Release: 0 #!BuildIgnore: build-mkbaselibs -Source: build-%{version}.tar.gz +Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -90,7 +90,7 @@ for generating delta rpm packages. %endif %prep -%setup -q +%setup -q -n obs-build-%version %build diff --git a/obs-build-2011.10.25.tar.gz b/obs-build-2011.10.25.tar.gz new file mode 100644 index 00000000..bd752b37 --- /dev/null +++ b/obs-build-2011.10.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4b51dbe1e85bdb7aa363886c91417d43c543351880f79e87586a614a0fb9329 +size 125148 From 9c0df80d6d1c1e5994089d357cc26afe3b29c030 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 13 Feb 2012 08:51:45 +0000 Subject: [PATCH 5/9] update Rev openSUSE:Tools/154 Md5 7ff295ca02ef2413500487e4ebea8680 2012-02-13 08:51:45 adrianSuSE None --- _service | 2 +- build-initvm.spec | 13 ++++++------- build-mkbaselibs-sle.spec | 11 ++++------- build.changes | 9 +++++++++ build.dsc | 2 +- build.spec | 17 ++++++----------- obs-build-2011.10.25.tar.gz | 3 --- obs-build-2012.02.13.tar.gz | 3 +++ 8 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 obs-build-2011.10.25.tar.gz create mode 100644 obs-build-2012.02.13.tar.gz diff --git a/_service b/_service index 091b701c..34a4a0e7 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.10.25 + 2012.02.13 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index 20c91ca2..7310ef7d 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -1,7 +1,7 @@ # # spec file for package build-initvm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,18 @@ # - Name: build-initvm -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.10.25 +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 2012.02.13 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: off Requires: build -BuildRequires: gcc glibc-devel +BuildRequires: gcc +BuildRequires: glibc-devel %if 0%{?suse_version} > 1200 BuildRequires: glibc-devel-static %endif diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 5477e099..530c301c 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -1,7 +1,7 @@ # # spec file for package build-mkbaselibs-sle # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: build-mkbaselibs-sle -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on Summary: Tools to generate base lib packages -Version: 2011.10.25 +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 2012.02.13 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 8c6c1579..1f25a9ad 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 13 08:49:34 UTC 2012 - adrian@suse.de + +- Support for openSUSE 12.2 (current factory) +- Support for crossbuild via Hostarch directive +- PPC KVM support +- swap space gets taken into account for ulimits +- Failure on not supported personality set + ------------------------------------------------------------------- Tue Oct 25 14:40:05 UTC 2011 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 6038364a..1cc526ae 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.10.25 +Version: 2012.02.13 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index bb00b14e..2f45fb41 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # # spec file for package build # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: build -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.10.25 +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 2012.02.13 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -66,9 +63,8 @@ chroot environment. %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} %package mkbaselibs -License: GPLv2+ -Group: Development/Tools/Building Summary: Tools to generate base lib packages +Group: Development/Tools/Building # NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules) %description mkbaselibs @@ -76,9 +72,8 @@ This package contains the parts which may be installed in the inner build system for generating base lib packages. %package mkdrpms -License: GPLv2+ -Group: Development/Tools/Building Summary: Tools to generate delta rpms +Group: Development/Tools/Building Requires: deltarpm # XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq Requires: build diff --git a/obs-build-2011.10.25.tar.gz b/obs-build-2011.10.25.tar.gz deleted file mode 100644 index bd752b37..00000000 --- a/obs-build-2011.10.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4b51dbe1e85bdb7aa363886c91417d43c543351880f79e87586a614a0fb9329 -size 125148 diff --git a/obs-build-2012.02.13.tar.gz b/obs-build-2012.02.13.tar.gz new file mode 100644 index 00000000..b496b9c7 --- /dev/null +++ b/obs-build-2012.02.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b682f371d3d1cb62f8b07561d8250e7b3a8ca704ff23b9b7bbe5bdb4c946170e +size 130331 From 26ad63c2767c29db988c9bb761a1d1eb1814a19b Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 29 Feb 2012 10:04:04 +0000 Subject: [PATCH 6/9] update Rev openSUSE:Tools/155 Md5 11d6490037f058c08f2087cf505e1207 2012-02-29 10:04:04 adrianSuSE None --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 7 +++++++ build.dsc | 2 +- build.spec | 4 ++-- obs-build-2012.02.13.tar.gz | 3 --- obs-build-2012.02.29.tar.gz | 3 +++ 8 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 obs-build-2012.02.13.tar.gz create mode 100644 obs-build-2012.02.29.tar.gz diff --git a/_service b/_service index 34a4a0e7..d58e23f4 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.02.13 + 2012.02.29 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index 7310ef7d..f8f519b9 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -20,7 +20,7 @@ Name: build-initvm Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.02.13 +Version: 2012.02.29 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 530c301c..6ba0f592 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.02.13 +Version: 2012.02.29 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 1f25a9ad..9ba1a970 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 29 10:02:52 UTC 2012 - adrian@suse.de + +- using xz compression for kiwi raw files +- progress counters during installing +- 12.2 config added + ------------------------------------------------------------------- Mon Feb 13 08:49:34 UTC 2012 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 1cc526ae..e7b93725 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.02.13 +Version: 2012.02.29 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 2f45fb41..7a13b207 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+ Group: Development/Tools/Building -Version: 2012.02.13 +Version: 2012.02.29 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -30,8 +30,8 @@ BuildArch: noarch AutoReqProv: off # Keep the following dependencies in sync with obs-worker package Requires: bash -Requires: perl Requires: binutils +Requires: perl Requires: tar Conflicts: bsdtar < 2.5.5 %if 0%{?suse_version} > 1000 diff --git a/obs-build-2012.02.13.tar.gz b/obs-build-2012.02.13.tar.gz deleted file mode 100644 index b496b9c7..00000000 --- a/obs-build-2012.02.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b682f371d3d1cb62f8b07561d8250e7b3a8ca704ff23b9b7bbe5bdb4c946170e -size 130331 diff --git a/obs-build-2012.02.29.tar.gz b/obs-build-2012.02.29.tar.gz new file mode 100644 index 00000000..1afed167 --- /dev/null +++ b/obs-build-2012.02.29.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:333a88541e035bbab755d92130102cc107d1ca9bc6e243bc2c6263235085be24 +size 130283 From 4912b8d3ea090f0f69b921b1f789bcce0e289f5f Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 7 Mar 2012 09:55:17 +0000 Subject: [PATCH 7/9] update Rev openSUSE:Tools/156 Md5 f37dd61be20166d89c85c95a192fcfac 2012-03-07 09:55:17 adrianSuSE None --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 7 +++++++ build.dsc | 2 +- build.spec | 2 +- obs-build-2012.02.29.tar.gz | 3 --- obs-build-2012.03.06.tar.gz | 3 +++ 8 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 obs-build-2012.02.29.tar.gz create mode 100644 obs-build-2012.03.06.tar.gz diff --git a/_service b/_service index d58e23f4..f8f56bb7 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.02.29 + 2012.03.06 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index f8f519b9..815c4d58 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -20,7 +20,7 @@ Name: build-initvm Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.02.29 +Version: 2012.03.06 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 6ba0f592..6af27c52 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.02.29 +Version: 2012.03.06 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 9ba1a970..b4be02c3 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 7 09:55:02 UTC 2012 - adrian@suse.de + +- check_emulator needs to use $BUILD_DIR for initvm checks or obs + worker builds may break +- Introduce --vmdisk-mount-options + ------------------------------------------------------------------- Wed Feb 29 10:02:52 UTC 2012 - adrian@suse.de diff --git a/build.dsc b/build.dsc index e7b93725..f1a92f53 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.02.29 +Version: 2012.03.06 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 7a13b207..0cd88eb1 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+ Group: Development/Tools/Building -Version: 2012.02.29 +Version: 2012.03.06 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz diff --git a/obs-build-2012.02.29.tar.gz b/obs-build-2012.02.29.tar.gz deleted file mode 100644 index 1afed167..00000000 --- a/obs-build-2012.02.29.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:333a88541e035bbab755d92130102cc107d1ca9bc6e243bc2c6263235085be24 -size 130283 diff --git a/obs-build-2012.03.06.tar.gz b/obs-build-2012.03.06.tar.gz new file mode 100644 index 00000000..c1252a03 --- /dev/null +++ b/obs-build-2012.03.06.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af932ed7251259ee70ad4d212cedf3f10d17031e595545312125a9b13967386c +size 130048 From 2e313f0b9019052e736dfe58dc86a9b7ccfad069 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 17 Apr 2012 11:57:35 +0000 Subject: [PATCH 8/9] update Rev openSUSE:Tools/157 Md5 012bfb92e0b48384dffdb3a992894cbc 2012-04-17 11:57:35 adrianSuSE None --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.dsc | 2 +- build.spec | 2 +- obs-build-2012.03.06.tar.gz | 3 --- obs-build-2012.03.17.tar.gz | 3 +++ 7 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 obs-build-2012.03.06.tar.gz create mode 100644 obs-build-2012.03.17.tar.gz diff --git a/_service b/_service index f8f56bb7..135d2f96 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.03.06 + 2012.03.17 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index 815c4d58..0fa761ed 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -20,7 +20,7 @@ Name: build-initvm Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.03.06 +Version: 2012.03.17 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 6af27c52..52ca0103 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.03.06 +Version: 2012.03.17 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.dsc b/build.dsc index f1a92f53..89124dec 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.03.06 +Version: 2012.03.17 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 0cd88eb1..705fda64 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+ Group: Development/Tools/Building -Version: 2012.03.06 +Version: 2012.03.17 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz diff --git a/obs-build-2012.03.06.tar.gz b/obs-build-2012.03.06.tar.gz deleted file mode 100644 index c1252a03..00000000 --- a/obs-build-2012.03.06.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af932ed7251259ee70ad4d212cedf3f10d17031e595545312125a9b13967386c -size 130048 diff --git a/obs-build-2012.03.17.tar.gz b/obs-build-2012.03.17.tar.gz new file mode 100644 index 00000000..fba74c92 --- /dev/null +++ b/obs-build-2012.03.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53563bdc4bdd108a6db46e83d9947a3ebd808a64823ae826f5851debec174ec9 +size 133911 From 6d553f871ce09027ae8f9c0af1901e5eebb8e055 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 17 Apr 2012 13:58:01 +0000 Subject: [PATCH 9/9] license update: GPL-2.0+ and GPL-2.0 See e.g. spec2changelog by Pascal Bleser. Also, there should be a copy of the GPL-2.0 license in the package Rev openSUSE:Tools/158 Md5 c4c76b91efc3cee0a7ac8937ba51b63d 2012-04-17 13:58:01 adrianSuSE 114174 --- build.changes | 7 +++++++ build.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.changes b/build.changes index b4be02c3..0c2cd5b8 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 17 13:54:12 UTC 2012 - cfarrell@suse.com + +- license update: GPL-2.0+ and GPL-2.0 + See e.g. spec2changelog by Pascal Bleser. Also, there should be a copy of + the GPL-2.0 license in the package + ------------------------------------------------------------------- Wed Mar 7 09:55:02 UTC 2012 - adrian@suse.de diff --git a/build.spec b/build.spec index 705fda64..6259a8f7 100644 --- a/build.spec +++ b/build.spec @@ -18,7 +18,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs -License: GPL-2.0+ +License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building Version: 2012.03.17 Release: 0