Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2012-06-06 16:05:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-15 17:40:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2012-06-06 16:05:48.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Jun 5 14:25:08 UTC 2012 - [email protected] + +- update from git: + (mls) simplify debug package code so that it also works with --target + +------------------------------------------------------------------- +Thu May 31 12:24:32 UTC 2012 - [email protected] + +- take care of prjconf target: definition for spec file parsing + +------------------------------------------------------------------- +Wed May 30 12:51:09 UTC 2012 - [email protected] + +- support for breakages in Fedora:17 + * support enforced ordering during preinstall and vminstall phase + * allow to extract files via symlinked directories + +------------------------------------------------------------------- Old: ---- obs-build-2012.05.14.tar.gz New: ---- obs-build-2012.06.05.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-initvm.spec ++++++ --- /var/tmp/diff_new_pack.tVyrRu/_old 2012-06-06 16:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.tVyrRu/_new 2012-06-06 16:05:50.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.05.14 +Version: 2012.06.05 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ build-mkbaselibs-sle.spec ++++++ --- /var/tmp/diff_new_pack.tVyrRu/_old 2012-06-06 16:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.tVyrRu/_new 2012-06-06 16:05:50.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.05.14 +Version: 2012.06.05 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.tVyrRu/_old 2012-06-06 16:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.tVyrRu/_new 2012-06-06 16:05:50.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.05.14 +Version: 2012.06.05 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.tVyrRu/_old 2012-06-06 16:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.tVyrRu/_new 2012-06-06 16:05:50.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">2012.05.14</param> + <param name="version">2012.06.05</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.tVyrRu/_old 2012-06-06 16:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.tVyrRu/_new 2012-06-06 16:05:50.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.05.14 +Version: 2012.06.05 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ obs-build-2012.05.14.tar.gz -> obs-build-2012.06.05.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.05.14/Build.pm new/obs-build-2012.06.05/Build.pm --- old/obs-build-2012.05.14/Build.pm 2012-05-14 16:54:00.000000000 +0200 +++ new/obs-build-2012.06.05/Build.pm 2012-06-05 16:24:36.000000000 +0200 @@ -279,6 +279,7 @@ $config->{'releaseprg'} = $l[0]; } elsif ($l0 eq 'changetarget:' || $l0 eq 'target:') { $config->{'target'} = join(' ', @l); + push @macros, "%define _target_cpu ".(split('-', $config->{'target'}))[0] if $config->{'target'}; } elsif ($l0 eq 'hostarch:') { $config->{'hostarch'} = join(' ', @l); } elsif ($l0 !~ /^[#%]/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.05.14/build new/obs-build-2012.06.05/build --- old/obs-build-2012.05.14/build 2012-05-14 16:54:00.000000000 +0200 +++ new/obs-build-2012.06.05/build 2012-06-05 16:24:36.000000000 +0200 @@ -9,6 +9,7 @@ test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root +test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs" export BUILD_ARCH BUILD_HOST_ARCH BUILD_ROOT BUILD_RPMS BUILD_DIR BUILD_DEBUG export BUILD_DIST @@ -398,7 +399,6 @@ echo "export CCACHE_DIR=/.ccache" > "$BUILD_ROOT"/etc/profile.d/build_ccache.sh echo 'export PATH=/var/lib/build/ccache/bin:$PATH' >> "$BUILD_ROOT"/etc/profile.d/build_ccache.sh else - rm -f "$BUILD_ROOT$builduserhome"/bin/{gcc,g++,cc,c++} rm -f "$BUILD_ROOT"/var/lib/build/ccache/bin/{gcc,g++,cc,c++} fi } @@ -1005,6 +1005,9 @@ *-useusedforbuild) USEUSEDFORBUILD="--useusedforbuild" ;; + *-configdir) + CONFIG_DIR="$ARG" + ;; *-list*state) LIST_STATE=true ;; @@ -1272,7 +1275,7 @@ } for SPECFILE in $BUILD_ROOT/usr/src/packages/SPECS/*.spec ; do : ; done fi - init_buildsystem --cachedir "$CACHE_DIR" --list-state "${definesnstuff[@]}" "${repos[@]}" $USEUSEDFORBUILD $SPECFILE $BUILD_EXTRA_PACKS + init_buildsystem --configdir "$CONFIG_DIR" --cachedir "$CACHE_DIR" --list-state "${definesnstuff[@]}" "${repos[@]}" $USEUSEDFORBUILD $SPECFILE $BUILD_EXTRA_PACKS ERR=$? rm -rf $BUILD_ROOT cleanup_and_exit $ERR @@ -1485,7 +1488,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 $USE_SYSTEM_QEMU $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --configdir "$CONFIG_DIR" --cachedir "$CACHE_DIR" --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USE_SYSTEM_QEMU $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS echo "$* ..." "$@" || cleanup_and_exit 1 check_exit @@ -1762,11 +1765,12 @@ 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 $USE_SYSTEM_QEMU $USEUSEDFORBUILD $CREATE_BUILD_BINARIES $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --configdir "$CONFIG_DIR" --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 - if df $BUILD_ROOT 2>/dev/null | grep -q "100%"; then + # arbitrary limit of 10MB + if test $((`stat -f -c "%a*%S/1024/1024" $BUILD_ROOT`)) -lt 10; then df -h $BUILD_ROOT echo "build does not work on a completely full filesystem" cleanup_and_exit 1 @@ -1936,17 +1940,16 @@ if test -n "$RELEASE"; then args=(--release "$RELEASE") fi - substitutedeps "${args[@]}" --root "$BUILD_ROOT" --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$BUILD_DIR/configs" $CHANGELOGARGS "$BUILD_ROOT$TOPDIR/SOURCES/$SPECFILE" "$BUILD_ROOT/.spec.new" || cleanup_and_exit 1 + substitutedeps "${args[@]}" --root "$BUILD_ROOT" --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$CONFIG_DIR" $CHANGELOGARGS "$BUILD_ROOT$TOPDIR/SOURCES/$SPECFILE" "$BUILD_ROOT/.spec.new" || cleanup_and_exit 1 # extract macros from configuration - getmacros --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$BUILD_DIR/configs" > $BUILD_ROOT/root/.rpmmacros + getmacros --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$CONFIG_DIR" > $BUILD_ROOT/root/.rpmmacros if test -n "$BUILD_DEBUG" ; then echo ' %prep %{?!_suse_insert_debug_package_seen:%?_suse_insert_debug_package}%%prep %package %{?!_suse_insert_debug_package_seen:%?_suse_insert_debug_package}%%package -%suse_insert_debug_package \ - %global _suse_insert_debug_package \\\ - %%global _suse_insert_debug_package_seen 1 \\\ - %%debug_package +%_suse_insert_debug_package \ + %global _suse_insert_debug_package_seen 1 \ + %debug_package ' >> $BUILD_ROOT/root/.rpmmacros fi @@ -1959,10 +1962,10 @@ fi test $BUILD_USER = abuild && cp -p $BUILD_ROOT/root/.rpmmacros $BUILD_ROOT/home/abuild/.rpmmacros # extract optflags from configuration - getoptflags --dist "$BUILD_DIST" --configdir "$BUILD_DIR/configs" --archpath "$BUILD_ARCH" ${BUILD_DEBUG:+--debug} > $BUILD_ROOT/root/.rpmrc + getoptflags --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" ${BUILD_DEBUG:+--debug} > $BUILD_ROOT/root/.rpmrc test $BUILD_USER = abuild && cp -p $BUILD_ROOT/root/.rpmrc $BUILD_ROOT/home/abuild/.rpmrc if test -z "$ABUILD_TARGET"; then - ABUILD_TARGET=$(getchangetarget --dist "$BUILD_DIST" --configdir "$BUILD_DIR/configs" --archpath "$BUILD_ARCH" ) + ABUILD_TARGET=$(getchangetarget --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" ) test -z "$ABUILD_TARGET" || echo "build target is $ABUILD_TARGET" fi fi @@ -2088,10 +2091,6 @@ rpmbopts[${#rpmbopts[@]}]='--eval' rpmbopts[${#rpmbopts[@]}]="%undefine _enable_debug_packages" fi - if [ -n "$BUILD_DEBUG" ]; then - rpmbopts[${#rpmbopts[@]}]='--eval' - rpmbopts[${#rpmbopts[@]}]="%suse_insert_debug_package" - fi if [ -n "$RSYNCDONE" ] ; then rpmbopts[${#rpmbopts[@]}]='--define' rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.05.14/build_kiwi.sh new/obs-build-2012.06.05/build_kiwi.sh --- old/obs-build-2012.05.14/build_kiwi.sh 2012-05-14 16:54:00.000000000 +0200 +++ new/obs-build-2012.06.05/build_kiwi.sh 2012-06-05 16:24:36.000000000 +0200 @@ -182,6 +182,10 @@ for i in "$imageout.vmx" "$imageout.vmdk" "$imageout-disk*.vmdk" "$imageout.ovf"; do ls \$i >& /dev/null && VMXFILES="\$VMXFILES \$i" done +# take raw files as fallback +if [ -z "\$VMXFILES" ]; then + ls "$imageout.raw" >& /dev/null && 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.05.14/expanddeps new/obs-build-2012.06.05/expanddeps --- old/obs-build-2012.05.14/expanddeps 2012-05-14 16:54:00.000000000 +0200 +++ new/obs-build-2012.06.05/expanddeps 2012-06-05 16:24:36.000000000 +0200 @@ -258,6 +258,7 @@ $packvers = $d->{'version'}; $subpacks = $d->{'subpacks'}; @packdeps = @{$d->{'deps'} || []}; + push(@packdeps, @{$d->{'prereqs'}}) if $d->{'prereqs'}; } Build::readdeps($cf, undef, \%repo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.05.14/init_buildsystem new/obs-build-2012.06.05/init_buildsystem --- old/obs-build-2012.05.14/init_buildsystem 2012-05-14 16:54:00.000000000 +0200 +++ new/obs-build-2012.06.05/init_buildsystem 2012-06-05 16:24:36.000000000 +0200 @@ -85,6 +85,10 @@ CACHE_DIR="$2" shift 2 ;; + --configdir) + CONFIG_DIR=$2 + shift 2 + ;; *) break ;; @@ -135,8 +139,8 @@ echo "preinstalling $1..." cd $BUILD_ROOT || cleanup_and_exit 1 if test -x /usr/bin/bsdtar ; then - CPIO="/usr/bin/bsdtar --chroot -o --numeric-owner -x -f-" - TAR="/usr/bin/bsdtar --chroot -o --numeric-owner -x" + CPIO="/usr/bin/bsdtar -P --chroot -o --numeric-owner -x -f-" + TAR="/usr/bin/bsdtar -P --chroot -o --numeric-owner -x" else # cpio isn't safe so we require bsdtar for VMs. chroot is # unsafe anyways so it's ok for that. @@ -259,7 +263,7 @@ for PKG in "$@" ; do echo "$PKG" >> $BUILD_ROOT/.init_b_cache/order.manifest done - $BUILD_DIR/order --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir $BUILD_DIR/configs --manifest $BUILD_ROOT/.init_b_cache/order.manifest $BUILD_ROOT/.init_b_cache/rpms + $BUILD_DIR/order --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir $CONFIG_DIR --manifest $BUILD_ROOT/.init_b_cache/order.manifest $BUILD_ROOT/.init_b_cache/rpms rm -f $BUILD_ROOT/.init_b_cache/order.manifest } @@ -353,7 +357,7 @@ elif [ ! -e "$SRC" ]; then echo "*** $SRC does not exist" >&2 cleanup_and_exit 1 - elif [ -z "$findonly" -a -e "$SRC"/suse/setup/descr/packages -o -e "$SRC"/suse/setup/descr/packages.gz ]; then + elif [ -z "$findonly" -a \( -e "$SRC"/suse/setup/descr/packages -o -e "$SRC"/suse/setup/descr/packages.gz \) ]; then set -- $BUILD_DIR/createyastdeps "$SRC" elif [ -z "$findonly" -a -e "$SRC"/repodata/repomd.xml ]; then set -- $BUILD_DIR/createrepomddeps "$SRC" @@ -607,7 +611,7 @@ # RPMLIST=$BUILD_ROOT/.init_b_cache/rpmlist test -z "$LIST_STATE" && echo "expanding package dependencies..." - if ! $BUILD_DIR/expanddeps $USEUSEDFORBUILD "${definesnstuff[@]}" --dist "$BUILD_DIST" --depfile "$CACHE_FILE" --archpath "$BUILD_ARCH" --configdir $BUILD_DIR/configs "${PKGS[@]}" > $RPMLIST ; then + if ! $BUILD_DIR/expanddeps $USEUSEDFORBUILD "${definesnstuff[@]}" --dist "$BUILD_DIST" --depfile "$CACHE_FILE" --archpath "$BUILD_ARCH" --configdir $CONFIG_DIR "${PKGS[@]}" > $RPMLIST ; then rm -f $BUILD_IS_RUNNING cleanup_and_exit 1 fi @@ -728,7 +732,7 @@ 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"` + DIST_TYPE=`gettype --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH"` case "$DIST_TYPE" in spec) PSUF=rpm ;; dsc) PSUF=deb ;; @@ -764,12 +768,14 @@ for PKG in $PACKAGES_TO_RUNSCRIPTS ; do : > $BUILD_ROOT/.init_b_cache/scripts/$PKG.run done + PACKAGES_TO_PREINSTALL=`reorder $PACKAGES_TO_PREINSTALL` progress_setup PACKAGES_TO_PREINSTALL for PKG in $PACKAGES_TO_PREINSTALL ; do progress_step PACKAGES_TO_PREINSTALL preinstall ${PKG##*/} done if test -n "$PREPARE_VM" ; then + PACKAGES_TO_VMINSTALL=`reorder $PACKAGES_TO_VMINSTALL` progress_setup PACKAGES_TO_VMINSTALL for PKG in $PACKAGES_TO_VMINSTALL ; do progress_step PACKAGES_TO_VMINSTALL @@ -777,6 +783,7 @@ done fi # add cbpreinstall if cross HOST != TARGET + PACKAGES_TO_CBINSTALL=`reorder $PACKAGES_TO_CBINSTALL` progress_setup PACKAGES_TO_CBPREINSTALL for PKG in $PACKAGES_TO_CBPREINSTALL ; do progress_step PACKAGES_TO_CBPREINSTALL @@ -1144,20 +1151,22 @@ done echo now finalizing build dir... -CHROOT_RETURN="`chroot $BUILD_ROOT /sbin/ldconfig 2>&1`" -case "$CHROOT_RETURN" in - *warning:*) - chroot $BUILD_ROOT /sbin/ldconfig - echo - echo chroot $BUILD_ROOT /sbin/ldconfig - echo - echo "$CHROOT_RETURN" - echo - echo "Problem with ldconfig. It's better to reinit the build system..." - echo - cleanup_and_exit 1 - ;; -esac +if test -x $BUILD_ROOT/sbin/ldconfig ; then + CHROOT_RETURN="`chroot $BUILD_ROOT /sbin/ldconfig 2>&1`" + case "$CHROOT_RETURN" in + *warning:*) + chroot $BUILD_ROOT /sbin/ldconfig + echo + echo chroot $BUILD_ROOT /sbin/ldconfig + echo + echo "$CHROOT_RETURN" + echo + echo "Problem with ldconfig. It's better to reinit the build system..." + echo + cleanup_and_exit 1 + ;; + esac +fi test -x $BUILD_ROOT/usr/sbin/Check && chroot $BUILD_ROOT /usr/sbin/Check mkdir -p $BUILD_ROOT/var/adm/packages @@ -1180,7 +1189,9 @@ done if test -e $BUILD_ROOT/usr/share/zoneinfo/UTC ; then - chroot $BUILD_ROOT zic -l UTC + for PROG in /usr/sbin/zic /usr/bin/zic /bin/zic /sbin/zic ; do + test -x $BUILD_ROOT/$PROG && chroot $BUILD_ROOT $PROG -l UTC + done fi test -e $BUILD_ROOT/.build/init_buildsystem.data || HOST=`hostname` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
