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

Make BUILD_DIR worktree_dir

Browse Source
This commit is contained in:
Bryan Roessler
2025-07-28 23:44:19 -04:00
parent a5b559c59c
commit c28d7683d8
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
openwrtbuilder
View File

@@ -498,34 +498,32 @@ ssh_upgrade() {
# This enables the use of kernel config options in profiles # This enables the use of kernel config options in profiles
# @arg $1 string .config seed URL # @arg $1 string .config seed URL
# @arg $2 string Profile name # @arg $2 string Profile name
# @arg $3 string Commit-ish or branch name # @arg $3 string Worktree ref (commit-ish or branch name)
from_source() { from_source() {
debug "${FUNCNAME[0]}" "$*" debug "${FUNCNAME[0]}" "$*"
local seed_url="$1" local seed_url="$1"
local profile="$2" local profile="$2"
local wt_commit="$3" local ref="$3"
local src_url="https://github.com/openwrt/openwrt.git" local src_url="https://github.com/openwrt/openwrt.git"
local pkg config commit seed_file wt_commit description local seed_file="$BUILD_DIR/.config"
local worktree_meta="$SRC_DIR/.git/worktrees/source-$ref"
local pkg config commit seed_file description
local -a make_opts config_opts local -a make_opts config_opts
echo "Building from source is under development" echo "Building from source is under development"
# Ensure branch exists locally (if it's a branch) # Ensure branch exists locally (if it's a branch)
if git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$wt_commit"; then if git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$ref"; then
if ! git -C "$SRC_DIR" worktree list | grep -q "$wt_commit"; then if ! git -C "$SRC_DIR" worktree list | grep -q "$ref"; then
execute git -C "$SRC_DIR" fetch origin "$wt_commit:$wt_commit" execute git -C "$SRC_DIR" fetch origin "$ref:$ref"
fi fi
fi fi
local worktree_dir="$BUILD_ROOT/src/$profile/$wt_commit" # Remove build directories and worktrees
local seed_file="$worktree_dir/.config"
local worktree_meta="$SRC_DIR/.git/worktrees/$wt_commit"
# existing RESET logic…
if ((RESET)); then if ((RESET)); then
if [[ -d "$worktree_dir" || -d "$worktree_meta" ]]; then if [[ -d "$BUILD_DIR" || -d "$worktree_meta" ]]; then
execute git -C "$SRC_DIR" worktree remove --force --force "$worktree_dir" execute git -C "$SRC_DIR" worktree remove --force --force "$BUILD_DIR"
[[ -d "$worktree_dir" ]] && execute rm -rf "$worktree_dir" [[ -d "$BUILD_DIR" ]] && execute rm -rf "$BUILD_DIR"
[[ -d "$worktree_meta" ]] && execute rm -rf "$worktree_meta" [[ -d "$worktree_meta" ]] && execute rm -rf "$worktree_meta"
fi fi
[[ -d "$BUILD_DIR" ]] && execute rm -rf "$BUILD_DIR" [[ -d "$BUILD_DIR" ]] && execute rm -rf "$BUILD_DIR"
@@ -541,38 +539,38 @@ from_source() {
fi fi
# Clean up orphaned worktree if needed # Clean up orphaned worktree if needed
if [[ ! -d "$worktree_dir" || ! -d "$worktree_meta" ]]; then if [[ ! -d "$BUILD_DIR" || ! -d "$worktree_meta" ]]; then
[[ -d "$worktree_dir" ]] && execute rm -rf "$worktree_dir" [[ -d "$BUILD_DIR" ]] && execute rm -rf "$BUILD_DIR"
[[ -d "$worktree_meta" ]] && execute rm -rf "$worktree_meta" [[ -d "$worktree_meta" ]] && execute rm -rf "$worktree_meta"
execute git -C "$SRC_DIR" worktree prune --verbose execute git -C "$SRC_DIR" worktree prune --verbose
fi fi
# Add or update worktree # Add or update worktree
if [[ -d "$worktree_dir" && -d "$worktree_meta" ]]; then if [[ -d "$BUILD_DIR" && -d "$worktree_meta" ]]; then
execute git -C "$worktree_dir" checkout "$wt_commit" execute git -C "$BUILD_DIR" checkout "$ref"
# pull if wt_commit is a branch # pull if ref is a branch
if git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$wt_commit"; then if git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$ref"; then
execute git -C "$worktree_dir" pull execute git -C "$BUILD_DIR" pull
fi fi
else else
# branch or tag? # branch or tag?
if git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$wt_commit"; then if git -C "$SRC_DIR" show-ref --verify --quiet "refs/heads/$ref"; then
execute git -C "$SRC_DIR" worktree add "$worktree_dir" "$wt_commit" execute git -C "$SRC_DIR" worktree add "$BUILD_DIR" "$ref"
else else
execute git -C "$SRC_DIR" worktree add --detach "$worktree_dir" "$wt_commit" execute git -C "$SRC_DIR" worktree add --detach "$BUILD_DIR" "$ref"
fi fi
fi fi
# Print commit info # Print commit info
commit=$(git -C "$worktree_dir" rev-parse HEAD) commit=$(git -C "$BUILD_DIR" rev-parse HEAD)
description=$(git -C "$worktree_dir" describe) description=$(git -C "$BUILD_DIR" describe)
echo "Current commit hash: $commit" echo "Current commit hash: $commit"
echo "Git worktree description: $description" echo "Git worktree description: $description"
((DEBUG)) && git --no-pager -C "$worktree_dir" log -1 ((DEBUG)) && git --no-pager -C "$BUILD_DIR" log -1
# Enter worktree # Enter worktree
execute pushd "$worktree_dir" || return 1 execute pushd "$BUILD_DIR" || return 1
# Begin OpenWRT build process # Begin OpenWRT build process
((DEBUG)) && make_opts+=("V=sc") ((DEBUG)) && make_opts+=("V=sc")