From 8a1ba54ec7ba595a7647649d451a598184715d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 14 May 2013 12:10:30 +0000 Subject: [PATCH] osc copypac from project:OBS:Server:2.4 package:build revision:34, using keep-link OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=208 --- PKGBUILD | 4 ++-- build.changes | 10 ++++++++++ build.dsc | 7 ++----- build.spec | 14 +++++++++----- debian.changelog | 29 ----------------------------- debian.tar.gz | 4 ++-- obs-build-20130508.tar.gz | 3 --- obs-build-20130514.tar.gz | 3 +++ 8 files changed, 28 insertions(+), 46 deletions(-) delete mode 100644 obs-build-20130508.tar.gz create mode 100644 obs-build-20130514.tar.gz diff --git a/PKGBUILD b/PKGBUILD index e78e8e1..45c9842 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20130508 +pkgver=20130514 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0') groups=('base-devel') depends=('perl') source=(obs-build-${pkgver}.tar.gz) -md5sums=('61d38fe23efcd677e24a6f6919409d5b') +md5sums=('8c3484555b9e23a6933d7d513a32cae5') package() { msg "Installing build ..." diff --git a/build.changes b/build.changes index fbc8fe8..03f9ad1 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 14 10:52:18 UTC 2013 - adrian@suse.de + +- debian builds call linitian now if installed +- Arch Linux: support new pacman tool syntax +- support kiwi installation medias with new kiwi versions +- fixed regression using build host rpm instead of the version from chroot +- fixed repository priority ordering, when only some repos have a priority + and kiwi appliances get build + ------------------------------------------------------------------- Wed May 8 11:12:37 UTC 2013 - adrian@suse.de diff --git a/build.dsc b/build.dsc index aa87276..67abf84 100644 --- a/build.dsc +++ b/build.dsc @@ -1,12 +1,9 @@ Format: 1.0 Source: build -Version: 20130508 +Version: 20130514 Binary: build Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -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 +Build-Depends: debhelper (>= 4) diff --git a/build.spec b/build.spec index 62aa616..0613e81 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: 20130508 +Version: 20130514 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -85,7 +85,11 @@ for generating delta rpm packages. %endif -%package initvm-%{_host_cpu} +%define initvm_arch %{_host_cpu} +%if %{_host_cpu} == "i686" +%define initvm_arch i586 +%endif +%package initvm-%{initvm_arch} Summary: Virtualization initializer for emulated cross architecture builds Group: Development/Tools/Building Requires: build @@ -97,7 +101,7 @@ Obsoletes: build-initvm BuildRequires: glibc-devel-static %endif -%description initvm-%{_host_cpu} +%description initvm-%{initvm_arch} This package provides a script for building RPMs for SUSE Linux in a chroot or a secure virtualized @@ -109,8 +113,8 @@ make CFLAGS="$RPM_BUILD_FLAGS" initvm-all %install # initvm -strip initvm.%{_host_cpu} make DESTDIR=$RPM_BUILD_ROOT initvm-install +strip $RPM_BUILD_ROOT/usr/lib/build/initvm.* export NO_BRP_STRIP_DEBUG="true" chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* @@ -155,7 +159,7 @@ test -e default.conf /usr/lib/build/mkdrpms %endif -%files initvm-%{_host_cpu} +%files initvm-%{initvm_arch} %defattr(-,root,root) /usr/lib/build/initvm.* diff --git a/debian.changelog b/debian.changelog index 8c7a9ae..aecd64c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,32 +1,3 @@ -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 - * 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 - * do not package compressed _and_ uncompressed kiwi images - * add build timestamps in each logfile line - - -- Adrian Schroeter Thu, 19 Jul 2010 10:03:54 +0200 - build (2011.10.10-1) unstable; urgency=low * Update to current git trunk diff --git a/debian.tar.gz b/debian.tar.gz index 893f26c..6ff9967 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f91fb16572adc921059cb857a6c4a6ebc6dded6c1a93762f0ae28c9123efb624 -size 1093 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524 diff --git a/obs-build-20130508.tar.gz b/obs-build-20130508.tar.gz deleted file mode 100644 index 4537426..0000000 --- a/obs-build-20130508.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:347b5d1e3b3079db827c760e9cd6fb040bf33314584317fcba9249561c14de33 -size 152330 diff --git a/obs-build-20130514.tar.gz b/obs-build-20130514.tar.gz new file mode 100644 index 0000000..f9bad58 --- /dev/null +++ b/obs-build-20130514.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b5869bbabf7839f1e0b41301dd3551d463e4afd3a8d5641ed9dc64dea2056c3 +size 153635