Changeset 33a4e41 for LFS

Timestamp:

08/17/2021 11:23:24 PM (3 years ago)

Author:

DJ Lucas <dj@…>

Branches:

ablfs-more, legacy, trunk

Children:

22abf37

Parents:

756863b

Message:

Fix package management and put back optional stripping again for backwards compatibility.

Location:

LFS

Files:

• lfs.xsl (modified) (4 diffs)
• master.sh (modified) (1 diff)

LFS/lfs.xsl

@@ -149 +149 @@
       <xsl:if test="@id='ch-system-creatingdirs' or
                     @id='ch-system-createfiles' or
+                    @id='ch-system-strippingagain' or
                     @id='ch-system-stripping'">
         <xsl:copy-of select="$bashdir"/>
@@ -154 +155 @@
       <xsl:text>/bin/bash&#xA;set +h&#xA;</xsl:text>
       <xsl:if test="not(@id='ch-tools-stripping') and
+                    not(@id='ch-system-strippingagain') and
                     not(@id='ch-system-stripping')">
         <xsl:text>set -e&#xA;</xsl:text>
@@ -188 +190 @@
     <!-- Inclusion of package manager scriptlets -->
     <xsl:if test="$pkgmngt='y' and
-                  following-sibling::sect1[1][@id='ch-tools-stripping']">
+                  following-sibling::sect1[1][@id='ch-tools-stripping' or @id='ch-tools-cleanup']">
       <xsl:choose>
         <xsl:when test="$bashdir='/tools'">
@@ -211 +213 @@
     </xsl:if>
     <xsl:if test="$pkgmngt='y' and
-                  following-sibling::sect1[2][@id='ch-system-stripping']">
+                  following-sibling::sect1[2][@id='ch-system-strippingagain' or @id='ch-system-stripping']">
       <xsl:apply-templates
               select="document('packageManager.xml')//sect1[

LFS/master.sh

@@ -59 +59 @@
       5*glibc)         [[ "${TEST}" = "3" ]] && \
                        sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
+      *strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
       *stripping)      [[ "${STRIP}" = "n" ]] && continue ;;
       *linux-headers*) [[ -n "$N" ]] && continue ;;