Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2012-05-15 17:40:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-08
06:44:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2012-05-15
17:40:16.000000000 +0200
@@ -1,0 +2,8 @@
+Mon May 14 14:54:27 UTC 2012 - co...@suse.com
+
+- work around command line size limit
+ mkbaselibs may fail on an excessive number of packages (bnc#761977)
+- improve build root owner setting
+- don't die at compile time if Archive::Tar is not available
+
+-------------------------------------------------------------------
Old:
----
obs-build-2012.04.24.tar.gz
New:
----
obs-build-2012.05.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-initvm.spec ++++++
--- /var/tmp/diff_new_pack.uXWOmc/_old 2012-05-15 17:40:19.000000000 +0200
+++ /var/tmp/diff_new_pack.uXWOmc/_new 2012-05-15 17:40:19.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 2012.04.24
+Version: 2012.05.14
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ build-mkbaselibs-sle.spec ++++++
--- /var/tmp/diff_new_pack.uXWOmc/_old 2012-05-15 17:40:19.000000000 +0200
+++ /var/tmp/diff_new_pack.uXWOmc/_new 2012-05-15 17:40:19.000000000 +0200
@@ -20,7 +20,7 @@
Summary: Tools to generate base lib packages
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 2012.04.24
+Version: 2012.05.14
Release: 0
#!BuildIgnore: build-mkbaselibs
Provides: build-mkbaselibs
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.uXWOmc/_old 2012-05-15 17:40:19.000000000 +0200
+++ /var/tmp/diff_new_pack.uXWOmc/_new 2012-05-15 17:40:19.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.04.24
+Version: 2012.05.14
Release: 0
#!BuildIgnore: build-mkbaselibs
Source: obs-build-%{version}.tar.gz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.uXWOmc/_old 2012-05-15 17:40:19.000000000 +0200
+++ /var/tmp/diff_new_pack.uXWOmc/_new 2012-05-15 17:40:19.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">2012.04.24</param>
+ <param name="version">2012.05.14</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.uXWOmc/_old 2012-05-15 17:40:19.000000000 +0200
+++ /var/tmp/diff_new_pack.uXWOmc/_new 2012-05-15 17:40:19.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 2012.04.24
+Version: 2012.05.14
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: all
++++++ obs-build-2012.04.24.tar.gz -> obs-build-2012.05.14.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.04.24/build
new/obs-build-2012.05.14/build
--- old/obs-build-2012.04.24/build 2012-04-24 16:02:41.000000000 +0200
+++ new/obs-build-2012.05.14/build 2012-05-14 16:54:00.000000000 +0200
@@ -44,7 +44,7 @@
console=ttyS0
# need to restore build root owner for non-root builds
-browner=0
+browner=
# Default uid:gid for the build user
ABUILD_UID=399
@@ -315,7 +315,7 @@
fi
fi
if test -n "$RUNNING_IN_VM" ; then
- chown $browner $BUILD_ROOT
+ test -n "$browner" && chown "$browner" $BUILD_ROOT
cd /
if test -n "$VM_SWAP" -a -e "$VM_SWAP" ; then
swapoff "$VM_SWAP" 2>/dev/null
@@ -488,6 +488,7 @@
create_baselibs()
{
local pkgs=()
+ local line
BASELIBS_CFG=
@@ -546,7 +547,10 @@
fi
fi
echo "... creating baselibs$whichone"
- chroot $BUILD_ROOT su -c "$mkbaselibs $BASELIBS_GLOBAL $BASELIBS_CFG
${pkgs[*]#$BUILD_ROOT}" - $BUILD_USER || cleanup_and_exit 1
+ while read line
+ do
+ chroot $BUILD_ROOT su -c "$mkbaselibs $BASELIBS_GLOBAL $BASELIBS_CFG
$line" - $BUILD_USER || cleanup_and_exit 1
+ done < <(IFS=$'\n'; echo "${pkgs[*]#$BUILD_ROOT}" | xargs -n 1024)
rm -rf $BUILD_ROOT/.mkbaselibs
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-2012.04.24/mkbaselibs
new/obs-build-2012.05.14/mkbaselibs
--- old/obs-build-2012.04.24/mkbaselibs 2012-04-24 16:02:41.000000000 +0200
+++ new/obs-build-2012.05.14/mkbaselibs 2012-05-14 16:54:00.000000000 +0200
@@ -1029,7 +1029,7 @@
# Tidy up the various control files.
# the md5sums are regenerated by dpkg-deb when building
- foreach my $c_file qw(conffiles postinst postrm preinst prerm) {
+ foreach my $c_file ( qw(conffiles postins postrm preinst prerm) ) {
unlink "${baseTarget}/DEBIAN/$c_file";
}
# Create them if needed
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
