r2851 - jhalfs/branches/experimental/HLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Sat Jul 29 04:19:16 PDT 2006


Author: georgeb
Date: 2006-07-29 05:19:16 -0600 (Sat, 29 Jul 2006)
New Revision: 2851

Modified:
   jhalfs/branches/experimental/HLFS/master.sh
Log:
Restore uClibc specific code I mistakenly removed

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-07-28 18:04:06 UTC (rev 2850)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-07-29 11:19:16 UTC (rev 2851)
@@ -113,6 +113,12 @@
 
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter3${R_arrow}"
 
+  # Define a few model dependant variables
+  if [[ ${MODEL} = "uclibc" ]]; then
+    TARGET="pc-linux-gnu"; LOADER="ld-uClibc.so.0"
+  else
+    TARGET="pc-linux-gnu";    LOADER="ld-linux.so.2"
+  fi
 
   # NOTE: We use the hlfs username and groupname also in HLFS
   # If /home/hlfs is already present in the host, we asume that the
@@ -162,6 +168,9 @@
 	echo "PATH=/tools/bin:/bin:/usr/bin" >> /home/hlfs/.bashrc && \\
 	echo "export HLFS LC_ALL PATH" >> /home/hlfs/.bashrc && \\
 	echo "" >> /home/hlfs/.bashrc && \\
+	echo "target=$(uname -m)-${TARGET}" >> /home/lfs/.bashrc && \\
+	echo "ldso=/tools/lib/${LOADER}" >> /home/lfs/.bashrc && \\
+	echo "export target ldso" >> /home/lfs/.bashrc && \\
 	echo "source $JHALFSDIR/envars" >> /home/hlfs/.bashrc && \\
 	chown hlfs:hlfs /home/hlfs/.bashrc && \\
 	touch envars && \\




More information about the alfs-log mailing list