r3809 - in jhalfs/trunk: CLFS common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Tue Nov 4 04:57:31 PST 2014


Author: pierre
Date: Tue Nov  4 04:57:31 2014
New Revision: 3809

Log:
Fixes addition of "pass1" util-linux in new version of CLFS.
Thanks to William Harrington for the patch.

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/common/libs/func_wrt_Makefile

Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh	Fri Oct 31 03:08:40 2014	(r3808)
+++ jhalfs/trunk/CLFS/master.sh	Tue Nov  4 04:57:31 2014	(r3809)
@@ -148,7 +148,8 @@
                                   -e 's at -static@@' \
                                   -e 's at -final@@' \
                                   -e 's at -64@@' \
-                                  -e 's at -n32@@'`
+                                  -e 's at -n32@@' \
+                                  -e 's at -pass1@@'`
     pkg_tarball=$(get_package_tarball_name $name)
 
     #--------------------------------------------------------------------#

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
==============================================================================
--- jhalfs/trunk/common/libs/func_wrt_Makefile	Fri Oct 31 03:08:40 2014	(r3808)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile	Tue Nov  4 04:57:31 2014	(r3809)
@@ -98,7 +98,7 @@
          ;;
      libcap) echo $(grep "^libcap" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
-     util-linux-libs) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 )
+     util-linux-libs | util-linux-pass1) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
      xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;


More information about the alfs-log mailing list