Author: pierre
Date: Mon Jun 13 09:51:45 2016
New Revision: 3864
Log:
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
Modified:
jhalfs/trunk/BLFS/Makefile
jhalfs/trunk/BLFS/gen-special.sh
Modified: jhalfs/trunk/BLFS/Makefile
==============================================================================
--- jhalfs/trunk/BLFS/Makefile Sat May 28 03:34:51 2016 (r3863)
+++ jhalfs/trunk/BLFS/Makefile Mon Jun 13 09:51:45 2016 (r3864)
@@ -5,6 +5,16 @@
# $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
Q =
else
@@ -97,10 +107,16 @@
$(Q)$(TOPDIR)/gen-special.sh $(BLFS_FULL) $@
$(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
- @echo "Validating the book..."
$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
- $(Q)xmllint --nonet --noent --xinclude --postvalid \
- -o $@ $(BLFS_XML)/index.xml
+ @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)xmllint --nonet --noent --postvalid \
+ -o $@ $(RENDERTMP)/blfs-prof.xml
all: update $(BOOK_XML)
Modified: jhalfs/trunk/BLFS/gen-special.sh
==============================================================================
--- jhalfs/trunk/BLFS/gen-special.sh Sat May 28 03:34:51 2016 (r3863)
+++ jhalfs/trunk/BLFS/gen-special.sh Mon Jun 13 09:51:45 2016 (r3864)
@@ -34,7 +34,7 @@
if test -z "${BLFS_DIR}"; then BLFS_DIR=$(cd $(dirname ${BLFS_XML})/.. ;
pwd);fi
# 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@')
# Non-versioned packages:
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
