envkernel: Don't use alias commands in the script itself
The pmbootstrap alias cannot be used within the script. The reason is that aliases are not expanded in non-interactive shells. reference: https://unix.stackexchange.com/q/1496 To fix this replace references to the pmbootstrap alias with the $pmbootstrap variable
This commit is contained in:
parent
e413d39db7
commit
c9fc3d9b85
|
@ -50,8 +50,8 @@ set_alias_pmbootstrap() {
|
||||||
|
|
||||||
|
|
||||||
export_chroot_device_deviceinfo() {
|
export_chroot_device_deviceinfo() {
|
||||||
chroot="$(pmbootstrap config work)/chroot_native"
|
chroot="$($pmbootstrap config work)/chroot_native"
|
||||||
device="$(pmbootstrap config device)"
|
device="$($pmbootstrap config device)"
|
||||||
deviceinfo="$pmbootstrap_dir/aports/device/device-$device/deviceinfo"
|
deviceinfo="$pmbootstrap_dir/aports/device/device-$device/deviceinfo"
|
||||||
export chroot device deviceinfo
|
export chroot device deviceinfo
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ initialize_chroot() {
|
||||||
# Install needed packages
|
# Install needed packages
|
||||||
echo "Initializing Alpine chroot (details: 'pmbootstrap log')"
|
echo "Initializing Alpine chroot (details: 'pmbootstrap log')"
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
pmbootstrap -q chroot -- apk -q add \
|
$pmbootstrap -q chroot -- apk -q add \
|
||||||
abuild \
|
abuild \
|
||||||
bc \
|
bc \
|
||||||
binutils-"$deviceinfo_arch" \
|
binutils-"$deviceinfo_arch" \
|
||||||
|
@ -106,7 +106,7 @@ mount_kernel_source() {
|
||||||
create_output_folder() {
|
create_output_folder() {
|
||||||
[ -d "$chroot/mnt/linux/.output" ] && return
|
[ -d "$chroot/mnt/linux/.output" ] && return
|
||||||
mkdir -p ".output"
|
mkdir -p ".output"
|
||||||
pmbootstrap -q chroot -- chown -R pmos:pmos "/mnt/linux/.output"
|
$pmbootstrap -q chroot -- chown -R pmos:pmos "/mnt/linux/.output"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue