diff --git a/_service b/_service index 6311f063..135d2f96 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 2011.09.26 - git://gitorious.org/opensuse/build.git + 2012.03.17 + git://github.com/openSUSE/obs-build.git git 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-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-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..0fa761ed --- /dev/null +++ b/build-initvm.spec @@ -0,0 +1,53 @@ +# +# spec file for package build-initvm +# +# 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 +# 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 +Summary: A Script to Build SUSE Linux RPMs +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 2012.03.17 +Release: 0 +Source: obs-build-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +AutoReqProv: off +Requires: build +BuildRequires: gcc +BuildRequires: 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 obs-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-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 53a5c6a8..52ca0103 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,19 +15,16 @@ # 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.09.26 +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 2012.03.17 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 +37,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 0e4e04b5..0c2cd5b8 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +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 + +- 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 + +- 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 + +- 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 + +- use github.com as git repo now +- fix build for rpmv5 + +------------------------------------------------------------------- +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 @@ -46,6 +93,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 @@ -54,26 +108,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 diff --git a/build.dsc b/build.dsc index 650f77e8..89124dec 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.09.26 +Version: 2012.03.17 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 636fff59..6259a8f7 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,26 +15,23 @@ # 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.09.26 +License: GPL-2.0+ and GPL-2.0 +Group: Development/Tools/Building +Version: 2012.03.17 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 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 @@ -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 @@ -90,21 +85,21 @@ for generating delta rpm packages. %endif %prep -%setup -q +%setup -q -n obs-build-%version %build %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 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 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