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

Fix build order

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-31 13:43:34 -05:00
parent cc42ef328c
commit 07fc9e7953
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -1,6 +1 @@
sources/ src/
bin/
files/
patches/
.lock
make.log

12
openwrtbuilder
View File

@@ -645,6 +645,10 @@ fromSource() {
pushd "$gitworktreedir" &>/dev/null || return 1 pushd "$gitworktreedir" &>/dev/null || return 1
# Update package feed
./scripts/feeds update -a &&
./scripts/feeds install -a
# Grab the release seed config # Grab the release seed config
if ! curl -so "$seed_file" "$SEED_URL"; then if ! curl -so "$seed_file" "$SEED_URL"; then
echo "Could not obtain $seed_file from $SEED_URL" echo "Could not obtain $seed_file from $SEED_URL"
@@ -695,12 +699,6 @@ fromSource() {
echo "$opt" >> "$seed_file" echo "$opt" >> "$seed_file"
done done
# Update package feed
# ./scripts/feeds install will run make defconfig for us
# to normalize and expand .config
./scripts/feeds update -a &&
./scripts/feeds install -a
# TODO for now symlink clang for qosify # TODO for now symlink clang for qosify
# declare llvm_dir="$GITSRCDIR/staging_dir/host/llvm-bpf/bin" # declare llvm_dir="$GITSRCDIR/staging_dir/host/llvm-bpf/bin"
# [[ -d "$llvm_dir" ]] || mkdir -p "$llvm_dir" # [[ -d "$llvm_dir" ]] || mkdir -p "$llvm_dir"
@@ -715,6 +713,8 @@ fromSource() {
# make dirclean # compiled output, toolchain, build tools # make dirclean # compiled output, toolchain, build tools
# make distclean # compiled output, toolchain, build tools, .config, feeds, .ccache # make distclean # compiled output, toolchain, build tools, .config, feeds, .ccache
debug "make ${make_opts[*]} defconfig"
make "${make_opts[@]}" defconfig
debug "make ${make_opts[*]} targetclean" debug "make ${make_opts[*]} targetclean"
make "${make_opts[@]}" targetclean make "${make_opts[@]}" targetclean
debug "make ${make_opts[*]} download" debug "make ${make_opts[*]} download"