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

LFS: Simplify git repo management

Browse source 
Use inly one variable, REPO, containing the LFS git repo url. The
BLFS Makefile hardcodes the LFS and BLFS git repo urls, so no need
to pass them.
This commit is contained in:
Pierre Labastie 2022-03-30 12:27:03 +02:00
parent f45af2ca4d
commit 9f89fae89a
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/libs/func_book_parser
View file

@ -12,16 +12,11 @@ get_book() { #
echo -n "Downloading the $PROGNAME document, $LFSVRS version... " echo -n "Downloading the $PROGNAME document, $LFSVRS version... "
case $PROGNAME in
lfs) git_root="lfs.git" ;;
*) echo "BOOK not defined in function <get_book>"
exit 1 ;;
esac
# Grab a fresh book if it's missing, otherwise, update it from the # 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 # repo. If we've already extracted the commands, move on to getting the
# sources. # sources.
if [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then if [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then
git clone $GIT/$git_root ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 git clone $REPO ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
if [ ! $TREE == "development" ]; then if [ ! $TREE == "development" ]; then
pushd ${PROGNAME}-$LFSVRS > /dev/null pushd ${PROGNAME}-$LFSVRS > /dev/null
echo "Checking out $LFSVRS at $PWD in $TREE" echo "Checking out $LFSVRS at $PWD in $TREE"

2
common/libs/func_install_blfs
View file

@ -49,10 +49,8 @@ sudo make -j1 -C $BUILDDIR$BLFS_ROOT \
REV=$INITSYS \ REV=$INITSYS \
TRACKING_DIR=$BUILDDIR$TRACKING_DIR \ TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML \ LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML \
LFS-GIT=$GIT/lfs.git \
LFS-BRANCH=${LFS_TREE} \ LFS-BRANCH=${LFS_TREE} \
BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \ BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \
GIT=$GIT/blfs.git \
BLFS-BRANCH=${BLFS_TREE} \ BLFS-BRANCH=${BLFS_TREE} \
$BUILDDIR$BLFS_ROOT/packages.xml $BUILDDIR$BLFS_ROOT/packages.xml

2
jhalfs
View file

@ -219,7 +219,7 @@ BOOK=${BOOK:=$JHALFSDIR/$PROGNAME-$LFSVRS}
#--- Envars not sourced from configuration #--- Envars not sourced from configuration
# shellcheck disable=SC2034 # shellcheck disable=SC2034
declare -r GIT="git://git.linuxfromscratch.org" declare -r REPO=git://git.linuxfromscratch.org/lfs.git
declare -r LOG=000-masterscript.log declare -r LOG=000-masterscript.log
# Set true internal variables # Set true internal variables