r3822 - in jhalfs/trunk/BLFS: libs xsl

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Feb 22 13:20:37 PST 2015


Author: pierre
Date: Sun Feb 22 13:20:37 2015
New Revision: 3822

Log:
The preceding fix is just a workaround, but the correct fix is:
- the problem is when a .dep file contains pack-A pack-B pack-A. If pack-A
and pack-B have some dep in common, say pack-C, that dep is erased from
pack-B, with the idea that it will be built as a dep of pack-A. But when
the program encounters the second pack-A, it removes the first one, so that
pack-C is built before the second pack-A, but after pack-B. Sorting was
a good workaround, but removing the last line instead of the first is
much better.
- Otherwise, add Xfce and Lxde to the list of packages whose preceding
sibling is a required dep.

Modified:
   jhalfs/trunk/BLFS/libs/func_dependencies
   jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl

Modified: jhalfs/trunk/BLFS/libs/func_dependencies
==============================================================================
--- jhalfs/trunk/BLFS/libs/func_dependencies	Sun Feb 22 07:16:49 2015	(r3821)
+++ jhalfs/trunk/BLFS/libs/func_dependencies	Sun Feb 22 13:20:37 2015	(r3822)
@@ -113,7 +113,6 @@
         ../xsl/dependencies.xsl ../packages.xml
 
     if [[ -f ${id_of_dep}.dep ]]; then
-      sort ${id_of_dep}.dep -o ${id_of_dep}.dep
       sed -i "1i${rootlink[*]} $count" ${id_of_dep}.dep
       generate_dependency_tree ${id_of_dep}.dep
 # Test return value, in case we exchange dependencies
@@ -152,7 +151,7 @@
 # so first get the number of first line and then delete
 # that line
 for line in $lines_to_remove
-  do lineno=$(sed -n /^$line\$/= $DepFile | head -n1)
+  do lineno=$(sed -n /^$line\$/= $DepFile | tail -n1)
   sed -i ${lineno}d $DepFile
 done
 return 0

Modified: jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
==============================================================================
--- jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl	Sun Feb 22 07:16:49 2015	(r3821)
+++ jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl	Sun Feb 22 13:20:37 2015	(r3822)
@@ -202,7 +202,10 @@
 <!-- Dependencies -->
 <!-- If in Xorg (not anymore) or KDE chapter, consider that the preceding
      package is the first dependency (not always noted in the book)-->
-          <xsl:if test="ancestor::chapter[@id='kde4-core']">
+          <xsl:if test="ancestor::chapter[@id='kde4-core'
+                                       or @id='xfce-core'
+                                       or @id='lxde-desktop']
+                    and preceding-sibling::sect1[1]">
             <xsl:text>
             </xsl:text>
             <xsl:element name="dependency">


More information about the alfs-log mailing list