|
@@ -450,7 +450,7 @@ makeImages() {
|
|
make image \
|
|
make image \
|
|
BIN_DIR="$BINDIR" \
|
|
BIN_DIR="$BINDIR" \
|
|
PROFILE="$PROFILE" \
|
|
PROFILE="$PROFILE" \
|
|
- PACKAGES="${PACKAGES[*]}" \
|
|
|
|
|
|
+ PACKAGES="$PACKAGES" \
|
|
FILES="${FILESDIR}" \
|
|
FILES="${FILESDIR}" \
|
|
--directory="$BUILDDIR" \
|
|
--directory="$BUILDDIR" \
|
|
--jobs="$(nproc)" \
|
|
--jobs="$(nproc)" \
|
|
@@ -593,7 +593,7 @@ fromSource() {
|
|
config_opts+=("CONFIG_BINARY_FOLDER=\"$BINDIR\"")
|
|
config_opts+=("CONFIG_BINARY_FOLDER=\"$BINDIR\"")
|
|
|
|
|
|
# Add custom packages
|
|
# Add custom packages
|
|
- for pkg in "${PACKAGES[@]}"; do
|
|
|
|
|
|
+ for pkg in $PACKAGES; do
|
|
if [[ $pkg == -* ]]; then
|
|
if [[ $pkg == -* ]]; then
|
|
config_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package
|
|
config_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package
|
|
else
|
|
else
|
|
@@ -758,7 +758,7 @@ main() {
|
|
declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"
|
|
declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"
|
|
declare -g TARGET="${P_ARR[target]}"
|
|
declare -g TARGET="${P_ARR[target]}"
|
|
declare -g PROFILE="${P_ARR[profile]}"
|
|
declare -g PROFILE="${P_ARR[profile]}"
|
|
- IFS=" " read -r -a PACKAGES <<< "${P_ARR[packages]:-}"
|
|
|
|
|
|
+ declare -g PACKAGES="${P_ARR[packages]:-}"
|
|
|
|
|
|
if (( RESET )); then
|
|
if (( RESET )); then
|
|
askOk "Remove $BUILDDIR and $BINDIR?" || exit $?
|
|
askOk "Remove $BUILDDIR and $BINDIR?" || exit $?
|
|
@@ -796,7 +796,7 @@ main() {
|
|
for x in "${!P_ARR[@]}"; do printf "%s=%s\n" "$x" "${P_ARR[$x]}"; done
|
|
for x in "${!P_ARR[@]}"; do printf "%s=%s\n" "$x" "${P_ARR[$x]}"; done
|
|
echo "Build settings:"
|
|
echo "Build settings:"
|
|
cat <<- EOF
|
|
cat <<- EOF
|
|
- ALIAS (\$profile, \$P_ARR -- should match)=$profile, $P_ARR
|
|
|
|
|
|
+ ALIAS (\$profile, \$P_ARR -- should match)=$profile, ${!P_ARR}
|
|
BUILDROOT=$BUILDROOT
|
|
BUILDROOT=$BUILDROOT
|
|
BUILDDIR=$BUILDDIR
|
|
BUILDDIR=$BUILDDIR
|
|
BINDIR=$BINDIR
|
|
BINDIR=$BINDIR
|
|
@@ -805,7 +805,7 @@ main() {
|
|
RELEASE=$RELEASE
|
|
RELEASE=$RELEASE
|
|
FILESYSTEM=$FILESYSTEM
|
|
FILESYSTEM=$FILESYSTEM
|
|
SYSUPGRADEIMGGZ=$SYSUPGRADEIMGGZ
|
|
SYSUPGRADEIMGGZ=$SYSUPGRADEIMGGZ
|
|
- ib_url=$ib_url
|
|
|
|
|
|
+ ib_url=$ib_url
|
|
EOF
|
|
EOF
|
|
fi
|
|
fi
|
|
|
|
|