From 5f92ac7a4040e09f61c5d76c4b45264a86e902b7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 2 Aug 2010 09:53:53 +0000 Subject: [PATCH 1/3] checked in (request 44228) Rev openSUSE:Tools/98 Md5 ae94c90395c31d5d5b1e52d63c8a1923 2010-08-02 09:53:53 autobuild 44228 --- build-2010.07.08.tar.gz | 3 +++ build-2010.07.28.tar.gz | 3 --- build.changes | 15 --------------- build.dsc | 2 +- build.spec | 4 ++-- debian.changelog | 10 ---------- 6 files changed, 6 insertions(+), 31 deletions(-) create mode 100644 build-2010.07.08.tar.gz delete mode 100644 build-2010.07.28.tar.gz diff --git a/build-2010.07.08.tar.gz b/build-2010.07.08.tar.gz new file mode 100644 index 00000000..a64dc88a --- /dev/null +++ b/build-2010.07.08.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:060b3025f6af4669fca48095fb18f63aa8f64bd244faf93b2b62a9cd1afd0b3f +size 108355 diff --git a/build-2010.07.28.tar.gz b/build-2010.07.28.tar.gz deleted file mode 100644 index ba2f7aae..00000000 --- a/build-2010.07.28.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c55641402fdfe7e7796a0fadcacfbc78cec97124da017e3d9897003e71ff38bd -size 99969 diff --git a/build.changes b/build.changes index c3b794ac..cfd199c0 100644 --- a/build.changes +++ b/build.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 28 15:44:41 CEST 2010 - mls@suse.de - -- update to current git - * document --repo and --dist - * update wiki links - * fix bugs in repo handling - * fix distribution autodetection code - -------------------------------------------------------------------- -Thu Jul 22 09:22:03 UTC 2010 - adrian@suse.de - -- update to current git - * support for Files provide - ------------------------------------------------------------------- Thu Jul 8 13:15:42 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 2d965524..a93e06d0 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.07.28 +Version: 2010.07.08 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 6f3d9bdb..c36a8981 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.07.28) +# spec file for package build (Version 2010.07.08) # # 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.07.28 +Version: 2010.07.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") diff --git a/debian.changelog b/debian.changelog index 44dcf69d..8e2dd09b 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,13 +1,3 @@ -build (2010.07.28-1) unstable; urgency=low - - * Update to current git trunk - - document --repo and --dist - - update wiki links - - fix bugs in repo handling - - fix distribution autodetection code - - -- Michael Schroeder Wed, 28 Jul 2010 12:46:52 +0200 - build (2010.07.08-1) unstable; urgency=low * Update to current git trunk From 524f5413e9446c12c5914bd39de59e5c27add803 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 15 Oct 2010 10:25:51 +0000 Subject: [PATCH 2/3] okay ... Rev openSUSE:Tools/99 Md5 46d0557abd57bb15dd29f8154e257c62 2010-10-15 10:25:51 adrianSuSE 50807 --- _service | 5 + ...recompress:tar_scm:build-2010.10.12.tar.gz | 3 + _service:set_version:build.dsc | 9 ++ _service:set_version:build.spec | 110 ++++++++++++++++++ build-2010.07.08.tar.gz | 3 - build.changes | 34 ++++++ build.dsc | 2 +- build.spec | 4 +- debian.changelog | 10 ++ 9 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:build-2010.10.12.tar.gz create mode 100644 _service:set_version:build.dsc create mode 100644 _service:set_version:build.spec delete mode 100644 build-2010.07.08.tar.gz diff --git a/_service b/_service new file mode 100644 index 00000000..749bda53 --- /dev/null +++ b/_service @@ -0,0 +1,5 @@ + + 2010.10.12git://gitorious.org/opensuse/build.gitgit +gz*.tar + + diff --git a/_service:recompress:tar_scm:build-2010.10.12.tar.gz b/_service:recompress:tar_scm:build-2010.10.12.tar.gz new file mode 100644 index 00000000..b2680c21 --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.10.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f04a2e2a6a2a0b45b8dcf1c82f694a50d581f5f6baaec4d0da664787bec9579 +size 582481 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc new file mode 100644 index 00000000..2eda7b74 --- /dev/null +++ b/_service:set_version:build.dsc @@ -0,0 +1,9 @@ +Format: 1.0 +Source: build +Version: 2010.10.12 +Binary: build +Maintainer: Adrian Schroeter +Architecture: all +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 4) + diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec new file mode 100644 index 00000000..ddb971e7 --- /dev/null +++ b/_service:set_version:build.spec @@ -0,0 +1,110 @@ +# +# spec file for package build (Version 2010.07.28) +# +# Copyright (c) 2010 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/ +# + +# norootforbuild + + +Name: build +License: GPLv2+ +Group: Development/Tools/Building +AutoReqProv: on +Summary: A Script to Build SUSE Linux RPMs +Version: 2010.10.12 +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") +# VERSION="$(date +"%Y.%m.%d").r$REVISION" +# svn export -r$REVISION https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build build-$VERSION +# tar cjvf build-$VERSION.tar.bz2 build-$VERSION +# rm -rf build-$VERSION +# osc add build-$VERSION.tar.bz2 +# # There's several occurences of "Version: something" in this file, +# # two of them valid, so we need to be picky in the match. +# sed --in-place build.spec -e"/\(Version:\?[[:space:]]\+\)\([0-9]\{4\}\.[0-9][0-9]\.[0-9][0-9]\.r[0-9]\+\)/s,,\1$VERSION," +# osc build build.spec +# osc ci +# osc submitreq create -m"current svn snapshot." openSUSE:Tools build openSUSE:Factory +#!BuildIgnore: build-mkbaselibs +Source: 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: perl-TimeDate +Requires: binutils +Requires: tar + +%description +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 +License: GPLv2+ +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 + +%build + +%install +make DESTDIR=$RPM_BUILD_ROOT install +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) +%doc README +/usr/bin/build +/usr/bin/buildvc +/usr/bin/unrpm +/usr/lib/build +%{_mandir}/man1/build.1* + +%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} +%exclude /usr/lib/build/mkbaselibs +%exclude /usr/lib/build/baselibs* + +%files mkbaselibs +%defattr(-,root,root) +%dir /usr/lib/build +/usr/lib/build/mkbaselibs +/usr/lib/build/baselibs* +%endif + +%changelog diff --git a/build-2010.07.08.tar.gz b/build-2010.07.08.tar.gz deleted file mode 100644 index a64dc88a..00000000 --- a/build-2010.07.08.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:060b3025f6af4669fca48095fb18f63aa8f64bd244faf93b2b62a9cd1afd0b3f -size 108355 diff --git a/build.changes b/build.changes index cfd199c0..1c00131f 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Sep 21 13:23:00 UTC 2010 - adrian@suse.de + +- update to current git + * workaround for supporting rpm install on cross build with native + acceleration + +------------------------------------------------------------------- +Tue Aug 24 08:32:05 UTC 2010 - adrian@suse.de + +- update to current git + * support for mips cross build + +------------------------------------------------------------------- +Wed Aug 4 15:31:41 UTC 2010 - adrian@suse.de + +- update to current git + * replace release number macros with 0 if not specified + +------------------------------------------------------------------- +Wed Jul 28 15:44:41 CEST 2010 - mls@suse.de + +- update to current git + * document --repo and --dist + * update wiki links + * fix bugs in repo handling + * fix distribution autodetection code + +------------------------------------------------------------------- +Thu Jul 22 09:22:03 UTC 2010 - adrian@suse.de + +- update to current git + * support for Files provide + ------------------------------------------------------------------- Thu Jul 8 13:15:42 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index a93e06d0..f8a206a9 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.07.08 +Version: 2010.08.23 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index c36a8981..f71fe737 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.07.08) +# spec file for package build (Version 2010.07.28) # # 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.07.08 +Version: 2010.08.23 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") diff --git a/debian.changelog b/debian.changelog index 8e2dd09b..44dcf69d 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,13 @@ +build (2010.07.28-1) unstable; urgency=low + + * Update to current git trunk + - document --repo and --dist + - update wiki links + - fix bugs in repo handling + - fix distribution autodetection code + + -- Michael Schroeder Wed, 28 Jul 2010 12:46:52 +0200 + build (2010.07.08-1) unstable; urgency=low * Update to current git trunk From 1c7c33419197616cf94b59e3fbd6acfa0c249c54 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 15 Oct 2010 10:39:47 +0000 Subject: [PATCH 3/3] freeze version Rev openSUSE:Tools/100 Md5 a7fc942abfa892133ce747f2dd091631 2010-10-15 10:39:47 adrianSuSE None --- _service | 5 - _service:set_version:build.dsc | 9 -- _service:set_version:build.spec | 110 ------------------ ...10.10.12.tar.gz => build-2010.10.12.tar.gz | 0 build.changes | 9 ++ build.dsc | 2 +- build.spec | 2 +- 7 files changed, 11 insertions(+), 126 deletions(-) delete mode 100644 _service delete mode 100644 _service:set_version:build.dsc delete mode 100644 _service:set_version:build.spec rename _service:recompress:tar_scm:build-2010.10.12.tar.gz => build-2010.10.12.tar.gz (100%) diff --git a/_service b/_service deleted file mode 100644 index 749bda53..00000000 --- a/_service +++ /dev/null @@ -1,5 +0,0 @@ - - 2010.10.12git://gitorious.org/opensuse/build.gitgit -gz*.tar - - diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc deleted file mode 100644 index 2eda7b74..00000000 --- a/_service:set_version:build.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: build -Version: 2010.10.12 -Binary: build -Maintainer: Adrian Schroeter -Architecture: all -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) - diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec deleted file mode 100644 index ddb971e7..00000000 --- a/_service:set_version:build.spec +++ /dev/null @@ -1,110 +0,0 @@ -# -# spec file for package build (Version 2010.07.28) -# -# Copyright (c) 2010 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/ -# - -# norootforbuild - - -Name: build -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -Summary: A Script to Build SUSE Linux RPMs -Version: 2010.10.12 -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") -# VERSION="$(date +"%Y.%m.%d").r$REVISION" -# svn export -r$REVISION https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build build-$VERSION -# tar cjvf build-$VERSION.tar.bz2 build-$VERSION -# rm -rf build-$VERSION -# osc add build-$VERSION.tar.bz2 -# # There's several occurences of "Version: something" in this file, -# # two of them valid, so we need to be picky in the match. -# sed --in-place build.spec -e"/\(Version:\?[[:space:]]\+\)\([0-9]\{4\}\.[0-9][0-9]\.[0-9][0-9]\.r[0-9]\+\)/s,,\1$VERSION," -# osc build build.spec -# osc ci -# osc submitreq create -m"current svn snapshot." openSUSE:Tools build openSUSE:Factory -#!BuildIgnore: build-mkbaselibs -Source: 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: perl-TimeDate -Requires: binutils -Requires: tar - -%description -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 -License: GPLv2+ -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 - -%build - -%install -make DESTDIR=$RPM_BUILD_ROOT install -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) -%doc README -/usr/bin/build -/usr/bin/buildvc -/usr/bin/unrpm -/usr/lib/build -%{_mandir}/man1/build.1* - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -%exclude /usr/lib/build/mkbaselibs -%exclude /usr/lib/build/baselibs* - -%files mkbaselibs -%defattr(-,root,root) -%dir /usr/lib/build -/usr/lib/build/mkbaselibs -/usr/lib/build/baselibs* -%endif - -%changelog diff --git a/_service:recompress:tar_scm:build-2010.10.12.tar.gz b/build-2010.10.12.tar.gz similarity index 100% rename from _service:recompress:tar_scm:build-2010.10.12.tar.gz rename to build-2010.10.12.tar.gz diff --git a/build.changes b/build.changes index 1c00131f..025dd8f0 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 15 10:27:08 UTC 2010 - adrian@suse.de + +- update to current git + * export also fallback archs as exclusive archs for kiwi product + building, fixes factory dvd5 64bit media + * cross build fixes by Martin Mohring + * correct disk image file creation, it was one byte too large by James Perkins + ------------------------------------------------------------------- Tue Sep 21 13:23:00 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index f8a206a9..2eda7b74 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.08.23 +Version: 2010.10.12 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index f71fe737..ddb971e7 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.08.23 +Version: 2010.10.12 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")