Changeset 4f3c433 for BLFS

Timestamp:

06/13/2016 04:51:45 PM (8 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, trunk

Children:

78d4779

Parents:

878a5a0

Message:

Fix for using the BLFS "double" book. Note that it does not work if one of the
revisions has been rendered, and you want to switch to the other one

Location:

BLFS

Files:

• Makefile (modified) (2 diffs)
• gen-special.sh (modified) (1 diff)

BLFS/Makefile

@@ -5 +5 @@
 
 # $Id$
+
+ifeq ($(REV),)
+  REV = sysv
+endif
+
+ifneq ($(REV),sysv)
+  ifneq ($(REV),systemd)
+    $(error The REV variable is $(REV), but can only be 'sysv' or 'systemd')
+  endif
+endif
 
 ifdef V
@@ -98 +108 @@
 
 $(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
+        $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
+        @echo "Adjusting for revision $(REV)..."
+        $(Q)xsltproc --nonet --xinclude                          \
+                     --stringparam profile.revision $(REV)       \
+                     --output $(RENDERTMP)/blfs-prof.xml         \
+                     $(BLFS_XML)/stylesheets/lfs-xsl/profile.xsl \
+                     $(BLFS_XML)/index.xml
         @echo "Validating the book..."
-        $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
-        $(Q)xmllint --nonet --noent --xinclude --postvalid \
-          -o $@ $(BLFS_XML)/index.xml
+        $(Q)xmllint --nonet --noent --postvalid \
+          -o $@ $(RENDERTMP)/blfs-prof.xml
 
 all: update $(BOOK_XML)

BLFS/gen-special.sh

@@ -35 +35 @@
 
 # Packages whose version does not begin with a number
-EXCEPTIONS=$(grep 'ENTITY.*version[ ]*"[^0-9"&.].*[0-9]' $BLFS_XML |
+EXCEPTIONS=$(grep 'ENTITY.*version[ ]*"[^0-9"&.].*[0-9]' ${BLFS_DIR}/packages.ent |
              sed 's@^[^"]*"\([^"]*\)".*@\1@')