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

Allow empty options

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-21 13:39:52 -05:00
parent 4cb0cbc3e4
commit de38f78a55
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openwrtbuilder
View File

@@ -553,8 +553,8 @@ fromSource() {
# Grab the release seed config # Grab the release seed config
if [[ -f "$SEED_FILE" ]]; then if [[ -f "$SEED_FILE" ]]; then
if askOk "$SEED_FILE exists. Re-download?"; then if askOk "$SEED_FILE exists. Recreate?"; then
rm -f "$SEED_FILE" make distclean
fi fi
fi fi
if [[ -f "$SEED_FILE" ]]; then if [[ -f "$SEED_FILE" ]]; then
@@ -567,7 +567,7 @@ fromSource() {
make defconfig # normalize .config and remove dupes make defconfig # normalize .config and remove dupes
for pkg in ${P_ARR[packages]:+${P_ARR[packages]}}; do for pkg in ${P_ARR[packages]:+}; do
if [[ $pkg == -* ]]; then if [[ $pkg == -* ]]; then
make_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package make_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package
else else
@@ -575,7 +575,7 @@ fromSource() {
fi fi
done done
for kopt in ${P_ARR[kopts]:+${P_ARR[kopts]}}; do for kopt in ${P_ARR[kopts]:+}; do
make_opts+=("$kopt") make_opts+=("$kopt")
done done
@@ -615,7 +615,6 @@ fromSource() {
[[ -d "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" ]] || mkdir -p "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" [[ -d "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" ]] || mkdir -p "$GITSRCDIR/staging_dir/host/llvm-bpf/bin"
ln -fs "$(which clang)" "$GITSRCDIR/staging_dir/host/llvm-bpf/bin/clang" ln -fs "$(which clang)" "$GITSRCDIR/staging_dir/host/llvm-bpf/bin/clang"
#make targetclean
make "${make_opts[@]}" download && make "${make_opts[@]}" download &&
debug "${make_opts[*]} -j$(nproc) world" && debug "${make_opts[*]} -j$(nproc) world" &&
make "${make_opts[@]}" -j"$(nproc)" world make "${make_opts[@]}" -j"$(nproc)" world