mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
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 <michael.tremer@ipfire.org>
This commit is contained in:
14
make.sh
14
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() {
|
||||
|
||||
Reference in New Issue
Block a user