Fixed SHELL setting to work also when resuming failed builds.
This commit is contained in:
parent
7fe73c8e36
commit
aec44836a5
4 changed files with 6 additions and 5 deletions
|
@ -824,6 +824,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
|
|||
SETUP: $host_prep
|
||||
AS_LUSER: $cross_tools $temptools
|
||||
SUDO: $orphan_scripts
|
||||
CHROOT_JAIL: SHELL=/tools/bin/bash
|
||||
CHROOT_JAIL: ${chroottools} $testsuitetools $basicsystem $bootscripttools $bootabletools
|
||||
CUSTOM_TOOLS: $custom_list
|
||||
BLFS_TOOL: $blfs_tool
|
||||
|
@ -926,6 +927,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
|
|||
SETUP: $host_prep
|
||||
AS_LUSER: $cross_tools $temptools ${boottools}
|
||||
SUDO: $orphan_scripts
|
||||
AS_ROOT: SHELL=/tools/bin/bash
|
||||
AS_ROOT: $testsuitetools $basicsystem $bootscripttools $bootabletools
|
||||
CUSTOM_TOOLS: $custom_list
|
||||
BLFS_TOOL: $blfs_tool
|
||||
|
|
|
@ -597,6 +597,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
|
|||
SETUP: $chapter3
|
||||
LUSER: $chapter5
|
||||
SUDO: $runasroot
|
||||
CHROOT: SHELL=/tools/bin/bash
|
||||
CHROOT: $chapter6
|
||||
BOOT: $chapter7
|
||||
CUSTOM_TOOLS: $custom_list
|
||||
|
|
|
@ -467,6 +467,7 @@ mk_BLFS_TOOL: mk_CUSTOM_TOOLS
|
|||
SETUP: $chapter4
|
||||
LUSER: $chapter5
|
||||
SUDO: $runasroot
|
||||
CHROOT: SHELL=/tools/bin/bash
|
||||
CHROOT: $chapter6
|
||||
BOOT: $chapter78
|
||||
CUSTOM_TOOLS: $custom_list
|
||||
|
|
|
@ -14,11 +14,8 @@ wrt_Makefile_header() { #
|
|||
#
|
||||
# Generated on `date "+%F %X %Z"`
|
||||
|
||||
ifeq (\$(shell [ -x /bin/bash ] && echo /bin/bash),/bin/bash)
|
||||
SHELL = /bin/bash
|
||||
else
|
||||
SHELL = /tools/bin/bash
|
||||
endif
|
||||
|
||||
SHELL = /bin/bash
|
||||
|
||||
SRC = /sources
|
||||
MOUNT_PT = $BUILDDIR
|
||||
|
|
Reference in a new issue