r3535 - in jhalfs/trunk: LFS common/libs

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Fri Jan 7 16:17:12 PST 2011


Author: thomasp
Date: 2011-01-07 17:17:08 -0700 (Fri, 07 Jan 2011)
New Revision: 3535

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_wrt_Makefile
Log:
Add handling for the different name of the xz-utils tarball

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2010-11-18 19:54:26 UTC (rev 3534)
+++ jhalfs/trunk/LFS/master.sh	2011-01-08 00:17:08 UTC (rev 3535)
@@ -138,7 +138,10 @@
     # Remove the build directory(ies) except if the package build fails
     # (so we can review config.cache, config.log, etc.)
     if [ "$pkg_tarball" != "" ] ; then
-      LUSER_RemoveBuildDirs "$name"
+	case "${name}" in
+	*xz-utils) LUSER_RemoveBuildDirs "xz" ;;
+	*) LUSER_RemoveBuildDirs "$name" ;;
+	esac
     fi
 
     # Include a touch of the target name so make can check
@@ -262,7 +265,10 @@
     # Write installed files log and remove the build directory(ies)
     # except if the package build fails.
     if [ "$pkg_tarball" != "" ] ; then
-      CHROOT_wrt_RemoveBuildDirs "$name"
+      case "${name}" in
+	*xz-utils) CHROOT_wrt_RemoveBuildDirs "xz" ;;
+	*) CHROOT_wrt_RemoveBuildDirs "$name" ;;
+      esac
       if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
         CHROOT_wrt_LogNewFiles "$name"
       fi

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
===================================================================
--- jhalfs/trunk/common/libs/func_wrt_Makefile	2010-11-18 19:54:26 UTC (rev 3534)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile	2011-01-08 00:17:08 UTC (rev 3535)
@@ -90,6 +90,8 @@
          ;;
      expect) echo $(grep "^expect" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
+     xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )
+	 ;;
      *)  echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
    esac




More information about the alfs-log mailing list