Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2012-05-08 06:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build", Maintainer is "[email protected]" Changes: -------- build-mkbaselibs-sle.changes: same change --- /work/SRC/openSUSE:Factory/build/build.changes 2012-04-18 12:34:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2012-05-08 06:44:58.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 24 13:59:49 UTC 2012 - [email protected] + +- fixed breakage with older perls +- ~ support for rpm version compare +- handle broken deb packages better +- no more hardcoded copy-in of qemu* binaries + +------------------------------------------------------------------- +Mon Apr 23 09:49:45 UTC 2012 - [email protected] + +- do not use sle-baselibs.conf on openSUSE + +------------------------------------------------------------------- Old: ---- obs-build-2012.03.17.tar.gz New: ---- obs-build-2012.04.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-initvm.spec ++++++ --- /var/tmp/diff_new_pack.KtpLCV/_old 2012-05-08 06:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KtpLCV/_new 2012-05-08 06:45: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.03.17 +Version: 2012.04.24 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ build-mkbaselibs-sle.spec ++++++ --- /var/tmp/diff_new_pack.KtpLCV/_old 2012-05-08 06:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KtpLCV/_new 2012-05-08 06:45:00.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.03.17 +Version: 2012.04.24 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.KtpLCV/_old 2012-05-08 06:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KtpLCV/_new 2012-05-08 06:45: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.03.17 +Version: 2012.04.24 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz @@ -91,11 +91,13 @@ %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.KtpLCV/_old 2012-05-08 06:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KtpLCV/_new 2012-05-08 06:45:00.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">2012.03.17</param> + <param name="version">2012.04.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.KtpLCV/_old 2012-05-08 06:45:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KtpLCV/_new 2012-05-08 06:45:00.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.03.17 +Version: 2012.04.24 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ obs-build-2012.03.17.tar.gz -> obs-build-2012.04.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.03.17/Build/Arch.pm new/obs-build-2012.04.24/Build/Arch.pm --- old/obs-build-2012.03.17/Build/Arch.pm 2012-04-17 13:55:47.000000000 +0200 +++ new/obs-build-2012.04.24/Build/Arch.pm 2012-04-24 16:02:41.000000000 +0200 @@ -2,8 +2,10 @@ use strict; use Digest::MD5; -use Data::Dumper; -use Archive::Tar; + +eval { require Archive::Tar; }; +*Archive::Tar::new = sub {die("Archive::Tar is not available\n")} unless defined &Archive::Tar::new; + # Archlinux support, based on the GSoC work of Nikolay Rysev <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.03.17/Build/Rpm.pm new/obs-build-2012.04.24/Build/Rpm.pm --- old/obs-build-2012.03.17/Build/Rpm.pm 2012-04-17 13:55:47.000000000 +0200 +++ new/obs-build-2012.04.24/Build/Rpm.pm 2012-04-24 16:02:41.000000000 +0200 @@ -762,8 +762,17 @@ return 1 if !defined $s2; return 0 if $s1 eq $s2; while (1) { - $s1 =~ s/^[^a-zA-Z0-9]+//; - $s2 =~ s/^[^a-zA-Z0-9]+//; + $s1 =~ s/^[^a-zA-Z0-9~]+//; + $s2 =~ s/^[^a-zA-Z0-9~]+//; + if ($s1 =~ s/^~//) { + next if $s2 =~ s/^~//; + return -1; + } + return 1 if $s2 =~ /^~/; + if ($s1 eq '') { + return $s2 eq '' ? 0 : -1; + } + return 1 if $s2 eq ''; my ($x1, $x2, $r); if ($s1 =~ /^([0-9]+)(.*?)$/) { $x1 = $1; @@ -786,10 +795,6 @@ $r = $x1 cmp $x2; } return $r > 0 ? 1 : -1 if $r; - if ($s1 eq '') { - return $s2 eq '' ? 0 : -1; - } - return 1 if $s2 eq '' } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.03.17/build new/obs-build-2012.04.24/build --- old/obs-build-2012.03.17/build 2012-04-17 13:55:47.000000000 +0200 +++ new/obs-build-2012.04.24/build 2012-04-24 16:02:41.000000000 +0200 @@ -54,6 +54,7 @@ DO_LINT= DO_CHECKS=true CLEAN_BUILD= +USE_SYSTEM_QEMU= SPECFILES=() SRCDIR= BUILD_JOBS= @@ -872,6 +873,9 @@ *-baselibs-internal) CREATE_BASELIBS=internal ;; + *-use-system-qemu) + USE_SYSTEM_QEMU=true + ;; *-root) needarg BUILD_ROOT="$ARG" @@ -1477,7 +1481,7 @@ if test "$DO_INIT" = true ; then # do fist stage of init_buildsystem rm -f $BUILD_ROOT/.build.success - set -- init_buildsystem --cachedir "$CACHE_DIR" --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --cachedir "$CACHE_DIR" --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USE_SYSTEM_QEMU $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS echo "$* ..." "$@" || cleanup_and_exit 1 check_exit @@ -1754,7 +1758,7 @@ echo "BUILD_INCARNATION=$INCARNATION" > $BUILD_ROOT/.buildenv CREATE_BUILD_BINARIES= egrep '^#[ ]*needsbinariesforbuild[ ]*$' >/dev/null <$MYSRCDIR/$SPECFILE && CREATE_BUILD_BINARIES=--create-build-binaries - set -- init_buildsystem --cachedir "$CACHE_DIR" "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USEUSEDFORBUILD $CREATE_BUILD_BINARIES $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --cachedir "$CACHE_DIR" "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USE_SYSTEM_QEMU $USEUSEDFORBUILD $CREATE_BUILD_BINARIES $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS echo "$* ..." "$@" || cleanup_and_exit 1 check_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.03.17/init_buildsystem new/obs-build-2012.04.24/init_buildsystem --- old/obs-build-2012.03.17/init_buildsystem 2012-04-17 13:55:47.000000000 +0200 +++ new/obs-build-2012.04.24/init_buildsystem 2012-04-24 16:02:41.000000000 +0200 @@ -34,6 +34,7 @@ RPMIDFMT="%{NAME}-%{VERSION}-%{RELEASE} %{BUILDTIME}\n" PREPARE_VM= +USE_SYSTEM_QEMU= USEUSEDFORBUILD= LIST_STATE= RPMLIST= @@ -46,6 +47,10 @@ shift PREPARE_VM=true ;; + --use-system-qemu) + shift + USE_SYSTEM_QEMU=true + ;; --create-build-binaries) shift CREATE_BUILD_BINARIES=true @@ -627,7 +632,7 @@ # copy the QEMU emulator # if check_use_emulator; then - copy_qemu + [ -n "$USE_SYSTEM_QEMU" ] && copy_qemu if [ -z "$PREPARE_VM" ]; then if ! check_binfmt_registered; then echo "registering binfmt handlers" @@ -724,24 +729,17 @@ echo "$GUESSED_DIST" > $BUILD_ROOT/.guessed_dist test -n "$BUILD_DIST" || BUILD_DIST="$GUESSED_DIST" DIST_TYPE=`gettype --dist "$BUILD_DIST" --configdir "$BUILD_DIR/configs" --archpath "$BUILD_ARCH"` - if [ -n $DIST_TYPE ]; then - case $DIST_TYPE in - spec) - PSUF=rpm - ;; - dsc) - PSUF=deb - ;; - *) - PSUF=rpm - test -L $BUILD_TARGET/.init_b_cache/rpms/rpm.rpm || PSUF=deb - ;; - esac - else - PSUF=rpm - test -L $BUILD_ROOT/.init_b_cache/rpms/dpkg.deb && PSUF=deb - test -L $BUILD_ROOT/.init_b_cache/rpms/pacman.arch && PSUF=arch - fi + case "$DIST_TYPE" in + spec) PSUF=rpm ;; + dsc) PSUF=deb ;; + arch) PSUF=arch ;; + *) + # auto detect from packages + PSUF=rpm + test -L $BUILD_ROOT/.init_b_cache/rpms/dpkg.deb && PSUF=deb + test -L $BUILD_ROOT/.init_b_cache/rpms/pacman.arch && PSUF=arch + ;; + esac fi # @@ -957,6 +955,8 @@ ln -s "/bin/true" "$BUILD_ROOT/sbin/start" fi fi + # another workaround, see bug bnc#733699 + rm -f "$BUILD_ROOT/var/run/init.upgraded" continue fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
