Changeset bd07ef5

Timestamp:

02/22/2015 09:20:37 PM (9 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

6c97d02

Parents:

d607ac3

Message:

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.

Location:

BLFS

Files:

• libs/func_dependencies (modified) (2 diffs)
• xsl/gen_pkg_list.xsl (modified) (1 diff)

BLFS/libs/func_dependencies

@@ -114 +114 @@
 
     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
@@ -153 +152 @@
 # 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

BLFS/xsl/gen_pkg_list.xsl

@@ -203 +203 @@
 <!-- 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>