From 64c9caf20b69fcdd403cd436990abf55f376fa5d Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Thu, 5 Oct 2006 01:07:15 +0000
Subject: [PATCH] Handle massaged headers or kernel headers

---
 common/common-functions | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/common-functions b/common/common-functions
index fc36517..829d813 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -44,9 +44,19 @@ get_package_tarball_name() {       #
    # hopefully this will not cause problems.
    #
    case $script_name in
-     tcl)           echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
-     linux-headers) echo $(grep "^linux-headers.*.bz2" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
-     *)             echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
+     tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 )
+         ;;
+     linux-headers)
+         if [ "${PROGNAME}" = "lfs" ]; then
+	   # Uses kernel headers directly
+           echo $(grep "^linux-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
+         else
+	   # CLFS/CLFS use massaged headers package
+           echo $(grep "^linux-headers-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
+         fi
+         ;;
+     *)  echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) 
+         ;;
    esac
 
 }