bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert package array

Browse Source
This commit is contained in:
Bryan Roessler
2023-02-16 12:14:09 -05:00
parent 1d5b8c522a
commit f1f7fca41e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openwrtbuilder
View File

@@ -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