Changeset 1dce189 for LFS

Timestamp:

03/29/2020 01:24:48 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

123105f

Parents:

a131250

Message:

Don't use /tools for setting the ROOT variable

In the generated scriptlets, we need to know if we are on host
or chrooted. Presently, we
rely on /tools being a symlink or not. But we may want to remove this
ugly symlink in future versions of LFS, so anticipate and use the
chapter ancestor.

File:

• LFS/lfs.xsl (modified) (1 diff)

LFS/lfs.xsl

@@ -1143 +1143 @@
 PREV_SEC=${SECONDS}
       <!-- get the location of the system root -->
-if [ -h /tools ]; then
-  ROOT=$(dirname $(readlink /tools))/
-else
-  ROOT=/
-fi
+ROOT=</xsl:text>
+    <xsl:choose>
+      <xsl:when test="ancestor::chapter/@id = 'chapter-temporary-tools'">
+        <xsl:text>$LFS/
+</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>/
+</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>
 SCRIPT_ROOT=</xsl:text>
     <xsl:copy-of select="$script-root"/>