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

install_blfs: update trackdir also in gen_pkg_book.sh

Browse source 
Now gen_pkf_book.sh depends on trackfile. This can be passed
as an argument, but to ease calling it standalone, we need to
set the default to the actual file used.
This commit is contained in:
Pierre Labastie 2021-12-19 14:24:04 +01:00
parent ff5c301860
commit b734bfb4c6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/gen_pkg_book.sh
View file

@ -6,7 +6,7 @@ set -e
TRACKFILE=$1 TRACKFILE=$1
if test -z "$TRACKFILE"; then if test -z "$TRACKFILE"; then
TRACKFILE=/var/lib/jhalfs/BLFS/instpkg.xml TRACKFILE=tracking-dir/instpkg.xml
fi fi
TOPDIR=$2 TOPDIR=$2
if test -z "$TOPDIR"; then if test -z "$TOPDIR"; then

2
common/libs/func_install_blfs
View file

@ -21,7 +21,7 @@ fi
# Set some harcoded envars to their proper values # Set some harcoded envars to their proper values
sed -i s@tracking-dir@$TRACKING_DIR@ \ sed -i s@tracking-dir@$TRACKING_DIR@ \
${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh} ${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh,gen_pkg_book.sh}
sed -i s@trunk/BOOK@$BLFS_TREE@ \ sed -i s@trunk/BOOK@$BLFS_TREE@ \
${BUILDDIR}${BLFS_ROOT}/Makefile ${BUILDDIR}${BLFS_ROOT}/Makefile

2
install-blfs-tools.sh
View file

@ -166,7 +166,7 @@ rm -rf ${BUILDDIR}${BLFS_ROOT}/$LFS_XML
# Set some harcoded envars to their proper values # Set some harcoded envars to their proper values
sed -i s@tracking-dir@$TRACKING_DIR@ \ sed -i s@tracking-dir@$TRACKING_DIR@ \
${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh} ${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh,gen_pkg_book.sh}
# Ensures the tracking directory exists. # Ensures the tracking directory exists.
# Throws an error if it does not exist and the user does not # Throws an error if it does not exist and the user does not