Hello community, here is the log from the commit of package post-build-checks checked in at Fri Sep 5 02:45:52 CEST 2008. -------- --- post-build-checks/post-build-checks.changes 2008-09-04 14:31:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/post-build-checks/post-build-checks.changes 2008-09-05 02:43:35.824670000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 5 02:13:09 CEST 2008 - ro@suse.de + +- next hack for uname.sh: if /.kernelversion does not exist + use a readlink on /usr/src/linux to find out + and then get the flavor by the same hack as kernel-source + +------------------------------------------------------------------- @@ -6,0 +14,6 @@ +Wed Sep 3 15:11:13 CEST 2008 - ro@suse.de + +- try not to remove library packages during initial build + (when updating soname bnc#421981) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.t11637/_old 2008-09-05 02:45:14.000000000 +0200 +++ /var/tmp/diff_new_pack.t11637/_new 2008-09-05 02:45:14.000000000 +0200 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 33 +Release: 36 PreReq: aaa_base permissions sed Source0: %{name}-%{version}.tar.bz2 BuildArch: noarch @@ -73,8 +73,15 @@ /usr/lib/build %changelog +* Fri Sep 05 2008 ro@suse.de +- next hack for uname.sh: if /.kernelversion does not exist + use a readlink on /usr/src/linux to find out + and then get the flavor by the same hack as kernel-source * Thu Sep 04 2008 ro@suse.de - added COPYING file +* Wed Sep 03 2008 ro@suse.de +- try not to remove library packages during initial build + (when updating soname bnc#421981) * Wed Aug 20 2008 ro@suse.de - allow /var/crash for crash-dumps (FHS-2.3) - allow /branding (installation-images) ++++++ post-build-checks-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/post-build-checks-1.0/checks/99-check-remove-rpms new/post-build-checks-1.0/checks/99-check-remove-rpms --- old/post-build-checks-1.0/checks/99-check-remove-rpms 2008-08-11 15:23:35.000000000 +0200 +++ new/post-build-checks-1.0/checks/99-check-remove-rpms 2008-09-03 15:10:17.000000000 +0200 @@ -48,6 +48,13 @@ PKG=${PKG%-*-*.*.rpm} PKG=${PKG%.rpm} test -e "$BUILD_ROOT/installed-pkg/$PKG" && continue + PKG1=${PKG%[0-9]}[0-9] + test -e $BUILD_ROOT/installed-pkg/$PKG1 && { + N=`ls $BUILD_ROOT/installed-pkg/$PKG1` + N=`basename $N` + echo "(keeping $PKG because of $N)" + continue + } RPM_ERASE_LIST="$RPM_ERASE_LIST $PKG" done test -z "$REORDER_MISSED" || echo " (reorder missed ${REORDER_MISSED% })" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/post-build-checks-1.0/helper/uname.sh new/post-build-checks-1.0/helper/uname.sh --- old/post-build-checks-1.0/helper/uname.sh 2008-08-10 12:03:09.000000000 +0200 +++ new/post-build-checks-1.0/helper/uname.sh 2008-09-05 02:11:55.000000000 +0200 @@ -6,12 +6,30 @@ MREL=`cat /.kernelversion` fi -if test -z "$MREL" ; then - if test -f /usr/src/linux/Makefile ; then +if test -z "$MREL" -a -L /usr/src/linux -a -d /usr/src/linux ; then + MREL=`readlink /usr/src/linux` + MREL=${MREL#linux} + MREL=${MREL#-} + uarch=`uname.bin -m` + # taken from kernel-source + arch=$(echo $uarch \ + | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ \ + -e s/ppc.*/powerpc/) + flavor="$( + cd /usr/src/linux-$MREL/arch/$arch + set -- defconfig.* + [ -e defconfig.default ] && set -- defconfig.default + echo ${1/defconfig.} + )" + test -n "$flavor" && MREL="$MREL-$flavor" +fi + +if test -z "$MREL" -a -f /usr/src/linux/Makefile ; then MREL=`grep "^VERSION = " /usr/src/linux/Makefile 2> /dev/null | sed -e "s/VERSION = //"` MREL=$MREL.`grep "^PATCHLEVEL = " /usr/src/linux/Makefile 2> /dev/null | sed -e "s/PATCHLEVEL = //"` MREL=$MREL.`grep "^SUBLEVEL = " /usr/src/linux/Makefile 2> /dev/null | sed -e "s/SUBLEVEL = //"` - fi fi if test -z "$MREL" ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org