Ported r3426:3427 from trunk.
This commit is contained in:
parent
8b63f1c372
commit
a7ed55d877
2 changed files with 1 additions and 2 deletions
|
@ -293,7 +293,7 @@ boot_Makefiles() { #
|
||||||
|
|
||||||
# A little housekeeping on the scripts
|
# A little housekeeping on the scripts
|
||||||
case $this_script in
|
case $this_script in
|
||||||
*grub | *aboot | *colo | *silo | *arcload | *lilo ) continue ;;
|
*grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction ) continue ;;
|
||||||
*whatnext*) continue ;;
|
*whatnext*) continue ;;
|
||||||
*fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
|
*fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
|
||||||
*kernel) # if there is no kernel config file do not build the kernel
|
*kernel) # if there is no kernel config file do not build the kernel
|
||||||
|
|
1
jhalfs
1
jhalfs
|
@ -397,7 +397,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
|
||||||
cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
|
cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
|
||||||
cp -r menu ${BUILDDIR}${BLFS_ROOT}
|
cp -r menu ${BUILDDIR}${BLFS_ROOT}
|
||||||
cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
|
cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
|
||||||
chmod 777 ${BUILDDIR}${BLFS_ROOT}/progress_bar.sh
|
|
||||||
cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
|
cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
|
||||||
# Clean-up
|
# Clean-up
|
||||||
rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
|
rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
|
||||||
|
|
Reference in a new issue