From 24ed25abb811e6881698f463b88332bb5986a023 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 25 Feb 2010 01:19:10 +0000 Subject: [PATCH 1/7] checked in (request 33317) Rev openSUSE:Tools/72 Md5 be9247fc736e7c350a70b31a854d3f5f 2010-02-25 01:19:10 autobuild 33317 --- build-2010.01.13.tar.gz | 3 +++ build-2010.02.19.tar.gz | 3 --- build.changes | 30 ------------------------------ build.dsc | 2 +- build.spec | 8 +++----- debian.changelog | 7 ------- debian.tar.gz | 4 ++-- ready | 0 8 files changed, 9 insertions(+), 48 deletions(-) create mode 100644 build-2010.01.13.tar.gz delete mode 100644 build-2010.02.19.tar.gz create mode 100644 ready diff --git a/build-2010.01.13.tar.gz b/build-2010.01.13.tar.gz new file mode 100644 index 00000000..ad77bac7 --- /dev/null +++ b/build-2010.01.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c8a5bf683f8d3154dc3f146ce0d7c1905129baf5f2ea0fe48443948f5121235 +size 95361 diff --git a/build-2010.02.19.tar.gz b/build-2010.02.19.tar.gz deleted file mode 100644 index 1767c32f..00000000 --- a/build-2010.02.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec61bd1966eef22cd22444dd753be2910cac3f8665a30fa8e264cef886f009f2 -size 99327 diff --git a/build.changes b/build.changes index ddfbc5e3..7e2df124 100644 --- a/build.changes +++ b/build.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de - -- update to current git - * fix for permissions for debian (done by Jan-Simon) - -------------------------------------------------------------------- -Thu Feb 11 19:09:11 UTC 2010 - adrian@suse.de - -- update to current git - * fixed handling of kiwi build results - -------------------------------------------------------------------- -Mon Feb 8 15:52:12 UTC 2010 - adrian@suse.de - -- update to current git - * support kiwi 4.1 schema files - -------------------------------------------------------------------- -Tue Jan 19 14:57:22 UTC 2010 - adrian@suse.de - -- update to current git - * fixed missing --root parameter for substitutedeps call - -------------------------------------------------------------------- -Mon Jan 18 16:38:58 UTC 2010 - adrian@suse.de - -- update to current git - * create .sha256 files for kiwi image results - ------------------------------------------------------------------- Wed Jan 13 15:21:28 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 68bdcf50..f7472d1d 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.19 +Version: 2010.01.13 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index a20b9f95..40f0ac17 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.02.19 +Version: 2010.01.13 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") @@ -43,11 +43,9 @@ 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: /bin/bash +Requires: /usr/bin/perl Requires: perl-TimeDate -Requires: binutils %description This package provides a script for building RPMs for SUSE Linux in a diff --git a/debian.changelog b/debian.changelog index c5ac67c4..eb58e86a 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,10 +1,3 @@ -build (2010.02.02-1) unstable; urgency=low - - * Update to current git trunk - - Support new kiwi 4.1 schema files - - -- Adrian Schroeter Tue, 02 Feb 2010 10:03:54 +0200 - build (2009.09.23-1) unstable; urgency=low * Update to current svn trunk diff --git a/debian.tar.gz b/debian.tar.gz index 6ff99671..3ccd12d8 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 -size 1524 +oid sha256:39955bdd3da1f62d4027a2fff2feb12121ebcde2b67898c3f2eb512f9581213f +size 1782 diff --git a/ready b/ready new file mode 100644 index 00000000..e69de29b From 76f661ba338278c6e975544cfbb253ad6b5d94f1 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 25 Feb 2010 08:24:40 +0000 Subject: [PATCH 2/7] Rev openSUSE:Tools/73 Md5 78d9ff2762a7b0fa9c31f46d12290236 2010-02-25 08:24:40 adrianSuSE None --- build-2010.01.13.tar.gz | 3 --- build-2010.02.19.tar.gz | 3 +++ build.changes | 35 +++++++++++++++++++++++++++++++++++ build.dsc | 2 +- build.spec | 11 +++++++---- debian.changelog | 7 +++++++ debian.tar.gz | 4 ++-- 7 files changed, 55 insertions(+), 10 deletions(-) delete mode 100644 build-2010.01.13.tar.gz create mode 100644 build-2010.02.19.tar.gz diff --git a/build-2010.01.13.tar.gz b/build-2010.01.13.tar.gz deleted file mode 100644 index ad77bac7..00000000 --- a/build-2010.01.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c8a5bf683f8d3154dc3f146ce0d7c1905129baf5f2ea0fe48443948f5121235 -size 95361 diff --git a/build-2010.02.19.tar.gz b/build-2010.02.19.tar.gz new file mode 100644 index 00000000..1767c32f --- /dev/null +++ b/build-2010.02.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec61bd1966eef22cd22444dd753be2910cac3f8665a30fa8e264cef886f009f2 +size 99327 diff --git a/build.changes b/build.changes index 7e2df124..abf171eb 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Feb 25 08:21:03 UTC 2010 - adrian@suse.de + +- add requires to tar to fix debian builds + +------------------------------------------------------------------- +Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de + +- update to current git + * fix for permissions for debian (done by Jan-Simon) + +------------------------------------------------------------------- +Thu Feb 11 19:09:11 UTC 2010 - adrian@suse.de + +- update to current git + * fixed handling of kiwi build results + +------------------------------------------------------------------- +Mon Feb 8 15:52:12 UTC 2010 - adrian@suse.de + +- update to current git + * support kiwi 4.1 schema files + +------------------------------------------------------------------- +Tue Jan 19 14:57:22 UTC 2010 - adrian@suse.de + +- update to current git + * fixed missing --root parameter for substitutedeps call + +------------------------------------------------------------------- +Mon Jan 18 16:38:58 UTC 2010 - adrian@suse.de + +- update to current git + * create .sha256 files for kiwi image results + ------------------------------------------------------------------- Wed Jan 13 15:21:28 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index f7472d1d..68bdcf50 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.01.13 +Version: 2010.02.19 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 40f0ac17..5cb29acb 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.01.13) +# spec file for package build (Version 2010.02.19) # # 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.01.13 +Version: 2010.02.19 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") @@ -43,9 +43,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static AutoReqProv: off -Requires: /bin/bash -Requires: /usr/bin/perl +# Keep the following dependencies in sync with obs-worker package +Requires: bash +Requires: perl Requires: perl-TimeDate +Requires: binutils +Requires: tar %description This package provides a script for building RPMs for SUSE Linux in a diff --git a/debian.changelog b/debian.changelog index eb58e86a..c5ac67c4 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,10 @@ +build (2010.02.02-1) unstable; urgency=low + + * Update to current git trunk + - Support new kiwi 4.1 schema files + + -- Adrian Schroeter Tue, 02 Feb 2010 10:03:54 +0200 + build (2009.09.23-1) unstable; urgency=low * Update to current svn trunk diff --git a/debian.tar.gz b/debian.tar.gz index 3ccd12d8..6ff99671 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39955bdd3da1f62d4027a2fff2feb12121ebcde2b67898c3f2eb512f9581213f -size 1782 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524 From ec4dbc7a5dc32a396ccb4ea3078f5ccc0deeaa51 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 25 Feb 2010 08:25:08 +0000 Subject: [PATCH 3/7] Rev openSUSE:Tools/74 Md5 5ba225feba4c1629b8e808fc586e0929 2010-02-25 08:25:08 adrianSuSE None --- build-2010.02.19.tar.gz | 3 --- build-2010.02.25.tar.gz | 3 +++ build.changes | 4 ++-- build.dsc | 2 +- build.spec | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 build-2010.02.19.tar.gz create mode 100644 build-2010.02.25.tar.gz diff --git a/build-2010.02.19.tar.gz b/build-2010.02.19.tar.gz deleted file mode 100644 index 1767c32f..00000000 --- a/build-2010.02.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec61bd1966eef22cd22444dd753be2910cac3f8665a30fa8e264cef886f009f2 -size 99327 diff --git a/build-2010.02.25.tar.gz b/build-2010.02.25.tar.gz new file mode 100644 index 00000000..b037f240 --- /dev/null +++ b/build-2010.02.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2893908defec2e28c907e2557621d6664d5dc83c7595f5229a2d09d206bb2ff0 +size 99624 diff --git a/build.changes b/build.changes index abf171eb..b48e55ce 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu Feb 25 08:21:03 UTC 2010 - adrian@suse.de +Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de -- add requires to tar to fix debian builds +- add dependency to tar (needed for deb builds) ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 68bdcf50..134e618e 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.19 +Version: 2010.02.25 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 5cb29acb..ace032fa 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.02.19 +Version: 2010.02.25 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") From 344e33fcfdd003405c69b0f1b216477c869716fd Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 25 Feb 2010 08:26:05 +0000 Subject: [PATCH 4/7] Rev openSUSE:Tools/75 Md5 5946485a59cb9d7ab49b5a06b3f57e08 2010-02-25 08:26:05 adrianSuSE None --- build.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.changes b/build.changes index b48e55ce..58067ef6 100644 --- a/build.changes +++ b/build.changes @@ -2,6 +2,9 @@ Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de - add dependency to tar (needed for deb builds) +- use current git + * Added '--uid uid:gid' feature to specify abuild id in chroot + (by David Greaves) ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de From a85799f891f70b69da855917aa30c437bfc9db06 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 8 Mar 2010 12:07:38 +0000 Subject: [PATCH 5/7] fix default.conf Rev openSUSE:Tools/76 Md5 119efb2a17c0067e52987ae36f80bedc 2010-03-08 12:07:38 adrianSuSE None --- build-2010.02.25.tar.gz | 3 --- build-2010.03.08.tar.gz | 3 +++ build.changes | 6 ++++++ build.spec | 12 ++++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 build-2010.02.25.tar.gz create mode 100644 build-2010.03.08.tar.gz diff --git a/build-2010.02.25.tar.gz b/build-2010.02.25.tar.gz deleted file mode 100644 index b037f240..00000000 --- a/build-2010.02.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2893908defec2e28c907e2557621d6664d5dc83c7595f5229a2d09d206bb2ff0 -size 99624 diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz new file mode 100644 index 00000000..d4d63d3d --- /dev/null +++ b/build-2010.03.08.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b4590ef2f0c431dfe88b4f4e993e7634d699820f572d19f830bc1010273058a +size 100275 diff --git a/build.changes b/build.changes index 58067ef6..42e44115 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 8 12:07:03 UTC 2010 - adrian@suse.de + +- create default.conf symlink to correct *.conf based on + %suse_version and %sles_version macros + ------------------------------------------------------------------- Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de diff --git a/build.spec b/build.spec index ace032fa..c0cdcb08 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.02.25 +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") @@ -63,7 +63,15 @@ chroot environment. %install make DESTDIR=$RPM_BUILD_ROOT install -#ln -s /usr/lib/build/build $RPM_BUILD_ROOT/usr/bin/build +cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +%if 0%sles_version + ln -s sles%{sles_version}.conf default.conf +%else +%if 0%suse_version + V=%suse_version + ln -s sl${V:0:2}.${V:2:1}.conf default.conf +%endif +%endif %files %defattr(-,root,root) From b70cfdd559d7a7713789846d818be4fcea58da7a Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 8 Mar 2010 12:10:59 +0000 Subject: [PATCH 6/7] Rev openSUSE:Tools/77 Md5 7b285a8a1a07d1e74aca13b53c149129 2010-03-08 12:10:59 adrianSuSE None --- build-2010.03.08.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz index d4d63d3d..67eb1e4e 100644 --- a/build-2010.03.08.tar.gz +++ b/build-2010.03.08.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b4590ef2f0c431dfe88b4f4e993e7634d699820f572d19f830bc1010273058a -size 100275 +oid sha256:398c6cb2414a79a72677235e11736063b09cbf25b11c792a1fe3fd0de6df52fd +size 100257 From 942216425dbbd3b23587a8be4c655d9dae335b83 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 8 Mar 2010 12:13:35 +0000 Subject: [PATCH 7/7] Rev openSUSE:Tools/78 Md5 311e9aa5c1f34c99fa02fb2c9c52810d 2010-03-08 12:13:35 adrianSuSE None --- build.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.dsc b/build.dsc index 134e618e..7b975595 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.25 +Version: 2010.03.08 Binary: build Maintainer: Adrian Schroeter Architecture: all