Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2012-09-14 12:14:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build", Maintainer is "m...@suse.com"
Changes:
--------
build-mkbaselibs-sle.changes: same change
--- /work/SRC/openSUSE:Factory/build/build.changes 2012-07-23
10:15:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2012-09-14
12:14:58.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Aug 24 14:04:11 CEST 2012 - m...@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 - adr...@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
+- add recommends to qemu-linux-user
+
+-------------------------------------------------------------------
Old:
----
obs-build-2012.07.19.tar.gz
New:
----
PKGBUILD
obs-build-2012.08.24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-initvm.spec ++++++
--- /var/tmp/diff_new_pack.xAmhwj/_old 2012-09-14 12:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.xAmhwj/_new 2012-09-14 12:15:00.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 2012.07.19
+Version: 2012.08.24
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ build-mkbaselibs-sle.spec ++++++
--- /var/tmp/diff_new_pack.xAmhwj/_old 2012-09-14 12:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.xAmhwj/_new 2012-09-14 12:15:00.000000000 +0200
@@ -20,7 +20,7 @@
Summary: Tools to generate base lib packages
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 2012.07.19
+Version: 2012.08.24
Release: 0
#!BuildIgnore: build-mkbaselibs
Provides: build-mkbaselibs
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.xAmhwj/_old 2012-09-14 12:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.xAmhwj/_new 2012-09-14 12:15:00.000000000 +0200
@@ -20,7 +20,7 @@
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.24
Release: 0
#!BuildIgnore: build-mkbaselibs
Source: obs-build-%{version}.tar.gz
@@ -45,6 +45,7 @@
Recommends: perl(URI)
Recommends: perl(XML::Parser)
Recommends: bsdtar
+Recommends: qemu-linux-user
%endif
%if 0%{?suse_version} > 1120 || ! 0%{?suse_version}
@@ -64,7 +65,6 @@
%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 +73,6 @@
%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
++++++ PKGBUILD ++++++
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
}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xAmhwj/_old 2012-09-14 12:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.xAmhwj/_new 2012-09-14 12:15:00.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">2012.07.19</param>
+ <param name="version">2012.08.24</param>
<param name="url">git://github.com/openSUSE/obs-build.git</param>
<param name="scm">git</param>
</service>
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.xAmhwj/_old 2012-09-14 12:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.xAmhwj/_new 2012-09-14 12:15:00.000000000 +0200
@@ -1,9 +1,12 @@
Format: 1.0
Source: build
-Version: 2012.07.19
+Version: 2012.08.20
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
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
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.xAmhwj/_old 2012-09-14 12:15:00.000000000 +0200
+++ /var/tmp/diff_new_pack.xAmhwj/_new 2012-09-14 12:15:00.000000000 +0200
@@ -1,4 +1,24 @@
-build (2011.09.26-1) unstable; urgency=low
+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 <m...@suse.de> 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 <flichtenheld@hawking-vb-opensuse> 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
++++++ debian.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debian/compat new/debian/compat
--- old/debian/compat 2007-03-02 21:05:45.000000000 +0100
+++ new/debian/compat 2012-07-23 23:07:59.000000000 +0200
@@ -1 +1 @@
-4
+7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debian/control new/debian/control
--- old/debian/control 2009-12-09 09:47:57.000000000 +0100
+++ new/debian/control 2012-07-23 23:11:19.000000000 +0200
@@ -2,12 +2,15 @@
Section: devel
Priority: optional
Maintainer: Adrian Schroeter <adr...@suse.de>
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 7)
Standards-Version: 3.7.2
+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
Package: build
Architecture: all
-Depends: ${perl:Depends}, rpm
+Depends: ${perl:Depends}, ${misc:Depends}, rpm
Recommends: rpm2cpio
Description: A script to build SUSE Linux RPMs
This package provides a script for building RPMs for SUSE Linux
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debian/copyright new/debian/copyright
--- old/debian/copyright 2007-06-13 17:17:20.000000000 +0200
+++ new/debian/copyright 2012-07-23 23:07:45.000000000 +0200
@@ -4,11 +4,11 @@
It was downloaded from
http://software.opensuse.org/download/openSUSE:/Tools/SUSE_Linux_Factory/src
Upstream authors: Thorsten Kukuk <ku...@suse.de>
- Michael Schr�ter <m...@suse.de>
+ Michael Schröter <m...@suse.de>
Bernhard Kaindl <b...@suse.de>
Mad Martin Jorgensen <m...@suse.de>
Andreas Schwab <sch...@suse.de>
- R�diger Oertel <r...@suse.de>
+ Rüdiger Oertel <r...@suse.de>
Andreas Gruenbacher <agr...@suse.de>
Copyright: (c) 1997-2007 SuSE GmbH Nuernberg, Germany
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debian/rules new/debian/rules
--- old/debian/rules 2009-11-12 15:22:36.000000000 +0100
+++ new/debian/rules 2012-07-23 23:52:33.000000000 +0200
@@ -1,65 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany
-# This file and all modifications and additions to the pristine package
-# are under the same license as the package itself.
-#
-# Please submit bugfixes or commens via http://bugs.opensuse.org
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-SHELL=/bin/bash
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- make DESTDIR=$(CURDIR)/debian/build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+ dh $@
++++++ obs-build-2012.07.19.tar.gz -> obs-build-2012.08.24.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.07.19/Build/Arch.pm
new/obs-build-2012.08.24/Build/Arch.pm
--- old/obs-build-2012.07.19/Build/Arch.pm 2012-07-19 09:49:01.000000000
+0200
+++ new/obs-build-2012.08.24/Build/Arch.pm 2012-08-24 14:08:07.000000000
+0200
@@ -12,18 +12,24 @@
# parse a PKGBUILD file
sub quote {
- my ($str) = @_;
- $str =~ s/([ \t\"\'])/sprintf("%%%02X", ord($1))/ge;
+ my ($str, $q, $vars) = @_;
+ if ($q ne "'" && $str =~ /\$/) {
+ $str =~ s/\$([a-zA-Z0-9_]+|\{([^\}]+)\})/$vars->{$2 || $1} ? join(' ',
@{$vars->{$2 || $1}}) : "\$$1"/ge;
+ }
+ $str =~ s/([ \t\"\'\$])/sprintf("%%%02X", ord($1))/ge;
return $str;
}
sub unquotesplit {
- my ($str) = @_;
+ my ($str, $vars) = @_;
$str =~ s/%/%25/g;
$str =~ s/^[ \t]+//;
while ($str =~ /([\"\'])/) {
my $q = $1;
- $str =~ s/$q(.*?)$q/quote($1)/e;
+ $str =~ s/$q(.*?)$q/quote($1, $q, $vars)/e;
+ }
+ if ($str =~ /\$/) {
+ $str =~ s/\$([a-zA-Z0-9_]+|\{([^\}]+)\})/$vars->{$2 || $1} ? join(' ',
@{$vars->{$2 || $1}}) : "\$$1"/ge;
}
my @args = split(/[ \t]+/, $str);
for (@args) {
@@ -56,12 +62,14 @@
$val .= ' ' . $nextline;
}
}
- $vars{$var} = [ unquotesplit($val) ];
+ $vars{$var} = [ unquotesplit($val, \%vars) ];
}
close PKG;
$ret->{'name'} = $vars{'pkgname'}->[0] if $vars{'pkgname'};
$ret->{'version'} = $vars{'pkgver'}->[0] if $vars{'pkgver'};
$ret->{'deps'} = $vars{'makedepends'} || [];
+ push @{$ret->{'deps'}}, @{$vars{'depends'} || []};
+ $ret->{'source'} = $vars{'source'} if $vars{'source'};
return $ret;
}
@@ -88,8 +96,9 @@
return $nh;
}
-sub query {
- my ($handle, %opts) = @_;
+sub queryvars {
+ my ($handle) = @_;
+
if (ref($handle)) {
die("arch pkg query not implemented for file handles\n");
}
@@ -102,23 +111,50 @@
my $pkginfo = $read[0]->get_content;
die("$handle: not an arch package file\n") unless $pkginfo;
my %vars;
+ $vars{'_pkginfo'} = $pkginfo;
for my $l (split('\n', $pkginfo)) {
next unless $l =~ /^(.*?) = (.*)$/;
push @{$vars{$1}}, $2;
}
+ return \%vars;
+}
+
+sub queryfiles {
+ my ($handle) = @_;
+ if (ref($handle)) {
+ die("arch pkg query not implemented for file handles\n");
+ }
+ if ($handle =~ /\.xz$/ || islzma($handle)) {
+ $handle = lzmadec($handle);
+ }
+ my @files;
+ my $tar = Archive::Tar->new;
+ # we use filter_cb here so that Archive::Tar skips the file contents
+ $tar->read($handle, 1, {'filter_cb' => sub {
+ my ($entry) = @_;
+ push @files, $entry->name unless $entry->is_longlink || (@files &&
$files[-1] eq $entry->name);
+ return 0;
+ }});
+ shift @files if @files && $files[0] eq '.PKGINFO';
+ return \@files;
+}
+
+sub query {
+ my ($handle, %opts) = @_;
+ my $vars = queryvars($handle);
my $ret = {};
- $ret->{'name'} = $vars{'pkgname'}->[0] if $vars{'pkgname'};
- $ret->{'hdrmd5'} = Digest::MD5::md5_hex($pkginfo);
- $ret->{'provides'} = $vars{'provides'} || [];
- $ret->{'requires'} = $vars{'depend'} || [];
- if ($vars{'pkgname'}) {
- my $selfprovides = $vars{'pkgname'}->[0];
- $selfprovides .= "=$vars{'pkgver'}->[0]" if $vars{'pkgver'};
+ $ret->{'name'} = $vars->{'pkgname'}->[0] if $vars->{'pkgname'};
+ $ret->{'hdrmd5'} = Digest::MD5::md5_hex($vars->{'_pkginfo'});
+ $ret->{'provides'} = $vars->{'provides'} || [];
+ $ret->{'requires'} = $vars->{'depend'} || [];
+ if ($vars->{'pkgname'}) {
+ my $selfprovides = $vars->{'pkgname'}->[0];
+ $selfprovides .= "=$vars->{'pkgver'}->[0]" if $vars->{'pkgver'};
push @{$ret->{'provides'}}, $selfprovides unless @{$ret->{'provides'} ||
[]} && $ret->{'provides'}->[-1] eq $selfprovides;
}
if ($opts{'evra'}) {
- if ($vars{'pkgver'}) {
- my $evr = $vars{'pkgver'}->[0];
+ if ($vars->{'pkgver'}) {
+ my $evr = $vars->{'pkgver'}->[0];
if ($evr =~ /^([0-9]+):(.*)$/) {
$ret->{'epoch'} = $1;
$evr = $2;
@@ -129,10 +165,10 @@
$ret->{'release'} = $2;
}
}
- $ret->{'arch'} = $vars{'arch'}->[0] if $vars{'arch'};
+ $ret->{'arch'} = $vars->{'arch'}->[0] if $vars->{'arch'};
}
if ($opts{'description'}) {
- $ret->{'description'} = $vars{'pkgdesc'}->[0] if $vars{'pkgdesc'};
+ $ret->{'description'} = $vars->{'pkgdesc'}->[0] if $vars->{'pkgdesc'};
}
# arch packages don't seem to have a source :(
# fake it so that the package isn't confused with a src package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.07.19/Build.pm
new/obs-build-2012.08.24/Build.pm
--- old/obs-build-2012.07.19/Build.pm 2012-07-19 09:49:01.000000000 +0200
+++ new/obs-build-2012.08.24/Build.pm 2012-08-24 14:08:07.000000000 +0200
@@ -864,7 +864,7 @@
die unless $cf;
my $d = Build::parse($cf, $fn);
die("$d->{'error'}\n") if $d->{'error'};
- $d->{'sources'} = [ map {$d->{$_}} grep {/^source/} sort keys %$d ];
+ $d->{'sources'} = [ map {ref($d->{$_}) ? @{$d->{$_}} : $d->{$_}} grep
{/^source/} sort keys %$d ];
my $x = $d->{$field};
$x = [ $x ] unless ref $x;
print "$_\n" for @$x;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.07.19/build
new/obs-build-2012.08.24/build
--- old/obs-build-2012.07.19/build 2012-07-19 09:49:01.000000000 +0200
+++ new/obs-build-2012.08.24/build 2012-08-24 14:08:07.000000000 +0200
@@ -72,6 +72,7 @@
VMDISK_FILESYSTEM=ext3
# settings are for speed and not data safety, we format anyway on next run
VMDISK_MOUNT_OPTIONS=__default
+VMDISK_CLEAN=
HUGETLBFSPATH=
MEMSIZE=
RUNNING_IN_VM=
@@ -840,7 +841,7 @@
*-no*checks)
DO_CHECKS=false
;;
- *-clean)
+ -clean|--clean)
CLEAN_BUILD='--clean'
;;
*-kill)
@@ -979,6 +980,10 @@
VMDISK_MOUNT_OPTIONS=$(echo $ARG | sed 's/^\"\(.*\)\"$/\1/g')
shift
;;
+ *-vmdisk-clean)
+ # delete old root/swap to get rid of the old blocks
+ VMDISK_CLEAN=true
+ ;;
*-rpmlist)
needarg
RPMLIST="--rpmlist $ARG"
@@ -1120,6 +1125,8 @@
if test "$VMDISK_MOUNT_OPTIONS" = __default; then
if test "$VMDISK_FILESYSTEM" = reiserfs ; then
VMDISK_MOUNT_OPTIONS='-o data=writeback,commit=150,noatime'
+ elif test "$VMDISK_FILESYSTEM" = btrfs ; then
+ VMDISK_MOUNT_OPTIONS='-o nobarrier,noatime'
else
VMDISK_MOUNT_OPTIONS='-o data=writeback,nobarrier,commit=150,noatime'
fi
@@ -1309,6 +1316,17 @@
XENID="${XENID#root_}"
xm destroy "build_$XENID" >/dev/null 2>&1
fi
+ if test -n "$VMDISK_CLEAN" ; then
+ # delete old root/swap to get rid of the old blocks
+ if test -f "$VM_IMAGE" ; then
+ echo "Deleting old $VM_IMAGE"
+ rm -rf "$VM_IMAGE"
+ fi
+ if test -n "$VM_SWAP" -a -f "$VM_SWAP" ; then
+ echo "Deleting old $VM_SWAP"
+ rm -rf "$VM_SWAP"
+ fi
+ fi
if test ! -e "$VM_IMAGE"; then
echo "Creating $VM_IMAGE (${VMDISK_ROOTSIZE}M)"
mkdir -p "${VM_IMAGE%/*}"
@@ -2021,9 +2039,9 @@
%prep
%{?!__debug_package:%{?_build_create_debug:%?_build_insert_debug_package}}%%prep
%package
%{?!__debug_package:%{?_build_create_debug:%?_build_insert_debug_package}}%%package
%_build_insert_debug_package \
- %global __debug_package 1 \
- %undefine _enable_debug_packages \
- %debug_package
+%global __debug_package 1 \
+%undefine _enable_debug_packages \
+%debug_package
' >> $BUILD_ROOT/root/.rpmmacros
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.07.19/build_kiwi.sh
new/obs-build-2012.08.24/build_kiwi.sh
--- old/obs-build-2012.07.19/build_kiwi.sh 2012-07-19 09:49:01.000000000
+0200
+++ new/obs-build-2012.08.24/build_kiwi.sh 2012-08-24 14:08:07.000000000
+0200
@@ -147,6 +147,15 @@
fi
popd
fi
+if [ -e "$imageout.qcow2" ]; then
+ mv "$imageout.qcow2" "/$TOPDIR/KIWI/$imageout$buildnum.qcow2"
+ pushd /$TOPDIR/KIWI
+ if [ -x /usr/bin/sha256sum ]; then
+ echo "Create sha256 file..."
+ /usr/bin/sha256sum "$imageout$buildnum.qcow2" >
"$imageout$buildnum.qcow2.sha256"
+ fi
+ popd
+fi
if [ -e "$imageout.raw" ]; then
compress_tool="bzip2"
compress_suffix="bz2"
@@ -167,7 +176,7 @@
fi
tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-raw.tar.bz2" \
- --exclude="$imageout.iso" --exclude="$imageout.raw" *
+ --exclude="$imageout.iso" --exclude="$imageout.raw"
--exclude="$imageout.qcow2" *
cd /$TOPDIR/KIWI
if [ -x /usr/bin/sha256sum ]; then
/usr/bin/sha256sum "$imageout$buildnum-raw.tar.bz2" >
"$imageout$buildnum-raw.tar.bz2.sha256"
@@ -181,18 +190,17 @@
# This option has a number of format parameters
VMXFILES=""
SHAFILES=""
-for i in "$imageout.vmx" "$imageout.vmdk" "$imageout-disk*.vmdk"
"$imageout.ovf"; do
- ls \$i >& /dev/null && VMXFILES="\$VMXFILES \$i"
+for i in "$imageout.vmx" "$imageout.vmdk" "$imageout-disk*.vmdk"
"$imageout.ovf" "$imageout.qcow2"; do
+ test -e \$i && VMXFILES="\$VMXFILES \$i"
done
# take raw files as fallback
if [ -z "\$VMXFILES" ]; then
- ls "$imageout.raw" >& /dev/null && VMXFILES="$imageout.raw"
+ test -e "$imageout.raw" && VMXFILES="$imageout.raw"
fi
if [ -n "\$VMXFILES" ]; then
tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" \$VMXFILES
SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2"
fi
-
if [ -e "$imageout.xenconfig" ]; then
tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2"
$imageout.xenconfig $imageout.raw initrd-*
SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2"
@@ -254,6 +262,22 @@
/usr/bin/sha256sum "\$i" > "\$i.sha256"
done
fi
+EOF
+ ;;
+ tbz)
+ cat > $BUILD_ROOT/kiwi_post.sh << EOF
+cd /$TOPDIR/KIWI-tbz
+for i in *.tbz; do
+ file=\$(readlink -f "\$i")
+ mv "\$file" "/$TOPDIR/KIWI/\${i%.tbz}$buildnum.tbz"
+done
+if [ -x /usr/bin/sha256sum ]; then
+ echo "creating sha256 sum for tar balls... "
+ cd $TOPDIR/KIWI
+ for i in *.tbz; do
+ /usr/bin/sha256sum "\$i" > "\$i.sha256"
+ done
+fi
EOF
;;
*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.07.19/expanddeps
new/obs-build-2012.08.24/expanddeps
--- old/obs-build-2012.07.19/expanddeps 2012-07-19 09:49:01.000000000 +0200
+++ new/obs-build-2012.08.24/expanddeps 2012-08-24 14:08:07.000000000 +0200
@@ -258,7 +258,10 @@
$packvers = $d->{'version'};
$subpacks = $d->{'subpacks'};
@packdeps = @{$d->{'deps'} || []};
- push(@packdeps, @{$d->{'prereqs'}}) if $d->{'prereqs'};
+ if ($d->{'prereqs'}) {
+ my %deps = map {$_ => 1} (@packdeps, @{$d->{'subpacks'} || []});
+ push @packdeps, grep {!$deps{$_} && !/^%/} @{$d->{'prereqs'}};
+ }
}
Build::readdeps($cf, undef, \%repo);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.07.19/init_buildsystem
new/obs-build-2012.08.24/init_buildsystem
--- old/obs-build-2012.07.19/init_buildsystem 2012-07-19 09:49:01.000000000
+0200
+++ new/obs-build-2012.08.24/init_buildsystem 2012-08-24 14:08:07.000000000
+0200
@@ -678,12 +678,14 @@
if [ -z "$PREPARE_VM" ]; then
if ! check_binfmt_registered; then
echo "registering binfmt handlers"
+
if [ -x "$BUILD_DIR/initvm" -a -e "$BUILD_DIR/qemu-reg" ]; then
$BUILD_DIR/initvm
elif [ -x /usr/sbin/qemu-binfmt-conf.sh ]; then
+ [ -e /proc/sys/fs/binfmt_misc ] || mount -n binfmt_misc -t
binfmt_misc /proc/sys/fs/binfmt_misc
/usr/sbin/qemu-binfmt-conf.sh
else
- echo "Warning: could not register binfmt handlers"
+ echo "Warning: could not register binfmt handlers. Neither
build-initvm nor /usr/sbin/qemu-binfmt-conf.sh exist"
fi
fi
if [ -n "$PREPARE_VM" ]; then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
