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

Fix packages

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

7
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,8 +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]}"
declare -g PACKAGES="${P_ARR[packages]:-}" IFS=" " read -r -a PACKAGES <<< "${P_ARR[packages]:-}"
IFS=" " read -r -a PACKAGES <<< "$PACKAGES"
if (( RESET )); then if (( RESET )); then
askOk "Remove $BUILDDIR and $BINDIR?" || exit $? askOk "Remove $BUILDDIR and $BINDIR?" || exit $?