Changeset 0cd09c6 for BLFS/gen-special.sh

Timestamp:

09/19/2023 08:11:11 PM (13 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

e6a1ec3

Parents:

b39f283

Message:

Add automation for kf5 and plasma5

File:

• BLFS/gen-special.sh (modified) (3 diffs)

BLFS/gen-special.sh

@@ -99 +99 @@
     <xsl:choose>
 EOF
-for file in $(ls ${BLFS_DIR}/x/installing/x7* | grep -v x7driver); do
+for file in $(ls ${BLFS_DIR}/x/installing/x7* | grep -v x7driver) \
+            ${BLFS_DIR}/kde/kf5/kf5-frameworks.xml                \
+            ${BLFS_DIR}/kde/plasma5/plasma-all.xml; do
   id=$(grep xreflabel $file | sed 's@.*id="\([^"]*\).*@\1@')
   cat >>$SPECIAL_FILE << EOF
@@ -117 +119 @@
 # that the preceding package is a dependency of the following,
 # except the first.
-  list_cat="$(sed -n '/>cat/,/EOF</p' $file | grep -v 'cat\|EOF\|#' |
+list_cat="$(sed -n '/>cat.*\.\(md5\|dat\)/,/EOF</p' $file | grep -v 'cat\|EOF\|#' |
               awk '{ print $NF }' | sed 's/-&.*//')"
 
-# Rationale for the sed below: the following for breaks words at spaces (unless
-# we tweak IFS). So replace spaces with commas in lines so that only newlines
-# are separators.
-  for pack in \
-      $(grep 'ENTITY.*version' $file | sed 's/[ ]\+/,/g'); do
-    packname=$(echo $pack | sed s'@.*ENTITY,\(.*\)-version.*@\1@')
-    packversion=$(echo $pack | sed 's@[^"]*"\([^"]*\).*@\1@')
-    precpack=NONE
-    for i in $list_cat; do
-      if [ "$i" = "$packname" ]; then break; fi
-      precpack=$i
-    done
-# It may happen that packname is not in list_cat, because its entity
-# is commented out in the xml, but we do not check that (too complicated).
-# In that case, the whole list is scanned, and $precpack=$i at the end.
-# when packname is found in the list $precpack!=$i.
-    if [ "$precpack" = "$i" ]; then continue; fi
+  precpack=NONE
+  for pack in $list_cat; do
+    if grep -q x7 $file; then # this is an xorg package
+      packname=$pack
+      packversion=$(grep "ENTITY ${pack}-version" $file | \
+                    sed 's@[^"]*"\([^"]*\).*@\1@')
+    else
+      packname=${pack%%-[[:digit:]]*}
+      packversion=$(echo $pack | sed 's/[^.]*-\([.[:digit:]]*\)\.tar.*/\1/')
+    fi
+## Rationale for the sed below: the following for breaks words at spaces (unless
+## we tweak IFS). So replace spaces with commas in lines so that only newlines
+## are separators.
+#  for pack in \
+#      $(grep 'ENTITY.*version' $file | sed 's/[ ]\+/,/g'); do
+#    packname=$(echo $pack | sed s'@.*ENTITY,\(.*\)-version.*@\1@')
+#    packversion=$(echo $pack | sed 's@[^"]*"\([^"]*\).*@\1@')
+#    for i in $list_cat; do
+#      if [ "$i" = "$packname" ]; then break; fi
+#      precpack=$i
+#    done
+## It may happen that packname is not in list_cat, because its entity
+## is commented out in the xml, but we do not check that (too complicated).
+## In that case, the whole list is scanned, and $precpack=$i at the end.
+## when packname is found in the list $precpack!=$i.
+#    if [ "$precpack" = "$i" ]; then continue; fi
     cat >>$SPECIAL_FILE << EOF
         <module><xsl:text>&#xA;          </xsl:text>
@@ -183 +194 @@
         </xsl:element>
 EOF
+    precpack=$packname
   done
   cat >>$SPECIAL_FILE << EOF