From 3c38ab098519653f8353b75be17c91f6cf67d42c Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Sat, 2 Dec 2006 22:11:32 +0000
Subject: [PATCH] Adapted to clfs bootscript naming convention

---
 CLFS3/master.sh               | 4 +---
 common/libs/func_wrt_Makefile | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CLFS3/master.sh b/CLFS3/master.sh
index d195c7e..138181c 100644
--- a/CLFS3/master.sh
+++ b/CLFS3/master.sh
@@ -276,7 +276,6 @@ bootscripts_Makefiles() {     #
     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 @@ bootscripts_Makefiles() {     #
                                   -e 's@64@@' \
                                   -e 's@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)
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index ec64698..303d73a 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -65,6 +65,13 @@ get_package_tarball_name() {       #
    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