Changeset 7bd0866 for BLFS

Timestamp:

06/19/2016 02:41:18 PM (8 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

new_features

Children:

04952c63

Parents:

99ba6d8

Message:

Merge trunk up to revision 3864

Location:

BLFS

Files:

• Makefile (modified) (2 diffs)
• gen-makefile.sh (modified) (1 diff)
• 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-makefile.sh

@@ -157 +157 @@
 
 if [[ ! -d ${BUILD_SCRIPTS} ]] ; then
-  echo -e "\n\tThe \'${BUILD_SCRIPTS}\' directory has not been found.\n"
+  echo -e "\n\tThe '${BUILD_SCRIPTS}' directory has not been found.\n"
   exit 1
 fi
 
-# Let us make a clean base:
+# Let us make a clean base, but first ensure that we are
+# not emptying a useful directory.
+MYDIR=$(pwd)
+MYDIR=$(basename $MYDIR)
+if [ "${MYDIR#work}" = "${MYDIR}" ] ; then
+  echo -e \\n\\tDirectory ${BOLD}$MYDIR${OFF} does not begin with \"work\"\\n
+  exit 1
+fi
+
 rm -rf *
 

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@')