zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass tracking file to gen_pkg_book

Browse source 
This is needed for managing -pass1 packages, since their version
can only be found in the tracking file (thanks to previous commit).
This commit is contained in:
Pierre Labastie 2021-12-16 13:50:33 +01:00
parent a6fbc65357
commit b8e5cad4c0
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/Makefile
View file

@ -95,7 +95,7 @@ ifneq ($(REV),sysv)
endif endif
$(BOOK_XML): $(CONFIG_OUT) $(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) $(CONFIG_OUT): $(CONFIG_CONFIG_IN)
$(Q)CONFIG_="" KCONFIG_CONFIG=configuration \ $(Q)CONFIG_="" KCONFIG_CONFIG=configuration \

10
BLFS/gen_pkg_book.sh
View file

@ -4,15 +4,19 @@
# #
set -e 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 if test -z "$TOPDIR"; then
TOPDIR=$(pwd) TOPDIR=$(pwd)
fi fi
BLFS_FULL=$2 BLFS_FULL=$3
if test -z "$BLFS_FULL"; then if test -z "$BLFS_FULL"; then
BLFS_FULL=${TOPDIR}/blfs-xml/tmp/blfs-full.xml BLFS_FULL=${TOPDIR}/blfs-xml/tmp/blfs-full.xml
fi fi
LFS_FULL=$3 LFS_FULL=$4
if test -z "$LFS_FULL"; then if test -z "$LFS_FULL"; then
LFS_FULL=${TOPDIR}/lfs-xml/tmp/lfs-full.xml LFS_FULL=${TOPDIR}/lfs-xml/tmp/lfs-full.xml
fi fi