Changeset 560bef1

Timestamp:

03/13/2013 04:43:37 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

c80aa1f

Parents:

eed0929

Message:

Fix package management instructions for attr.
Add attr to blacklist in opt_config.

Files:

• LFS/lfs.xsl (modified) (3 diffs)
• optimize/opt_config (modified) (1 diff)

LFS/lfs.xsl

@@ -193 +193 @@
                                                        @remap='install']">
       <xsl:if test="../@id = 'ch-system-man-pages'">
-<!-- those files are provided by the shadow package -->
+<!-- these files are provided by the shadow package -->
   <xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5}
+</xsl:text>
+      </xsl:if>
+<!-- Attr man/man2 pages are already installed by man-pages. As of
+     March 2013, they are the same pages. Check it sometimes... -->
+      <xsl:if test="../@id = 'ch-system-attr'">
+        <xsl:text>rm -fv $PKG_DEST/usr/share/man/man2/*
 </xsl:text>
       </xsl:if>
@@ -424 +430 @@
               <xsl:when test="./literal">
                 <xsl:call-template name="outputpkgdest">
-                  <xsl:with-param name="outputstring"
-                                select="text()[1]"/>
+                  <xsl:with-param name="outputstring" select="text()[1]"/>
                 </xsl:call-template>
                 <xsl:apply-templates select="literal"/>
                 <xsl:call-template name="outputpkgdest">
-                  <xsl:with-param name="outputstring"
-                                select="text()[2]"/>
+                  <xsl:with-param name="outputstring" select="text()[2]"/>
                 </xsl:call-template>
               </xsl:when>
@@ -524 +528 @@
              <xsl:text>install&#xA;</xsl:text>
             </xsl:when>
+            <xsl:when test="ancestor::sect1[@id='ch-system-attr']">
+              <xsl:text>DIST_ROOT=$PKG_DEST make</xsl:text>
+              <xsl:call-template name="outputpkgdest">
+                <xsl:with-param name="outputstring"
+                                select="substring-after($outputstring,'make')"/>
+              </xsl:call-template>
+            </xsl:when>
             <xsl:otherwise>
-             <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
-             <xsl:call-template name="outputpkgdest">
-               <xsl:with-param
+              <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
+              <xsl:call-template name="outputpkgdest">>
+                <xsl:with-param
                     name="outputstring"
                     select="substring-after($outputstring,'make')"/>
-             </xsl:call-template>
+              </xsl:call-template>
             </xsl:otherwise>
            </xsl:choose>

optimize/opt_config

@@ -17 +17 @@
 #    If your MAKEFLAGS don't contains a -jX option, you can set
 #    a empty list here.
-BLACK_LIST="autoconf dejagnu gettext groff man-db vim"
+BLACK_LIST="attr autoconf dejagnu gettext groff man-db vim"
+#    Rationale for attr: the tests do not pass with -jX
 
 #--- Default optimization mode