From 35a224883a082d5da29733cda516bbee1a9864e5 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 19 Mar 2010 09:37:21 +0000 Subject: [PATCH 1/2] checked in (request 35137) Rev openSUSE:Tools/81 Md5 5bd4650fd73b9888254665a71448711b 2010-03-19 09:37:21 autobuild 35137 --- build-2010.03.08.tar.gz | 3 +++ build-2010.03.10.tar.gz | 3 --- build.changes | 6 ------ build.dsc | 2 +- build.spec | 6 +++--- ready | 0 6 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 build-2010.03.08.tar.gz delete mode 100644 build-2010.03.10.tar.gz delete mode 100644 ready diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz new file mode 100644 index 00000000..67eb1e4e --- /dev/null +++ b/build-2010.03.08.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:398c6cb2414a79a72677235e11736063b09cbf25b11c792a1fe3fd0de6df52fd +size 100257 diff --git a/build-2010.03.10.tar.gz b/build-2010.03.10.tar.gz deleted file mode 100644 index b77d6834..00000000 --- a/build-2010.03.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd453f04ffe9062b8cc182109e3d278ea9f6d7e61d9634a717f8452fd20e6de2 -size 100529 diff --git a/build.changes b/build.changes index 50a63839..42e44115 100644 --- a/build.changes +++ b/build.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 10 13:34:45 UTC 2010 - adrian@suse.de - -- update to current git - * Kiwi exclude arch handling - ------------------------------------------------------------------- Mon Mar 8 12:07:03 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index c839bc2d..7b975595 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.03.10 +Version: 2010.03.08 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 3dcd1bf7..242b7b59 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: 2010.03.10 +Version: 2010.03.08 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -64,10 +64,10 @@ chroot environment. %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%{?sles_version} +%if 0%sles_version ln -s sles%{sles_version}.conf default.conf %else -%if 0%{?suse_version} +%if 0%suse_version V=%suse_version ln -s sl${V:0:2}.${V:2:1}.conf default.conf %endif diff --git a/ready b/ready deleted file mode 100644 index e69de29b..00000000 From e068a0314210b8fc7382153023e06d8091bbe7c7 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 15 Apr 2010 15:55:11 +0000 Subject: [PATCH 2/2] Copy from openSUSE:Tools:Unstable/build via accept of submit request 37997 revision 28. Request was accepted with message: thank you Rev openSUSE:Tools/82 Md5 1a914c961187847ee02853a30de1593d 2010-04-15 15:55:11 adrianSuSE 37997 --- build-2010.03.08.tar.gz | 3 --- build-2010.04.15.tar.gz | 3 +++ build.changes | 29 +++++++++++++++++++++++++++++ build.dsc | 2 +- build.spec | 29 +++++++++++++++++++++++++---- 5 files changed, 58 insertions(+), 8 deletions(-) delete mode 100644 build-2010.03.08.tar.gz create mode 100644 build-2010.04.15.tar.gz diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz deleted file mode 100644 index 67eb1e4e..00000000 --- a/build-2010.03.08.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:398c6cb2414a79a72677235e11736063b09cbf25b11c792a1fe3fd0de6df52fd -size 100257 diff --git a/build-2010.04.15.tar.gz b/build-2010.04.15.tar.gz new file mode 100644 index 00000000..10f037b8 --- /dev/null +++ b/build-2010.04.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b991dcf86303a884db86d508d4c661a135afbe07c460f30d94a9b71be824cf4c +size 102611 diff --git a/build.changes b/build.changes index 42e44115..bf3e5efe 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Apr 15 14:04:56 UTC 2010 - adrian@suse.de + +- split out -mkbaselibs package to avoid build dependency problems + on perl version updates in future. +- update to current git + * added armv6el to emulator archs by Jan-Simon. + * fixing a logic error in arch= attribute handling for kiwi + +------------------------------------------------------------------- +Fri Apr 9 07:58:24 UTC 2010 - adrian@suse.de + +- update to current git + * Support for remote yum repos by yi.y.yang@intel.com + * fixed kiwi file parsing for arch= attributes + +------------------------------------------------------------------- +Wed Mar 31 15:00:48 UTC 2010 - adrian@suse.de + +- update to current git + * kvm autosetup enhancements + * multiple bugfixes and refactoring + +------------------------------------------------------------------- +Wed Mar 10 13:34:45 UTC 2010 - adrian@suse.de + +- update to current git + * Kiwi exclude arch handling + ------------------------------------------------------------------- Mon Mar 8 12:07:03 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 7b975595..e2b3a0bf 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.03.08 +Version: 2010.04.15 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 242b7b59..ea0fe599 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.03.08) +# spec file for package build (Version 2010.03.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.03.08 +Version: 2010.04.15 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -55,6 +55,18 @@ This package provides a script for building RPMs for SUSE Linux in a chroot environment. +%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} +Requires: build-mkbaselibs + +%package mkbaselibs +Group: Development/Tools/Building +Summary: Tools to generate base lib packages +# NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules) + +%description mkbaselibs +This package contains the parts which may be installed in the inner build system +for generating base lib packages. +%endif %prep %setup -q @@ -64,10 +76,10 @@ chroot environment. %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%sles_version +%if 0%{?sles_version} ln -s sles%{sles_version}.conf default.conf %else -%if 0%suse_version +%if 0%{?suse_version} V=%suse_version ln -s sl${V:0:2}.${V:2:1}.conf default.conf %endif @@ -82,4 +94,13 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ /usr/lib/build %{_mandir}/man1/build.1* +%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} +%exclude /usr/lib/build/mkbaselibs + +%files mkbaselibs +%defattr(-,root,root) +%dir /usr/lib/build +/usr/lib/build/mkbaselibs +%endif + %changelog