From 67242fdf51bbb0e3c1ff02bd5f4c219e719d3483 Mon Sep 17 00:00:00 2001 From: OBS User coolo Date: Wed, 25 Jul 2012 14:23:34 +0000 Subject: [PATCH 1/5] Fix wrong version number in debian.changelog And while at it, misc improvements to the Debian packaging Rev openSUSE:Tools/176 Md5 51448153e90ec7efcde8712d8fa82919 2012-07-25 14:23:34 coolo 128814 --- build.dsc | 5 ++++- debian.changelog | 13 ++++++++++++- debian.tar.gz | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/build.dsc b/build.dsc index 7425af48..1415ee61 100644 --- a/build.dsc +++ b/build.dsc @@ -5,5 +5,8 @@ Binary: build Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) +Build-Depends: debhelper (>= 7) +VCS-Git: git://github.com/openSUSE/obs-build.git +VCS-Browser: https://github.com/openSUSE/obs-build +Homepage: https://build.opensuse.org/package/show?package=build&project=openSUSE%3ATools diff --git a/debian.changelog b/debian.changelog index bcb5fb5c..f89570a3 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,15 @@ -build (2011.09.26-1) unstable; urgency=low +build (2012.07.19-2) unstable; urgency=low + + * fix version in debian.changelog + * misc updates for debian/* + - Use debhelper compat level 7 (lenny) + - Add some informational headers to control + - Simplify rules file by using dh + - Convert copyright file to UTF-8 + + -- Frank Lichtenheld Tue, 24 Jul 2012 00:13:28 +0200 + +build (2012.07.19-1) unstable; urgency=low * update 12.2 config to RC1 state * add 12.3 config to fix build for factory diff --git a/debian.tar.gz b/debian.tar.gz index 6ff99671..893f26ca 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:f91fb16572adc921059cb857a6c4a6ebc6dded6c1a93762f0ae28c9123efb624 +size 1093 From 38487b0468feb0747f0af88353c653430502ed0c Mon Sep 17 00:00:00 2001 From: OBS User mlschroe Date: Mon, 13 Aug 2012 10:56:40 +0000 Subject: [PATCH 2/5] add PKGBUILD file Rev openSUSE:Tools/177 Md5 e2852578be95ca806335f63a26ac8968 2012-08-13 10:56:40 mlschroe None --- PKGBUILD | 17 +++++++++++++++++ build.spec | 2 -- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 00000000..135ca4e0 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,17 @@ +pkgname=build +pkgver=2012.07.19 +pkgrel=1 +pkgdesc="Build packages in sandbox" +arch=('i686' 'x86_64') +url="https://www.github.com/openSUSE/obs-build" +license=('GPL-2.0+' 'GPL-2.0') +groups=('base-devel') +depends=('perl') +source=(obs-build-${pkgver}.tar.gz) +md5sums=('643d53f6327913eecf57fb6fa166db5e') + +package() { + msg "Installing build ..." + cd "${srcdir}"/obs-build-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/build.spec b/build.spec index 1adac3b9..37f1e390 100644 --- a/build.spec +++ b/build.spec @@ -64,7 +64,6 @@ chroot environment. %package mkbaselibs 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 @@ -73,7 +72,6 @@ for generating base lib packages. %package mkdrpms 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 From cc284bffb40b090e5e66f05ba025591a0b5e1f96 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 21 Aug 2012 09:02:14 +0000 Subject: [PATCH 3/5] update Rev openSUSE:Tools/178 Md5 80e3a4e9a5b78d5d49b4de6d897cb2a2 2012-08-21 09:02:14 adrianSuSE None --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 9 +++++++++ build.dsc | 2 +- build.spec | 4 +++- obs-build-2012.07.19.tar.gz | 3 --- obs-build-2012.08.20.tar.gz | 3 +++ 8 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 obs-build-2012.07.19.tar.gz create mode 100644 obs-build-2012.08.20.tar.gz diff --git a/_service b/_service index 43953f74..99dea61a 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.07.19 + 2012.08.20 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index c6770684..860be7fb 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.07.19 +Version: 2012.08.20 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 0d94c5dd..4ed87acb 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.07.19 +Version: 2012.08.20 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 9a564e7a..e074ffd2 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 21 08:56:05 UTC 2012 - adrian@suse.de + +- update to current git + * fixed cross build initialsation with chroot + * ignore prereqs for subpacks to be built + * more Arch Linux support + * new --vmdisk-clean switch + ------------------------------------------------------------------- Thu Jul 19 07:47:23 UTC 2012 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 1415ee61..5df12d34 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.07.19 +Version: 2012.08.20 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 37f1e390..8af9980e 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+ and GPL-2.0 Group: Development/Tools/Building -Version: 2012.07.19 +Version: 2012.08.20 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -64,6 +64,7 @@ chroot environment. %package mkbaselibs 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 @@ -72,6 +73,7 @@ for generating base lib packages. %package mkdrpms 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-2012.07.19.tar.gz b/obs-build-2012.07.19.tar.gz deleted file mode 100644 index 97c4b9bd..00000000 --- a/obs-build-2012.07.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed29a061584034c836b31f6336b7fa0d143d87d89dbf19513f36065e1fa67d2e -size 131712 diff --git a/obs-build-2012.08.20.tar.gz b/obs-build-2012.08.20.tar.gz new file mode 100644 index 00000000..823b5311 --- /dev/null +++ b/obs-build-2012.08.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71325903d5a7de6c9e6b5417770574d308bde6dcb2d9208e30d6ab5480e5528b +size 132404 From 5f860202d34d57e881a3c02d46688d42e45f4a69 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 21 Aug 2012 09:33:28 +0000 Subject: [PATCH 4/5] add Rev openSUSE:Tools/179 Md5 361f0ef3dd1464cb0b2443a0dbbc7586 2012-08-21 09:33:28 adrianSuSE None --- build.changes | 1 + build.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/build.changes b/build.changes index e074ffd2..077ca2da 100644 --- a/build.changes +++ b/build.changes @@ -6,6 +6,7 @@ Tue Aug 21 08:56:05 UTC 2012 - adrian@suse.de * ignore prereqs for subpacks to be built * more Arch Linux support * new --vmdisk-clean switch +- add recommends to qemu-linux-user ------------------------------------------------------------------- Thu Jul 19 07:47:23 UTC 2012 - adrian@suse.de diff --git a/build.spec b/build.spec index 8af9980e..bc898fa1 100644 --- a/build.spec +++ b/build.spec @@ -45,6 +45,7 @@ Recommends: perl(Time::Zone) Recommends: perl(URI) Recommends: perl(XML::Parser) Recommends: bsdtar +Recommends: qemu-linux-user %endif %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} From b924d3b2a7a026e4377b9b8892d91fa10c8222fd Mon Sep 17 00:00:00 2001 From: OBS User mlschroe Date: Fri, 24 Aug 2012 12:10:15 +0000 Subject: [PATCH 5/5] - update to current git Rev openSUSE:Tools/180 Md5 92d14a1f3d16916c198d4b2db9b93ced 2012-08-24 12:10:15 mlschroe None --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 8 ++++++++ build.spec | 4 +--- debian.changelog | 9 +++++++++ obs-build-2012.08.20.tar.gz | 3 --- obs-build-2012.08.24.tar.gz | 3 +++ 8 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 obs-build-2012.08.20.tar.gz create mode 100644 obs-build-2012.08.24.tar.gz diff --git a/_service b/_service index 99dea61a..109c394b 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.08.20 + 2012.08.24 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index 860be7fb..7adac1e8 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.08.20 +Version: 2012.08.24 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 4ed87acb..04b8d008 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.08.20 +Version: 2012.08.24 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 077ca2da..748ba335 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 24 14:04:11 CEST 2012 - mls@suse.de + +- update to current git + * fixed arch PKGBUILD parsing + * add .qcow2 file handling for kiwi + * support root tar ball output format of kiwi + ------------------------------------------------------------------- Tue Aug 21 08:56:05 UTC 2012 - adrian@suse.de diff --git a/build.spec b/build.spec index bc898fa1..52842948 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+ and GPL-2.0 Group: Development/Tools/Building -Version: 2012.08.20 +Version: 2012.08.24 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -65,7 +65,6 @@ chroot environment. %package mkbaselibs 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 @@ -74,7 +73,6 @@ for generating base lib packages. %package mkdrpms 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/debian.changelog b/debian.changelog index f89570a3..8c7a9ae5 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,12 @@ +build (2012.08.24-1) unstable; urgency=low + + * update to current git + - fixed arch PKGBUILD parsing + - add .qcow2 file handling for kiwi + - support root tar ball output format of kiwi + + -- Michael Schroeder Fri, 24 Aug 2012 14:06:31 +0200 + build (2012.07.19-2) unstable; urgency=low * fix version in debian.changelog diff --git a/obs-build-2012.08.20.tar.gz b/obs-build-2012.08.20.tar.gz deleted file mode 100644 index 823b5311..00000000 --- a/obs-build-2012.08.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71325903d5a7de6c9e6b5417770574d308bde6dcb2d9208e30d6ab5480e5528b -size 132404 diff --git a/obs-build-2012.08.24.tar.gz b/obs-build-2012.08.24.tar.gz new file mode 100644 index 00000000..3df4b33c --- /dev/null +++ b/obs-build-2012.08.24.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b19fec508ed6f878df191f4af2de29b066c9f462f2e4611dda7099a80e22301 +size 135765