![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package build checked in at Wed Apr 19 16:00:33 CEST 2006. -------- --- build/build.changes 2006-04-11 16:01:17.000000000 +0200 +++ NOARCH/build/build.changes 2006-04-19 15:36:53.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 19 15:34:10 CEST 2006 - mls@suse.de + +- add --list-state option [#119869] +- suppress stat messages when deleting rpms [#154385] +- delete not-ready flag when rpm expansion failes [#133568] +- update baselibs.conf + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.0sqIyC/_old 2006-04-19 15:59:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0sqIyC/_new 2006-04-19 15:59:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2006.4.11) +# spec file for package build (Version 2006.4.19) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Group: Development/Tools/Building Autoreqprov: on Summary: A Script to Build SUSE Linux RPMs -Version: 2006.4.11 +Version: 2006.4.19 Release: 1 Source: build.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +49,11 @@ %{_mandir}/man1/build.1.gz %changelog -n build +* Wed Apr 19 2006 - mls@suse.de +- add --list-state option [#119869] +- suppress stat messages when deleting rpms [#154385] +- delete not-ready flag when rpm expansion failes [#133568] +- update baselibs.conf * Tue Apr 11 2006 - mls@suse.de - fix typo in configs - fix macro handling ++++++ build.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build/baselibs.conf new/build/baselibs.conf --- old/build/baselibs.conf 2006-03-27 19:53:05.000000000 +0200 +++ new/build/baselibs.conf 2006-04-19 15:36:34.000000000 +0200 @@ -118,6 +118,7 @@ obsoletes "XFree86-Mesa-devel-<targettype>" provides "XFree86-Mesa-devel-<targettype>" Mesa + +/usr/X11R6/lib(64)?/modules/dri/updates/README.updates obsoletes "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>" provides "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>" Mesa-devel @@ -152,6 +153,7 @@ sane openssl openssl-devel +openssl-ibmca # # wine devel requirements @@ -161,6 +163,12 @@ libsmbclient samba-libs +# rest of samba +samba +samba-winbind +samba-client +libiniparser + # # libsmbclient requirements: # @@ -210,6 +218,7 @@ # expat fontconfig + +/usr/bin/fc-cache -> /usr/bin/fc-cache<extension> fontconfig-devel freetype2 freetype2-devel @@ -355,6 +364,7 @@ gettext glib glib-devel + +/opt/gnome/lib(64)?/glib/include/glibconfig.h gnome-libs gtk gtk2 @@ -478,6 +488,7 @@ # used by kdelibs3 mDNSResponder +mDNSResponder-lib # used by DirectFB sysfsutils @@ -526,7 +537,9 @@ # for banshee nautilus-cd-burner gstreamer +gstreamer010 gstreamer-plugins +gstreamer010-plugins-base dbus-1-glib sqlite libipoddevice @@ -606,3 +619,8 @@ novell-NLDAPsdk # helix hack helix-dbus-server +# needed for xen biarch +xen-libs +# eDir biarch +novell-NLDAPbase +novell-lum diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build/build new/build/build --- old/build/build 2006-03-09 17:17:57.000000000 +0100 +++ new/build/build 2006-04-19 15:27:14.000000000 +0200 @@ -81,6 +81,10 @@ --baselibs Create -32bit/-64bit/-x86 rpms for other architectures + --list-state + List rpms that would be used to create a fresh build root. + Does not create the build root or perform a build. + Remember to have fun! [*] Maximum RPM: http://www.rpm.org/max-rpm/ @@ -148,6 +152,7 @@ ABUILD_TARGET_ARCH= CREATE_BASELIBS= USEUSEDFORBUILD= +LIST_STATE= while test -n "$1"; do PARAM="$1" @@ -211,6 +216,9 @@ *-useusedforbuild) USEUSEDFORBUILD="--useusedforbuild" ;; + *-list*state) + LIST_STATE=true + ;; ----noarg) echo "$ARG does not take an argument" cleanup_and_exit @@ -226,7 +234,7 @@ esac done -test $UID != 0 && { +test -z "$LIST_STATE" && $UID != 0 && { echo You have to be root to use $0. Exit. cleanup_and_exit 1 } @@ -275,6 +283,26 @@ cleanup_and_exit 1 fi +if test -n "$LIST_STATE" ; then + BUILD_ROOT=`mktemp -d /var/tmp/build-list-state-XXXXXX` + test -d "$BUILD_ROOT" || exit 1 + SPECFILE=$SRCDIR/$SPECFILES + if test "$SPECFILE" != "${SPECFILE%.src.rpm}" ; then + rm -rf $BUILD_ROOT/usr/src/packages + mkdir -p $BUILD_ROOT/usr/src/packages/SOURCES $BUILD_ROOT/usr/src/packages/SPECS + rpm -i --nodigest --nosignature --root $BUILD_ROOT $SPECFILE || { + echo "could not install $SPECFILE." 2>&1 + rm -rf $BUILD_ROOT + cleanup_and_exit 1 + } + for SPECFILE in $BUILD_ROOT/usr/src/packages/SPECS/*.spec ; do : ; done + fi + init_buildsystem --list-state $USEUSEDFORBUILD $SPECFILE $BUILD_EXTRA_PACKS + ERR=$? + rm -rf $BUILD_ROOT + cleanup_and_exit $ERR +fi + if test -d "$BUILD_ROOT" ; then # check if it is owned by root test -O "$BUILD_ROOT" || { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build/build.1 new/build/build.1 --- old/build/build.1 2006-03-09 17:15:59.000000000 +0100 +++ new/build/build.1 2006-04-19 15:33:33.000000000 +0200 @@ -51,6 +51,10 @@ .B --no-init skip the build system initialization and start with build immediately. .TP +.B --list-state +list rpms that would be used to create a fresh build root. +Does not create the build root or perform a build. +.TP .BI "\-\-rpms " path1 : path2 : path3\fR...\fP Where build can find the SuSE Linux RPMs needed to create the build system. This option overrides the BUILD_RPMS environment diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build/init_buildsystem new/build/init_buildsystem --- old/build/init_buildsystem 2006-03-27 19:59:17.000000000 +0200 +++ new/build/init_buildsystem 2006-04-19 15:22:36.000000000 +0200 @@ -24,6 +24,11 @@ RPMIDFMT="%{NAME}-%{VERSION}-%{RELEASE} %{BUILDHOST}-%{BUILDTIME}\n" USEUSEDFORBUILD= +LIST_STATE= +if test "$1" = "--list-state" ; then + LIST_STATE=true + shift +fi if test "$1" = "--useusedforbuild" ; then USEUSEDFORBUILD=--useusedforbuild shift @@ -188,7 +193,7 @@ test $SRC -nt $CACHE_FILE && rm -f $CACHE_FILE.id done if ! test -f $CACHE_FILE.id ; then - echo initializing $CACHE_FILE with find command... + test -z "$LIST_STATE" && echo initializing $CACHE_FILE with find command... for SRC in ${BUILD_RPMS//:/ } ; do test -z "$SRC" && SRC=. find $SRC -type f -name packages -print -o -follow -type f -name "*.rpm" -a ! -name "*src.rpm" -printf '%T@/%s/%i %p\n' @@ -201,10 +206,21 @@ # # select and expand packages, rewrite specfile # -echo "expanding package dependencies..." +test -z "$LIST_STATE" && echo "expanding package dependencies..." if ! expanddeps $USEUSEDFORBUILD --dist "$BUILD_DIST" --depfile "$CACHE_FILE" --archpath "$BUILD_ARCH" --configdir /usr/lib/build/configs $PKGS > $BUILD_ROOT/.init_b_cache/rpmlist ; then + rm -f $BUILD_IS_RUNNING cleanup_and_exit 1 fi +if test -n "$LIST_STATE" ; then + rm -f $BUILD_IS_RUNNING + while read PKG SRC ; do + test "$PKG" = "preinstall:" && continue + test "$PKG" = "dist:" && continue + echo "${SRC##*/}" + done < $BUILD_ROOT/.init_b_cache/rpmlist + rm -rf $BUILD_ROOT/.init_b_cache + exit 0 +fi PACKAGES_TO_INSTALL= GUESSED_DIST=unknown @@ -285,7 +301,7 @@ test "$PKG" = "*" && continue echo deleting `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/todelete/$PKG` chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \ - grep -v "^r.*failed: No such file or directory" + grep -v -e "^r.*failed: No such file or directory" -e "^error: failed to stat .*: No such file or directory" done rm -rf $BUILD_ROOT/.init_b_cache/todelete @@ -311,13 +327,13 @@ if test "$PKGID" != "`cat $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG`" ; then echo deleting unwanted `sed -e 's/ .*//' < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG` chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \ - grep -v "^r.*failed: No such file or directory" + grep -v -e "^r.*failed: No such file or directory" -e "^error: failed to stat .*: No such file or directory" elif test "$VERIFY_BUILD_SYSTEM" = true ; then chroot $BUILD_ROOT rpm --verify $PKG 2>&1 | tee $TMPFILE if grep ^missing $TMPFILE > /dev/null ; then echo deleting incomplete ${PKGID%% *} chroot $BUILD_ROOT rpm --nodeps -e $PKG 2>&1 | \ - grep -v "^r.*failed: No such file or directory" + grep -v -e "^r.*failed: No such file or directory" -e "^error: failed to stat .*: No such file or directory" else echo "keeping ${PKGID%% *}" echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de