r3277 - in jhalfs/trunk: HLFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Dec 10 02:43:21 PST 2006


Author: manuel
Date: 2006-12-10 03:43:20 -0700 (Sun, 10 Dec 2006)
New Revision: 3277

Modified:
   jhalfs/trunk/HLFS/hlfs.xsl
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/common/urls.xsl
Log:
HLFS: Fixed MAKEDEV download.
Solved /dev/console and /dev/null issue.
Removed a hardcoded script number.

Modified: jhalfs/trunk/HLFS/hlfs.xsl
===================================================================
--- jhalfs/trunk/HLFS/hlfs.xsl	2006-12-10 01:58:17 UTC (rev 3276)
+++ jhalfs/trunk/HLFS/hlfs.xsl	2006-12-10 10:43:20 UTC (rev 3277)
@@ -175,6 +175,10 @@
       <xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and
                 contains(string(),'sysctl')
                 and $grsecurity_host ='n'"/>
+      <!-- We need to have /dev/console and /dev/null availables before
+           entering to the chroot -->
+      <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
+                contains(string(),'600 /dev/console')"/>
       <!-- Fix MAKEDEV installation in 2.4-branch -->
       <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
                 contains(string(),'bzcat MAKEDEV')">

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-12-10 01:58:17 UTC (rev 3276)
+++ jhalfs/trunk/HLFS/master.sh	2006-12-10 10:43:20 UTC (rev 3277)
@@ -557,12 +557,18 @@
 
 mk_CHROOT: mk_SUDO
 	@if [ ! -e \$(MOUNT_PT)/bin ]; then \\
-	  mkdir \$(MOUNT_PT)/bin; \\
+	  mkdir \$(MOUNT_PT)/bin && \\
 	  cd \$(MOUNT_PT)/bin && \\
-	  ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
+	  ln -sf /tools/bin/bash bash; ln -sf bash sh && \\
 	  sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
 	fi;
-	@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/064-createfiles
+	@if [ ! -e \$(MOUNT_PT)/dev ]; then \\
+	  mkdir \$(MOUNT_PT)/dev && \\
+	  sudo mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3 && \\
+	  sudo mknod -m 666 \$(MOUNT_PT)/dev/console c 5 1 && \\
+	  sudo chown -R 0:0 \$(MOUNT_PT)/dev;
+	fi;
+	@sudo sed -e 's|^ln -.. |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@touch \$@

Modified: jhalfs/trunk/common/urls.xsl
===================================================================
--- jhalfs/trunk/common/urls.xsl	2006-12-10 01:58:17 UTC (rev 3276)
+++ jhalfs/trunk/common/urls.xsl	2006-12-10 10:43:20 UTC (rev 3277)
@@ -23,8 +23,8 @@
       duplicated URLs due that may be splitted for PDF output -->
     <xsl:if test="(ancestor::varlistentry[@condition=$model]
                   or not(ancestor::varlistentry[@condition])) and
-                  (contains(@url, '.tar.') or contains(@url, '.tgz')
-                  or contains(@url, '.patch')) and
+                  (contains(@url, '.bz2') or contains(@url, '.tar.gz') or
+                  contains(@url, '.tgz') or contains(@url, '.patch')) and
                   not(ancestor-or-self::*/@condition = 'pdf')">
       <!-- Extract the package name -->
       <xsl:variable name="package">




More information about the alfs-log mailing list