From 9d9ecf7df1eefce6d0f8afbdb09e8f795af95811 Mon Sep 17 00:00:00 2001 From: George Boudreau Date: Fri, 16 Jun 2006 23:52:18 +0000 Subject: [PATCH] CLFS, had to use a ..small ugly.. (tm) to deal with the linux-headers-xxxx naming scheme --- CLFS/master.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/CLFS/master.sh b/CLFS/master.sh index e407f36..0fb7030 100755 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -127,8 +127,15 @@ cross_tools_Makefiles() { # esac # # Find the version of the command files, if it corresponds with the building of a specific package - vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + # oh-oh.. This small ugly is necessary to handle the LFS headers naming scheme + if [ "${name}" = "linux-headers" ]; then + linux_vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + vrs=${linux_vrs}-${vrs##*-} + else + vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + fi #--------------------------------------------------------------------# # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< # #--------------------------------------------------------------------# @@ -519,7 +526,15 @@ final_system_Makefiles() { # # Find the version of the command files, if it corresponds with the building of # a specific package. We need this here to can skip scripts not needed for # iterations rebuilds - vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + + # oh-oh.. This small ugly is necessary to handle the LFS headers naming scheme + if [ "${name}" = "linux-headers" ]; then + linux_vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + vrs=${linux_vrs}-${vrs##*-} + else + vrs=`grep "^$name-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'` + fi if [[ "$vrs" = "" ]] && [[ -n "$N" ]] ; then case "${this_script}" in