From b8e5cad4c0a1d49fbbf170b7683fadb141345c74 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Thu, 16 Dec 2021 13:50:33 +0100
Subject: [PATCH] Pass tracking file to gen_pkg_book

This is needed for managing -pass1 packages, since their version
can only be found in the tracking file (thanks to previous commit).
---
 BLFS/Makefile        |  2 +-
 BLFS/gen_pkg_book.sh | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BLFS/Makefile b/BLFS/Makefile
index 2a11fde..6ed9c61 100644
--- a/BLFS/Makefile
+++ b/BLFS/Makefile
@@ -95,7 +95,7 @@ ifneq ($(REV),sysv)
 endif
 
 $(BOOK_XML): $(CONFIG_OUT)
-	$(Q)$(TOPDIR)/gen_pkg_book.sh $(TOPDIR) $(BLFS_FULL) $(LFS_FULL)
+	$(Q)$(TOPDIR)/gen_pkg_book.sh $(TRACKFILE) $(TOPDIR) $(BLFS_FULL) $(LFS_FULL)
 
 $(CONFIG_OUT): $(CONFIG_CONFIG_IN)
 	$(Q)CONFIG_="" KCONFIG_CONFIG=configuration \
diff --git a/BLFS/gen_pkg_book.sh b/BLFS/gen_pkg_book.sh
index 482a61c..ade0da9 100755
--- a/BLFS/gen_pkg_book.sh
+++ b/BLFS/gen_pkg_book.sh
@@ -4,15 +4,19 @@
 #
 set -e
 
-TOPDIR=$1
+TRACKFILE=$1
+if test -z "$TRACKFILE"; then
+  TRACKFILE=/var/lib/jhalfs/BLFS/instpkg.xml
+fi
+TOPDIR=$2
 if test -z "$TOPDIR"; then
   TOPDIR=$(pwd)
 fi
-BLFS_FULL=$2
+BLFS_FULL=$3
 if test -z "$BLFS_FULL"; then
   BLFS_FULL=${TOPDIR}/blfs-xml/tmp/blfs-full.xml
 fi
-LFS_FULL=$3
+LFS_FULL=$4
 if test -z "$LFS_FULL"; then
   LFS_FULL=${TOPDIR}/lfs-xml/tmp/lfs-full.xml
 fi