Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2012-09-27 10:31:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2012-09-26 16:09:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2012-09-27 10:31:22.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Sep 27 07:33:21 UTC 2012 - [email protected] + +- change to automatic date version in _service +- update from git (4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6) + +Martin Koegler (1): + Bug fix: ignore links in orig tar files + +Michael Schroeder (1): + - be more verbose when the preinstallimage unpack fails + +Stephan Kulow (2): + the difference between openSUSE and SLE is outdated + do not cumulate packages with 12.2's rpm + +------------------------------------------------------------------- Old: ---- obs-build-2012.09.25.tar.gz New: ---- obs-build-20120927.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-initvm.spec ++++++ --- /var/tmp/diff_new_pack.hoEMhg/_old 2012-09-27 10:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.hoEMhg/_new 2012-09-27 10:31:24.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.09.25 +Version: 20120927 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.hoEMhg/_old 2012-09-27 10:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.hoEMhg/_new 2012-09-27 10:31:24.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.09.25 +Version: 20120927 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -92,13 +92,6 @@ %install make DESTDIR=$RPM_BUILD_ROOT install -%if 0%{?sles_version} -%if 0%{?sles_version} < 12 - # use sle variation with IA64 compat package generation - install -m 0644 baselibs_global-sle.conf \ - $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf -%endif -%endif cd $RPM_BUILD_ROOT/usr/lib/build/configs/ %if 0%{?suse_version} %if 0%{?sles_version} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hoEMhg/_old 2012-09-27 10:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.hoEMhg/_new 2012-09-27 10:31:24.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">2012.09.25</param> + <param name="versionformat">%ad</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.hoEMhg/_old 2012-09-27 10:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.hoEMhg/_new 2012-09-27 10:31:24.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.09.25 +Version: 20120927 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ obs-build-2012.09.25.tar.gz -> obs-build-20120927.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.09.25/debtransform new/obs-build-20120927/debtransform --- old/obs-build-2012.09.25/debtransform 2012-09-25 13:36:57.000000000 +0200 +++ new/obs-build-20120927/debtransform 2012-09-27 09:32:16.000000000 +0200 @@ -63,8 +63,14 @@ next unless /^([-dlbcp])(.........)\s+\d+\/\d+\s+(\S+) \d\d\d\d-\d\d-\d\d \d\d:\d\d(?::\d\d)? (.*)$/; my ($type, $mode, $size, $name) = ($1, $2, $3, $4); next if $type eq 'd'; - die("debian tar contains link: $name\n") if $type eq 'l'; - die("debian tar contains unexpected file type: $name\n") if $type ne '-'; + if ($type eq 'l') { + next if $skipdebiandir eq 0; + die("debian tar contains link: $name\n"); + } + if ($type ne '-') { + next if $skipdebiandir eq 0; + die("debian tar contains unexpected file type: $name\n"); + } $name =~ s/^\.\///; $name =~ s/^debian\/// if $skipdebiandir eq 1; push @c, {'name' => $name, 'size' => $size}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.09.25/init_buildsystem new/obs-build-20120927/init_buildsystem --- old/obs-build-2012.09.25/init_buildsystem 2012-09-25 13:36:57.000000000 +0200 +++ new/obs-build-20120927/init_buildsystem 2012-09-27 09:32:16.000000000 +0200 @@ -171,10 +171,12 @@ TAR="tar -x" fi # pipe output through perl to print a dot every 1000 lines - if ! $TAR -z --exclude .build --exclude .init_b_cache -f "$BUILD_ROOT/.init_b_cache/rpms/$1" -v > >(perl -e '$|=1; my $done=0; $done++ % 1000 or print "." while <STDIN>; print "\n";') 2>&1 ; then + if ! $TAR -z --exclude .build --exclude .init_b_cache -f "$BUILD_ROOT/.init_b_cache/rpms/$1" -v > >(tee "$BUILD_ROOT/.preinstallimage.unpack" | perl -e '$|=1; my $done=0; $done++ % 1000 or print "." while <STDIN>; print "\n";') 2>&1 ; then echo "unpack failed." + test -e "$BUILD_ROOT/.preinstallimage.unpack" && cat "$BUILD_ROOT/.preinstallimage.unpack" cleanup_and_exit 1 fi + rm -f "$BUILD_ROOT/.preinstallimage.unpack" } preinstall() @@ -1010,7 +1012,7 @@ typeset -a CUMULATED_PIDS=() typeset -a CUMULATED_HMD5=() -if ((suse_version >= 1220)) ; then +if ((suse_version > 1220)) ; then MAIN_LIST="$PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL CUMULATED" else MAIN_LIST="$PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL" @@ -1179,7 +1181,7 @@ test -e "$i" && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --justdb" done fi - if ((suse_version >= 1220)) ; then + if ((suse_version > 1220)) ; then echo "cumulate ${PKGID%% *}" let cumulate++ CUMULATED_LIST[$cumulate]=".init_b_cache/$PKG.rpm" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
