Changeset ee96ad2 for jhalfs

Timestamp:

10/14/2021 08:25:48 AM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

50cf934

Parents:

4c32ca8

Message:

jhalfs: rebuild-makefile. take VERSION from prbook

When rebuilding the Makefile, we should have prbook.xml in
ĴHALFSDIR. Use it to get VERSION (from lfs-release).

File:

• jhalfs (modified) (1 diff)

jhalfs

@@ -479 +479 @@
       VERSION=$(xmllint --noent "$BOOK/prologue/$ARCH/bookinfo.xml" 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
     lfs)
-      version_is_in=general.ent
-      if [ -x $BOOK/git-version.sh ]; then
-        ( cd $BOOK && ./git-version.sh )
-        version_is_in=version.ent
-      fi
-      if [[ "$INITSYS" = "sysv" ]] ; then
-        VERSION=$(grep 'ENTITY version ' "$BOOK/$version_is_in" | cut -d\" -f2)
-      else
-        VERSION=$(grep 'ENTITY versiond' "$BOOK/$version_is_in" | cut -d\" -f2)
-      fi
+      VERSION=$(grep 'echo.*lfs-release' "$JHALFSDIR/prbook.xml" | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
       ;;
     *)