diff --git a/PKGBUILD b/PKGBUILD index ca38230b..e8e82fb7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=build -pkgver=20130227 -pkgrel=1 +pkgver=20130517 +pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') url="https://www.github.com/openSUSE/obs-build" @@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0') groups=('base-devel') depends=('perl') source=(obs-build-${pkgver}.tar.gz) -md5sums=('3db9a882f3c7c57c0a89833230324c66') +md5sums=('3c25d0531aec60b2b984138a566799f8') package() { msg "Installing build ..." diff --git a/build-initvm.changes b/build-initvm.changes deleted file mode 100644 index d18eb7d2..00000000 --- a/build-initvm.changes +++ /dev/null @@ -1,12 +0,0 @@ -------------------------------------------------------------------- -Tue Oct 4 12:43:27 UTC 2011 - adrian@suse.de - -- use new qemu-*-binfmt handler to run commands with correct $0 -- fix build for Factory - -------------------------------------------------------------------- -Mon Mar 21 07:02:52 UTC 2011 - adrian@suse.de - -- initial package for new cross build support for OBS. Done by - James Perkins from LinuxFoundation - diff --git a/build-initvm.spec b/build-initvm.spec deleted file mode 100644 index dba60c09..00000000 --- a/build-initvm.spec +++ /dev/null @@ -1,53 +0,0 @@ -# -# spec file for package build-initvm -# -# Copyright (c) 2013 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/ -# - - -Name: build-initvm -Summary: A Script to Build SUSE Linux RPMs -License: GPL-2.0+ -Group: Development/Tools/Building -Version: 20130402 -Release: 0 -Source: obs-build-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: off -Requires: build -BuildRequires: gcc -BuildRequires: glibc-devel -%if 0%{?suse_version} > 1200 -BuildRequires: glibc-devel-static -%endif - -%description -This package provides a script for building RPMs for SUSE Linux in a -chroot or a secure virtualized environment. - - -%prep -%setup -q -n obs-build-%version - -%build -make CFLAGS="$RPM_BUILD_FLAGS" initvm-all - -%install -make DESTDIR=$RPM_BUILD_ROOT initvm-install - -%files -%defattr(-,root,root) -/usr/lib/build/initvm - -%changelog diff --git a/build.changes b/build.changes index 8f8b42af..b013ee40 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Fri May 17 09:24:49 UTC 2013 - adrian@suse.de + +- fix a number of issues regarding statistics collection + => works with more udev versions now + +------------------------------------------------------------------- +Wed May 15 16:17:04 UTC 2013 - adrian@suse.de + +- fix qemu-binfmt registration in chroot builds + +------------------------------------------------------------------- +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 + +- support multi architecture initvm binaries + => vminit gets build as subpackage now again +- De-hardcode hugetlbfs from ppc +- Do not emulate VGA +- support new nameing scheme of install images of kiwi builds + +------------------------------------------------------------------- +Mon Apr 29 07:40:19 UTC 2013 - adrian@suse.de + +- disabling fsync again for newer rpm versions to speed up + installation phase again. + +------------------------------------------------------------------- +Fri Apr 26 11:35:37 UTC 2013 - adrian@suse.de + +- cloud support for Amanzon EC2 and openstack +- fixed SPEC_REL support +- fixed zvm build +- fixed uml support +- fixing ext4 usage on old distros +- final openSUSE 12.3 config +- arm build support fixes + ------------------------------------------------------------------- Tue Apr 2 11:09:59 UTC 2013 - coolo@suse.com @@ -6,6 +53,16 @@ Tue Apr 2 11:09:59 UTC 2013 - coolo@suse.com - do not put .socket files into the 32bit packages - unbreak kvm for x86_64 +------------------------------------------------------------------- +Fri Mar 8 09:43:58 UTC 2013 - adrian@suse.de + +- fix kvm support for x86_64 again + +------------------------------------------------------------------- +Mon Mar 4 11:03:17 UTC 2013 - adrian@suse.de + +- avoid writing out incomplete IO statistics + ------------------------------------------------------------------- Wed Feb 27 09:14:05 UTC 2013 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 5f16349d..959bf1c5 100644 --- a/build.dsc +++ b/build.dsc @@ -1,12 +1,9 @@ Format: 1.0 Source: build -Version: 20130402 +Version: 20130517 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 4901ba36..3d1644aa 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: 20130402 +Version: 20130517 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -85,12 +85,40 @@ for generating delta rpm packages. %endif +%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 +BuildRequires: gcc +BuildRequires: glibc-devel +Provides: build-initvm +Obsoletes: build-initvm +%if 0%{?suse_version} > 1200 +BuildRequires: glibc-devel-static +%endif + +%description initvm-%{initvm_arch} +This package provides a script for building RPMs for SUSE Linux in a +chroot or a secure virtualized + %prep %setup -q -n obs-build-%version %build +make CFLAGS="$RPM_BUILD_FLAGS" initvm-all %install +# initvm +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.* + +# main make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ %if 0%{?suse_version} @@ -110,7 +138,9 @@ test -e default.conf /usr/bin/buildvc /usr/bin/unrpm /usr/lib/build +%config(noreplace) /usr/lib/build/emulator/emulator.sh %{_mandir}/man1/build.1* +%exclude /usr/lib/build/initvm.* %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} %exclude /usr/lib/build/mkbaselibs @@ -129,4 +159,8 @@ test -e default.conf /usr/lib/build/mkdrpms %endif +%files initvm-%{initvm_arch} +%defattr(-,root,root) +/usr/lib/build/initvm.* + %changelog diff --git a/debian.changelog b/debian.changelog index 8c7a9ae5..aecd64cf 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 893f26ca..6ff99671 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-20130402.tar.gz b/obs-build-20130402.tar.gz deleted file mode 100644 index 5389a2d8..00000000 --- a/obs-build-20130402.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145f5df871f0ab10b435b92b963002a6757d816da272f25f13ccbd0556a95587 -size 179528 diff --git a/obs-build-20130517.tar.gz b/obs-build-20130517.tar.gz new file mode 100644 index 00000000..70b22849 --- /dev/null +++ b/obs-build-20130517.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:684e0667da050609fc8b1eab1e0130bd800ee1daa46f4c33a98a58cf8131356c +size 153859