Changeset 2c1a763 for common

Timestamp:

03/30/2022 08:35:12 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

2bf44e2

Parents:

1242857

Message:

try to fix func_install_blfs to work in all cases

WIP...

File:

• common/libs/func_install_blfs (modified) (3 diffs)

common/libs/func_install_blfs

@@ -33 +33 @@
 # book has already been validated, tmp is posterior to the others, and
 # validation will not be done again.
-  cp -ruT --preserve=timestamps $BLFS_WC_LOCATION \
+# sudo is needed because make (below) may already have been run and
+# may have put some files owned by root
+  sudo cp -ruT --preserve=timestamps $BLFS_WC_LOCATION \
                                 ${BUILDDIR}${BLFS_ROOT}/$BLFS_XML
 fi
@@ -39 +41 @@
 # Copy the LFS book. Note that now, the book is downloaded before running
 # the BLFS tools.
-cp -ruT --preserve=timestamps $BOOK \
+sudo cp -ruT --preserve=timestamps $BOOK \
                               ${BUILDDIR}${BLFS_ROOT}/$LFS_XML
 
 # Downloads the book if necessary, initialize the tracking file and the
 # package database.
+# updating first is needed if the xml sources have already been cloned
+# and we want to set the branches.
+# Note that if LFS-BRANCH or BLFS-BRANCH is empty, which may happen
+# if using a working copy, then the corresponding update is not
+# performed by make (see BLFS/Makefile).
 # sudo is needed if $BUILDDIR/var/lib is owned by root and /var/lib/jhalfs
 # has to be created
+sudo make -j1 -C $BUILDDIR$BLFS_ROOT             \
+          REV=$INITSYS                           \
+          LFS-BRANCH=${COMMIT}                   \
+          BLFS-BRANCH=${BLFS_TREE}               \
+          update
 sudo make -j1 -C $BUILDDIR$BLFS_ROOT             \
           REV=$INITSYS                           \
@@ -53 +65 @@
           BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \
           BLFS-BRANCH=${BLFS_TREE}               \
+          update                                 \
           $BUILDDIR$BLFS_ROOT/packages.xml