From eba9f280f890cc4eab7cc3be10db17d6ba78812e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 9 Jul 2024 16:04:47 +0000 Subject: [PATCH] make.sh: Don't drop into the lfs/ directory when entering a shell This is not a very useful place to be. Signed-off-by: Michael Tremer --- make.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index ae7404a001..efbe3d8611 100755 --- a/make.sh +++ b/make.sh @@ -753,8 +753,8 @@ execute() { # Clear the previous environment "--ignore-environment" - # Change the working directory - --chdir="${environ[LFS_BASEDIR]}/lfs" + # Change to the home directory + --chdir="${environ[HOME]}" ) # Export the environment @@ -823,12 +823,20 @@ make_pkg() { local args=() local pkg + local basedir="${BASEDIR}" + while [ $# -gt 0 ]; do local arg="${1}" shift case "${arg}" in --*) + case "${arg}" in + --chroot) + basedir="/usr/src" + ;; + esac + args+=( "${arg}" ) ;; @@ -840,7 +848,7 @@ make_pkg() { done # Execute the make command in the environment - execute "${args[@]}" make --file="${pkg}" "$@" + execute "${args[@]}" make --directory="${basedir}/lfs" --file="${pkg}" "$@" } lfsmake1() { -- 2.47.3