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

Force worktree

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-31 13:25:30 -05:00
parent e06155527b
commit cc42ef328c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openwrtbuilder
View File

@@ -632,10 +632,10 @@ fromSource() {
if [[ $RELEASE == "snapshot" ]]; then if [[ $RELEASE == "snapshot" ]]; then
gitworktreedir="$SRCDIR/$profile/$RELEASE" gitworktreedir="$SRCDIR/$profile/$RELEASE"
git -C "$GITSRCDIR" worktree add -d "$gitworktreedir" master git -C "$GITSRCDIR" worktree add -fd "$gitworktreedir" master
else else
gitworktreedir="$SRCDIR/$profile/$RELEASE" gitworktreedir="$SRCDIR/$profile/$RELEASE"
git -C "$GITSRCDIR" worktree add -d "$gitworktreedir" "v$RELEASE" git -C "$GITSRCDIR" worktree add -fd "$gitworktreedir" "v$RELEASE"
fi fi
seed_file="$gitworktreedir/.config" seed_file="$gitworktreedir/.config"
@@ -685,7 +685,7 @@ fromSource() {
config_opts+=("CONFIG_TARGET_PROFILE=DEVICE_${P_ARR[profile]}") config_opts+=("CONFIG_TARGET_PROFILE=DEVICE_${P_ARR[profile]}")
config_opts+=("CONFIG_TARGET_${P_ARR[target]//\//_}_DEVICE_${P_ARR[profile]}=y") config_opts+=("CONFIG_TARGET_${P_ARR[target]//\//_}_DEVICE_${P_ARR[profile]}=y")
config_opts+=("CONFIG_SDK=n") config_opts+=("CONFIG_SDK=n")
config_opts+=("CONFIG_SDK_LLVM_BPF=n") # config_opts+=("CONFIG_SDK_LLVM_BPF=n")
config_opts+=("CONFIG_IB=n") config_opts+=("CONFIG_IB=n")
config_opts+=("CONFIG_MAKE_TOOLCHAIN=n") config_opts+=("CONFIG_MAKE_TOOLCHAIN=n")
@@ -702,9 +702,9 @@ fromSource() {
./scripts/feeds install -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"
ln -fs "$(which clang)" "$llvm_dir/clang" # ln -fs "$(which clang)" "$llvm_dir/clang"
# Make image # Make image
(( DEBUG )) && make_opts+=("V=s") (( DEBUG )) && make_opts+=("V=s")
@@ -715,7 +715,7 @@ 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[*]} dirclean" debug "make ${make_opts[*]} targetclean"
make "${make_opts[@]}" targetclean make "${make_opts[@]}" targetclean
debug "make ${make_opts[*]} download" debug "make ${make_opts[*]} download"
make "${make_opts[@]}" download make "${make_opts[@]}" download