r3246 - in jhalfs/trunk: CLFS3 common/libs

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Sat Dec 2 14:11:34 PST 2006


Author: georgeb
Date: 2006-12-02 15:11:32 -0700 (Sat, 02 Dec 2006)
New Revision: 3246

Modified:
   jhalfs/trunk/CLFS3/master.sh
   jhalfs/trunk/common/libs/func_wrt_Makefile
Log:
Adapted to clfs bootscript naming convention

Modified: jhalfs/trunk/CLFS3/master.sh
===================================================================
--- jhalfs/trunk/CLFS3/master.sh	2006-11-28 19:14:13 UTC (rev 3245)
+++ jhalfs/trunk/CLFS3/master.sh	2006-12-02 22:11:32 UTC (rev 3246)
@@ -276,7 +276,6 @@
     this_script=`basename $file`
 
     case $this_script in
-      *udev)     continue ;; # This is not a script but a commentary, we want udev-rules
       *console*) continue ;; # Use the files that came with the bootscripts
       *network*) continue ;; # Manually create these files
       *)  ;;
@@ -293,8 +292,7 @@
                                   -e 's at 64@@' \
                                   -e 's at n32@@'`
     case $name in
-      *bootscripts*) name=bootscripts-cross-lfs ;;
-      *udev-rules)   name=udev-cross-lfs ;;
+      *bootscripts*) name=clfs-embedded-bootscripts ;;
     esac
 
     pkg_tarball=$(get_package_tarball_name $name)

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
===================================================================
--- jhalfs/trunk/common/libs/func_wrt_Makefile	2006-11-28 19:14:13 UTC (rev 3245)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile	2006-12-02 22:11:32 UTC (rev 3246)
@@ -65,6 +65,13 @@
    case $script_name in
      tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
+     uClibc)
+         if [[ "${PROGNAME}" = "clfs3" ]]; then
+           echo $(grep "^uClibc-" $JHALFSDIR/pkg_tarball_list | head -n1 )
+	 else
+           echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
+	 fi
+	 ;;
      linux-headers)
          if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "hlfs" ]] ; then
            # Uses kernel headers directly




More information about the alfs-log mailing list