Changeset 840b9ba for common/libs/func_book_parser

Timestamp:

09/16/2021 04:30:58 AM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

e22aa96

Parents:

b5d1c50

Message:

Fix wrong VERSION variable for dev book

Using version from the ENTITY version line in gneral.ent is not
good anymore, since version is in version.ent for the dev book.
But it _is_ in general.ent for releases...
Use a different approach: take the profiled .xml, and use the
version in lsb-release.

File:

• common/libs/func_book_parser (modified) (3 diffs)

common/libs/func_book_parser

@@ -54 +54 @@
 
   cd $JHALFSDIR
-  case $PROGNAME in
-    clfs*)
-      VERSION=$(xmllint --noent $BOOK/BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
-    lfs)
-      if [ "$INITSYS" = "sysv" ] ; then
-        VERSION=$(grep 'ENTITY version ' $BOOK/general.ent| cut -d\" -f2)
-      else
-        VERSION=$(grep 'ENTITY versiond' $BOOK/general.ent| cut -d\" -f2)
-      fi
-      ;;
-    *)
-      VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//')  ;;
-  esac
-
   # Clean
   rm -rf ${PROGNAME}-commands
@@ -206 +192 @@
 
   # Create the packages file. We need it for proper Makefile creation
-  # lfs does not use this anymore, but thei is taken care in the
-  # funtion body
+  # lfs does not use this anymore, but this is taken care in the
+  # function body
   create_package_list
   # On the other hand, lfs needs two auxiliary files
@@ -215 +201 @@
   fi
 
+  # we create the VERSION variable here. Should maybe go into its own
+  # function. But at this point we can use the profiled xml to get
+  # version from lfs-release in the lfs case.
+  case $PROGNAME in
+    clfs*)
+      VERSION=$(xmllint --noent $BOOK/BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
+    lfs)
+      VERSION=$(grep 'echo.*lfs-release' prbook.xml | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
+      ;;
+    *)
+      VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//')  ;;
+  esac
+
   # Done. Moving on...
   get_sources
-
 }