Changeset 85506da for CLFS

Timestamp:

03/05/2017 08:38:09 AM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, trunk

Children:

3d24e5b

Parents:

df97e68

Message:

Merge new_features branch at r3901; Fixes:
when the user fstab and/or kernel config are the same as the ones in
$BUILDDIR/sources: avoid to cp on itself

• set SRC_ARCHIVE=/dev/null in BLFS tools download script if SRC_ARCHIVE is

empty

File:

• CLFS/master.sh (modified) (3 diffs)

CLFS/master.sh

@@ -379 +379 @@
       *how-to-view*) continue  ;;
       *whatnext*) continue     ;;
-      *fstab)   [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
+      *fstab)   [[ ! -z ${FSTAB} ]] &&
+                [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
+                cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *kernel)  # if there is no kernel config file do not build the kernel
-                [[ -z $CONFIG ]] && continue
+                [[ -z $BOOT_CONFIG ]] && continue
                   # Copy the config file to /sources with a standardized name
+                [[ ${BOOT_CONFIG} == $BUILDDIR/sources/bootkernel-config ]] ||
                 cp $BOOT_CONFIG $BUILDDIR/sources/bootkernel-config
           ;;
@@ -735 +738 @@
       *console*) continue ;; # Use the files that came with the bootscripts
 # fstab is now here (for 3.x.y)
-      *fstab)  [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
+      *fstab)  [[ ! -z ${FSTAB} ]] &&
+               [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
+               cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *)  ;;
     esac
@@ -908 +913 @@
     case $this_script in
       *grub | *aboot | *colo | *silo | *arcload | *lilo | *reboot* )  continue ;;
-      *fstab)  [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
+      *fstab)  [[ ! -z ${FSTAB} ]] &&
+               [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
+               cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *kernel) # if there is no kernel config file do not build the kernel
                [[ -z $CONFIG ]] && continue
                  # Copy the config file to /sources with a standardized name
+               [[ $CONFIG == $BUILDDIR/sources/kernel-config ]] ||
                cp $CONFIG $BUILDDIR/sources/kernel-config
         ;;