Changeset 30a444a

Timestamp:

04/01/2022 08:25:48 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

9b99ada

Parents:

8c2b505

git-author:

Pierre Labastie <pierre.labastie@…> (04/01/2022 08:22:57 AM)

git-committer:

Pierre Labastie <pierre.labastie@…> (04/01/2022 08:25:48 AM)

Message:

Fix some bugs in func_install_blfs

• do not try to copy downloaded files to $SRC_ARCHIVE: they may belong to another user, and so be non writable.
• trunk/BOOK is not used anymore in BLFS/Makefile
• do not make update a second time

File:

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

common/libs/func_install_blfs

@@ -23 +23 @@
 sed -i s@tracking-dir@$TRACKING_DIR@ \
     ${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh,gen_pkg_book.sh}
-sed -i s@trunk/BOOK@$BLFS_TREE@ \
-    ${BUILDDIR}${BLFS_ROOT}/Makefile
 
 # If we have a working copy, copy it:
@@ -65 +63 @@
           BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \
           BLFS-BRANCH=${BLFS_TREE}               \
-          update                                 \
           $BUILDDIR$BLFS_ROOT/packages.xml
 
@@ -163 +160 @@
 echo -e '#!/bin/bash\nset -e\n' > $BUILDDIR$BLFS_ROOT/download_script
 sed -n -e '/PACKAGE=/,/^fi/{/^fi/a\
-cp $PACKAGE $JH_SRC_ARCHIVE
+[ ! -f "$JH_SRC_ARCHIVE/$PACKAGE" ] && cp $PACKAGE $JH_SRC_ARCHIVE
 p}' \
        -e '/|[ ]*md5sum/p' \
        -e '/PACKAGE1=/,/^fi/{/^fi/a\
-cp $PACKAGE1 $JH_SRC_ARCHIVE
+[ ! -f "$JH_SRC_ARCHIVE/$PACKAGE1" ] && cp $PACKAGE1 $JH_SRC_ARCHIVE
 p}' \
        -e '/PATCH=/,/^fi/{/^fi/a\
-cp $PATCH $JH_SRC_ARCHIVE
+[ ! -f "$JH_SRC_ARCHIVE/$PATCH" ] && cp $PATCH $JH_SRC_ARCHIVE
 p}' \
        -e '/URL=/,/^fi/{/^fi/a\
-cp $BOOTPACKG $JH_SRC_ARCHIVE
+[ ! -f "$JH_SRC_ARCHIVE/$BOOTPACKG" ] && cp $BOOTPACKG $JH_SRC_ARCHIVE
 p}' \
     $BUILDDIR$BLFS_ROOT/scripts/* >> $BUILDDIR$BLFS_ROOT/download_script