Merge trunk up to revision 3864

BLFS/Makefile

@@ -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 @@ $(XSLDIR)/specialCases.xsl: $(TOPDIR)/gen-special.sh $(BLFS_FULL)
 	$(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 \
+	@echo "Adjusting for revision $(REV)..."
-	  -o $@ $(BLFS_XML)/index.xml
+	$(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)
 

BLFS/gen-makefile.sh

@@ -156,11 +156,19 @@ EOF
 }
 
 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, 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
 
-# Let us make a clean base:
 rm -rf *
 
 generate_Makefile

BLFS/gen-special.sh

@@ -34,7 +34,7 @@ BLFS_DIR=$3
 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:

Config.in

@@ -8,7 +8,10 @@ menu "--- BOOK Settings"
 			#-- Select the BOOK/Build style you wish to configure.
 
 		config	BOOK_LFS
-			bool "Linux From Scratch"
+			bool "Linux From Scratch System V"
+
+		config	BOOK_LFS_SYSD
+			bool "Linux From Scratch systemd"
 
 		config	BOOK_CLFS
 			bool "Cross-Compiled Linux From Scratch"
@@ -23,9 +26,14 @@ menu "--- BOOK Settings"
 #			bool "Hardened Linux From Scratch"
 	endchoice
 
+	config	INITSYS
+		string
+		default	"sysv"		if BOOK_LFS
+		default	"systemd"	if BOOK_LFS_SYSD
+
 	config	PROGNAME
 		string
-		default	"lfs"		if BOOK_LFS
+		default	"lfs"		if BOOK_LFS || BOOK_LFS_SYSD
 		default	"clfs"		if BOOK_CLFS
 		default	"clfs2"		if BOOK_CLFS2
 		default	"clfs3"		if BOOK_CLFS3
@@ -39,11 +47,11 @@ menu "--- BOOK Settings"
 	#--- Book version
 	choice
 		prompt	"Release"
-		default	relSVN	if BOOK_LFS || BOOK_HLFS
+		default	relSVN	if BOOK_LFS || BOOK_HLFS || BOOK_LFS_SYSD
 		default	relGIT	if BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
 		config	relSVN
 			bool	"SVN"
-			depends on BOOK_LFS || BOOK_HLFS
+			depends on BOOK_LFS || BOOK_HLFS || BOOK_LFS_SYSD
 			help
 				#-- Current development version as in trunk
 
@@ -624,7 +632,7 @@ menu "--- General Settings"
 
 	config	DEF_USER
 		string
-		default	"lfs"	if BOOK_LFS
+		default	"lfs"	if BOOK_LFS || BOOK_LFS_SYSD
 		default	"clfs"	if BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
 		default "hlfs"	if BOOK_HLFS
 
@@ -826,7 +834,7 @@ menu "--- Build Settings"
 	#--- Package Management
 	config  PKGMNGT
 		bool    "Package management"
-		depends BOOK_LFS
+		depends BOOK_LFS || BOOK_LFS_SYSD
 		default n
 		help
 			#-- Use package management

common/libs/func_book_parser

@@ -23,9 +23,11 @@ get_book() {                 #
     # Grab a fresh book if it's missing, otherwise, update it from the
     # repo. If we've already extracted the commands, move on to getting the
     # sources.
-    if [ $PROGNAME == "lfs" ] || [ $PROGNAME == "hlfs" ] && [ ! -d ${PROGNAME}-${LFSVRS}/.svn ]; then
+    if [ $PROGNAME == "lfs" ] || [ $PROGNAME == "hlfs" ] &&
+                                 [ ! -d ${PROGNAME}-${LFSVRS}/.svn ]; then
         svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
-    elif [ $PROGNAME == "clfs" ]  || [ $PROGNAME == "clfs2" ] || [ $PROGNAME == "clfs3" ] && [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then
+    elif [ $PROGNAME == "clfs" ]  || [ $PROGNAME == "clfs2" ] ||
+         [ $PROGNAME == "clfs3" ] && [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then
         echo $TREE
         git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
         if [ ! $TREE == "development" ]; then
@@ -60,6 +62,13 @@ extract_commands() {         #
   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
@@ -84,7 +93,9 @@ extract_commands() {         #
                  --stringparam sparc $SPARC64_PROC       \
                  --stringparam x86 $TARGET               \
                  --stringparam mips $TARGET              \
-                 -o ./${PROGNAME}-commands/ $XSL $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
+                 -o ./${PROGNAME}-commands/              \
+                 $XSL                                    \
+                 $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
       ;;
 
     clfs2)
@@ -95,7 +106,9 @@ extract_commands() {         #
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE         \
                  --stringparam lang $LANG         \
-                 -o ./${PROGNAME}-commands/ $XSL $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
+                 --output ./${PROGNAME}-commands/ \
+                 $XSL                             \
+                 $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
       ;;
 
     clfs3)
@@ -106,7 +119,9 @@ extract_commands() {         #
                  --stringparam timezone $TIMEZONE \
                  --stringparam page $PAGE         \
                  --stringparam lang $LANG         \
-                 -o ./${PROGNAME}-commands/ $XSL $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
+                 --output ./${PROGNAME}-commands/ \
+                 $XSL                             \
+                 $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
       ;;
 
     hlfs)
@@ -117,12 +132,15 @@ extract_commands() {         #
                  --stringparam kernel $KERNEL                           \
                  --stringparam testsuite $TEST                          \
                  --stringparam bomb-testsuite $BOMB_TEST                \
-                 --stringparam features x$SSP$ASLR$PAX$HARDENED_TMP$WARNINGS$MISC$BLOWFISH \
+                 --stringparam features                                 \
+                     x$SSP$ASLR$PAX$HARDENED_TMP$WARNINGS$MISC$BLOWFISH \
                  --stringparam timezone $TIMEZONE                       \
                  --stringparam page $PAGE                               \
                  --stringparam lang $LANG                               \
                  --stringparam grsecurity_host $GRSECURITY_HOST         \
-                 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
+                 --output ./${PROGNAME}-commands/                       \
+                 $XSL                                                   \
+                 $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
     lfs)
         echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
@@ -131,8 +149,15 @@ extract_commands() {         #
           bash process-scripts.sh >> $LOGDIR/$LOG 2>&1
         fi
         popd > /dev/null
+
         xsltproc --nonet                                 \
                  --xinclude                              \
+                 --output /tmp/lfs-full.xml              \
+                 --stringparam profile.revision $INITSYS \
+                 $BOOK/stylesheets/lfs-xsl/profile.xsl   \
+                 $BOOK/index.xml
+
+        xsltproc --nonet                                   \
                  --stringparam testsuite      $TEST        \
                  --stringparam bomb-testsuite $BOMB_TEST   \
                  --stringparam vim-lang       $VIMLANG     \
@@ -150,7 +175,11 @@ extract_commands() {         #
                  --stringparam domain         $DOMAIN      \
                  --stringparam nameserver1    $DNS1        \
                  --stringparam nameserver2    $DNS2        \
-                 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
+                 --output ./${PROGNAME}-commands/          \
+                 $XSL                                      \
+                 /tmp/lfs-full.xml >>$LOGDIR/$LOG 2>&1
+
+        rm /tmp/lfs-full.xml
       ;;
     *)  echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate build... "
         exit 1 ;;
@@ -181,20 +210,25 @@ create_package_list() {      #
   echo -n "... "
   case ${PROGNAME} in
     clfs*)
-        xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \
+        xsltproc --nonet --xinclude  \
+                 -o pkg_tarball_list \
+                 packages.xsl        \
                  $BOOK/BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1
       ;;
     hlfs)
         xsltproc --nonet --xinclude           \
                  --stringparam model $MODEL   \
                  --stringparam kernel $KERNEL \
-                  -o pkg_tarball_list packages.xsl \
+                 --output pkg_tarball_list    \
+                 packages.xsl                 \
                  $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
       ;;
     lfs)
         xsltproc --nonet --xinclude              \
                  --stringparam pkgmngt $PKGMNGT  \
-                  -o pkg_tarball_list packages.xsl \
+                 --stringparam revision $INITSYS \
+                 --output pkg_tarball_list       \
+                 packages.xsl                    \
                  $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
       ;;
     *)

common/libs/func_check_version.sh

@@ -88,12 +88,9 @@ inline_doc
 check_prerequisites() {      #
 #----------------------------#
 
-  case $PROGNAME in
+  HOSTREQS=$(find $BOOK -name hostreqs.xml)
-    clfs | clfs2 | clfs3) HOSTREQS="BOOK/prologue/common/hostreqs.xml" ;;
-    *) HOSTREQS="prologue/hostreqs.xml" ;;
-  esac
 
-  eval $(xsltproc $COMMON_DIR/hostreqs.xsl $BOOK/$HOSTREQS)
+  eval $(xsltproc $COMMON_DIR/hostreqs.xsl $HOSTREQS)
   # Avoid translation of version strings
   local LC_ALL=C
   export LC_ALL

common/libs/func_download_pkgs

@@ -153,7 +153,8 @@ create_urls() {              #
         xsltproc --nonet --xinclude            \
                  --stringparam server $SERVER  \
                  --stringparam family clfs     \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
+                 -o $BUILDDIR/sources/urls.lst \
+                 urls.xsl                      \
                  $BOOK/BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
       ;;
@@ -164,7 +165,8 @@ create_urls() {              #
                  --stringparam family lfs      \
                  --stringparam model $MODEL    \
                  --stringparam kernel $KERNEL  \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
+                 -o $BUILDDIR/sources/urls.lst \
+                 urls.xsl                      \
                  $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
       ;;
@@ -174,7 +176,9 @@ create_urls() {              #
                  --stringparam server $SERVER    \
                  --stringparam family lfs        \
                  --stringparam pkgmngt $PKGMNGT  \
-                 -o ../sources/urls.lst urls.xsl \
+                 --stringparam revision $INITSYS \
+                 --output ../sources/urls.lst    \
+                 urls.xsl                        \
                  $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
       ;;

common/libs/func_validate_configs.sh

@@ -31,7 +31,7 @@ inline_doc
   local -r ADVANCED_common="REPORT REBUILD_MAKEFILE"
 
   # BOOK Settings by book
-  local -r   LFS_book="$BOOK_common BLFS_TOOL"
+  local -r   LFS_book="$BOOK_common INITSYS BLFS_TOOL"
   #local -r HLFS_added="SET_SSP SET_ASLR SET_PAX SET_HARDENED_TMP SET_WARNINGS \
   #                     SET_MISC SET_BLOWFISH"
   local -r HLFS_added=""

common/packages.xsl

@@ -8,13 +8,16 @@
   <xsl:output method="text"/>
 
   <!-- The libc model used for HLFS -->
-  <xsl:param name="model" select="glibc"/>
+  <xsl:param name="model" select="'glibc'"/>
 
   <!-- The kernel series used for HLFS -->
-  <xsl:param name="kernel" select="2.6"/>
+  <xsl:param name="kernel" select="'2.6'"/>
 
-  <!-- Should we include a package manager -->
+  <!-- Should we include a package manager? -->
-  <xsl:param name="pkgmngt" select="n"/>
+  <xsl:param name="pkgmngt" select="'n'"/>
+
+  <!-- The system for LFS: sysv of systemd -->
+  <xsl:param name="revision" select="'sysv'"/>
 
   <xsl:template match="/">
     <xsl:apply-templates select="//para"/>
@@ -28,6 +31,8 @@
     <xsl:if test="contains(string(),'Download:') and
                   (ancestor::varlistentry[@condition=$model]
                   or not(ancestor::varlistentry[@condition])) and
+                  (ancestor::varlistentry[@revision=$revision]
+                  or not(ancestor::varlistentry[@revision])) and
                   (ancestor::varlistentry[@vendor=$kernel]
                   or not(ancestor::varlistentry[@vendor]))">
       <xsl:call-template name="package_name">

common/urls.xsl

@@ -14,16 +14,20 @@
   <xsl:param name="family">lfs</xsl:param>
 
   <!-- The libc model used for HLFS -->
-  <xsl:param name="model" select="glibc"/>
+  <xsl:param name="model" select="'glibc'"/>
 
   <!-- The kernel series used for HLFS -->
-  <xsl:param name="kernel" select="2.6"/>
+  <xsl:param name="kernel" select="'2.6'"/>
 
   <!-- Do we use a package manager? -->
-  <xsl:param name="pkgmngt" select="n"/>
+  <xsl:param name="pkgmngt" select="'n'"/>
+
+  <!-- The system for LFS: sysv of systemd -->
+  <xsl:param name="revision" select="'sysv'"/>
 
   <xsl:template match="/">
-    <xsl:apply-templates select="//ulink"/>
+    <xsl:apply-templates select="//varlistentry[@revision=$revision
+                                                or not(@revision)]//ulink"/>
     <xsl:if test="$pkgmngt='y'">
       <xsl:apply-templates
         select="document('packageManager.xml')//ulink"/>

jhalfs

@@ -441,6 +441,13 @@ if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then
   case $PROGNAME in
     clfs* )
       VERSION=$(xmllint --noent $JHALFSDIR/$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 ' $JHALFSDIR/$BOOK/general.ent| cut -d\" -f2)
+      else
+        VERSION=$(grep 'ENTITY versiond' $JHALFSDIR/$BOOK/general.ent| cut -d\" -f2)
+      fi
+      ;;
     *)
       VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
   esac