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

More work on --source

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-26 23:18:40 -05:00
parent dba19f1f09
commit e3a92d444c
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openwrtbuilder
View File

@@ -643,13 +643,7 @@ fromSource() {
make defconfig # normalize .config and remove dupes make defconfig # normalize .config and remove dupes
for pkg in ${P_ARR[packages]:+}; do make_opts+=("PACKAGES=${P_ARR[packages]}")
if [[ $pkg == -* ]]; then
make_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package
else
make_opts+=("CONFIG_PACKAGE_$pkg=y") # add package
fi
done
for kopt in ${P_ARR[kopts]:+}; do for kopt in ${P_ARR[kopts]:+}; do
make_opts+=("$kopt") make_opts+=("$kopt")
@@ -668,9 +662,8 @@ 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 "${make_opts[@]}" download && debug "${make_opts[*]} -j$(nproc) download image"
debug "${make_opts[*]} -j$(nproc) world" && make "${make_opts[@]}" -j"$(nproc)" download image
make "${make_opts[@]}" -j"$(nproc)" world
popd &>/dev/null || return 1 popd &>/dev/null || return 1
exit # TODO exit here for fromSource() testing exit # TODO exit here for fromSource() testing