Changeset 55e82d2 for LFS

Timestamp:

06/12/2022 08:54:14 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

ff30640

Parents:

84d0d39

Message:

Various updates for pacman PM

• update versions and instructions in packageManager.xml.pacman. Also remove the pages for old books.
• Fix packInstall.sh.pacman, so that restarting after a failure is possible
• Change LFS/lfs.xsl so that destdir install use symlinks for /lib, /sbin, and /bin. Remove also absolete commands for old books
• fix gcc script in book parser

File:

• LFS/lfs.xsl (modified) (8 diffs)

LFS/lfs.xsl

@@ -11 +11 @@
   <!-- use package management ?
        n = no, original behavior
-       y = yes, add PKG_DEST to scripts in install commands of chapter06-08
+       y = yes, add PKG_DEST to scripts in install commands of chapter08-10
   -->
   <xsl:param name="pkgmngt" select="'n'"/>
@@ -17 +17 @@
   <!-- Package management with "porg style" ?
        n = no,  same as pkgmngt description above
-       y = yes, wrap install commands of chapter06-08 into a bash function.
+       y = yes, wrap install commands of chapter08-10 into a bash function.
                 note that pkgmngt must be 'y' in this case
   -->
@@ -188 +188 @@
     <xsl:if test="$pkgmngt='y' and
                   following-sibling::sect1[1][@id='ch-tools-stripping' or @id='ch-tools-cleanup']">
-      <xsl:choose>
-        <xsl:when test="$bashdir='/tools'">
-          <xsl:apply-templates
-            select="document('packageManager.xml')//sect1[
-                                              contains(@id,'ch-tools')]"
-            mode="pkgmngt">
-            <xsl:with-param name="order" select="$order+1"/>
-            <xsl:with-param name="dirname" select="$dirname"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates
-            select="document('packageManager.xml')//sect1[
-                                              contains(@id,'ch-chroot')]"
-            mode="pkgmngt">
-            <xsl:with-param name="order" select="$order+1"/>
-            <xsl:with-param name="dirname" select="$dirname"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:apply-templates
+        select="document('packageManager.xml')//sect1[
+                                          contains(@id,'ch-chroot')]"
+        mode="pkgmngt">
+        <xsl:with-param name="order" select="$order+1"/>
+        <xsl:with-param name="dirname" select="$dirname"/>
+      </xsl:apply-templates>
     </xsl:if>
     <xsl:if test="$pkgmngt='y' and
@@ -246 +233 @@
         <xsl:otherwise>
 <!-- We cannot know which directory(ies) are needed by the package. Create a
-     reasonable bunch of them. Should be close to "Creating Directories".-->
-          <xsl:text>mkdir -pv $PKG_DEST/{bin,boot,etc,lib,sbin}
+     reasonable bunch of them. Should be close to "Creating Directories".
+     Create also symlinks from /lib, /bin, /sbin to their counterpart
+     in usr, so that the package only has files in /usr-->
+          <xsl:text>mkdir -pv $PKG_DEST/{boot,etc}
 mkdir -pv $PKG_DEST/usr/{bin,include,lib/pkgconfig,sbin}
 mkdir -pv $PKG_DEST/usr/share/{doc,info,bash-completion/completions}
@@ -254 +243 @@
  x86_64) mkdir -v $PKG_DEST/lib64 ;;
 esac
+ln -sv usr/sbin $PKG_DEST
+ln -sv usr/bin  $PKG_DEST
+ln -sv usr/lib  $PKG_DEST
 </xsl:text>
         </xsl:otherwise>
@@ -300 +292 @@
 </xsl:text>
           </xsl:if>
-<!-- remove empty directories -->
+<!-- remove empty directories and symlinks-->
           <xsl:text>for dir in $PKG_DEST/usr/share/man/man{1..8} \
            $PKG_DEST/usr/share/bash-completion{/completions,} \
@@ -306 +298 @@
            $PKG_DEST/usr/lib/pkgconfig \
            $PKG_DEST/usr/{lib,bin,sbin,include} \
-           $PKG_DEST/{boot,etc,lib,bin,sbin}; do
+           $PKG_DEST/{boot,etc}; do
   [ -d "$dir" ] &amp;&amp; [ -z "$(ls $dir)" ] &amp;&amp; rmdir -v $dir
 done
 [ -d $PKG_DEST/lib64 ] &amp;&amp; [ -z "$(ls $PKG_DEST/lib64)" ] &amp;&amp;
   rmdir -v $PKG_DEST/lib64
+rm -v $PKG_DEST/{lib,bin,sbin}
 <!-- prevent overwriting symlinks: if a package install something in
      these directories, it'll be lost if not using package management,
@@ -1267 +1260 @@
 
 if [ -d "$PKGDIR" ]; then rm -rf $PKGDIR; fi
+if [ -d "$PKG_DEST" ]; then rm -rf $PKG_DEST; fi
 if [ -d "${PKGDIR%-*}-build" ]; then  rm -rf ${PKGDIR%-*}-build; fi
 </xsl:text>