From 607ef21bf6b9fc2d3e9bdd8348eb607af0ddedc2 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 9 Aug 2017 14:18:03 +0000 Subject: [PATCH] Add missing bits to generate scripts for LFS in BLFS tools --- BLFS/Makefile | 2 +- BLFS/gen_pkg_book.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/BLFS/Makefile b/BLFS/Makefile index 4342bff..46ec0a4 100644 --- a/BLFS/Makefile +++ b/BLFS/Makefile @@ -98,7 +98,7 @@ ifneq ($(REV),sysv) endif $(BOOK_XML): $(CONFIG_OUT) - $(Q)$(TOPDIR)/gen_pkg_book.sh $(TOPDIR) $(BLFS_FULL) + $(Q)$(TOPDIR)/gen_pkg_book.sh $(TOPDIR) $(BLFS_FULL) $(LFS_FULL) $(CONFIG_OUT): $(CONFIG_CONFIG_IN) $(MENU)/mconf $(Q)$(MENU)/mconf $(CONFIG_CONFIG_IN) diff --git a/BLFS/gen_pkg_book.sh b/BLFS/gen_pkg_book.sh index 5c28152..f978074 100755 --- a/BLFS/gen_pkg_book.sh +++ b/BLFS/gen_pkg_book.sh @@ -14,6 +14,10 @@ BLFS_FULL=$2 if test -z "$BLFS_FULL"; then BLFS_FULL=${TOPDIR}/blfs-xml/tmp/blfs-full.xml fi +LFS_FULL=$3 +if test -z "$LFS_FULL"; then + LFS_FULL=${TOPDIR}/lfs-xml/tmp/lfs-full.xml +fi declare -r ConfigFile="${TOPDIR}/configuration" declare DepDir="${TOPDIR}/dependencies" declare LibDir="${TOPDIR}/libs" @@ -157,7 +161,9 @@ set -e popd > /dev/null rm -f ${BookXml} echo Making XML book -xsltproc --stringparam list "$LIST" \ +xsltproc --stringparam list "$LIST" \ + --stringparam MTA "$SERVER_MAIL" \ + --stringparam lfsbook "$LFS_FULL" \ -o ${BookXml} \ ${MakeBook} \ $BLFS_FULL