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

Fix conflicting worktrees

Browse Source
This commit is contained in:
Bryan Roessler
2023-02-15 14:22:13 -05:00
parent 1f484d8bfc
commit bf737644fb
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
openwrtbuilder
View File

@@ -542,7 +542,7 @@ fromSource() {
declare src_dir="$BUILDROOT/src/openwrt" declare src_dir="$BUILDROOT/src/openwrt"
declare src_url="https://github.com/openwrt/openwrt.git" declare src_url="https://github.com/openwrt/openwrt.git"
declare pkg kopt opt commit gitworktreedir seed_file declare pkg kopt opt commit gitworktreedir seed_file wt_cmd
declare -a make_opts config_opts declare -a make_opts config_opts
echo "Building from source is under development" echo "Building from source is under development"
@@ -560,29 +560,24 @@ fromSource() {
commit=$(git -C "$src_dir" rev-parse HEAD) commit=$(git -C "$src_dir" rev-parse HEAD)
debug "Current commit hash: $commit" debug "Current commit hash: $commit"
gitworktreedir="$BUILDROOT/src/$profile/$RELEASE-src"
wt_cmd=(git -C "$src_dir"
worktree add
--force
--detach
"$gitworktreedir")
if [[ $RELEASE == "snapshot" ]]; then if [[ $RELEASE == "snapshot" ]]; then
gitworktreedir="$BUILDROOT/src/$profile/$RELEASE" execute "${wt_cmd[@]}" master
git -C "$src_dir" \
worktree add \
--force \
--detach \
"$gitworktreedir" \
"master"
else else
gitworktreedir="$BUILDROOT/src/$profile/$RELEASE" execute "${wt_cmd[@]}" "origin/openwrt-${RELEASE%.*}"
git -C "$src_dir" \
worktree add \
--force \
--detach \
"$gitworktreedir" \
"origin/openwrt-${RELEASE%.*}"
fi fi
seed_file="$gitworktreedir/.config" seed_file="$gitworktreedir/.config"
debug "seed_file: $seed_file" debug "seed_file: $seed_file"
pushd "$gitworktreedir" &>/dev/null || return 1 execute pushd "$gitworktreedir" || return 1
# Update package feed # Update package feed
./scripts/feeds update -a && ./scripts/feeds update -a &&
@@ -611,16 +606,16 @@ fromSource() {
config_opts+=("$kopt") config_opts+=("$kopt")
done done
# Only compile selected fs Only compile selected fs
# sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file" sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file"
# config_opts+=("CONFIG_TARGET_PER_DEVICE_ROOTFS=n") config_opts+=("CONFIG_TARGET_PER_DEVICE_ROOTFS=n")
# if [[ $FILESYSTEM == "squashfs" ]]; then if [[ $FILESYSTEM == "squashfs" ]]; then
# config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=n") config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=n")
# config_opts+=("CONFIG_TARGET_ROOTFS_SQUASHFS=y") config_opts+=("CONFIG_TARGET_ROOTFS_SQUASHFS=y")
# elif [[ $FILESYSTEM == "ext4" ]]; then elif [[ $FILESYSTEM == "ext4" ]]; then
# config_opts+=("CONFIG_TARGET_ROOTFS_SQUASHFS=n") config_opts+=("CONFIG_TARGET_ROOTFS_SQUASHFS=n")
# config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=y") config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=y")
# fi fi
# Only compile selected target image # Only compile selected target image
sed -i '/CONFIG_TARGET_DEVICE_/d' "$seed_file" sed -i '/CONFIG_TARGET_DEVICE_/d' "$seed_file"
@@ -658,7 +653,7 @@ fromSource() {
debug "make ${make_opts[*]} -j$(nproc) world" debug "make ${make_opts[*]} -j$(nproc) world"
make "${make_opts[@]}" -j"$(nproc)" world make "${make_opts[@]}" -j"$(nproc)" world
popd &>/dev/null || return 1 execute popd || return 1
# Provide symlinks to images in root of BINDIR (to match Image Builder) # Provide symlinks to images in root of BINDIR (to match Image Builder)
shopt -s nullglob shopt -s nullglob

1
profiles
View File

@@ -131,6 +131,7 @@ declare -Ag r4s_stock
r4s_stock['profile']="friendlyarm_nanopi-r4s" r4s_stock['profile']="friendlyarm_nanopi-r4s"
r4s_stock['target']="rockchip/armv8" r4s_stock['target']="rockchip/armv8"
r4s_stock['filesystem']="ext4" r4s_stock['filesystem']="ext4"
r4s_stock['release']="snapshot"
# r4s_stock['packages']="\ # r4s_stock['packages']="\
# $default_packages \ # $default_packages \
# luci-app-ddns \ # luci-app-ddns \