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

Support cherrypicks

Browse Source
This commit is contained in:
Bryan Roessler
2025-08-06 20:55:59 -04:00
parent a7a85ee67a
commit 5629472aa3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openwrtbuilder
View File

@@ -536,6 +536,12 @@ from_source() {
execute git -C "$SRC_DIR" worktree prune --verbose execute git -C "$SRC_DIR" worktree prune --verbose
execute git -C "$SRC_DIR" worktree add --detach "$BUILD_DIR" "$ref" execute git -C "$SRC_DIR" worktree add --detach "$BUILD_DIR" "$ref"
# Add cherrypick commits if specified in profile
for commit in ${P_ARR[cherrypicks]}; do
echo "Cherry-picking $commit"
execute git -C "$BUILD_DIR" cherry-pick "$commit"
done
# Print commit info # Print commit info
commit=$(git -C "$BUILD_DIR" rev-parse HEAD) commit=$(git -C "$BUILD_DIR" rev-parse HEAD)
description=$(git -C "$BUILD_DIR" describe) description=$(git -C "$BUILD_DIR" describe)

1
profiles
View File

@@ -22,6 +22,7 @@ declare -Ag r4s=(
CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32 \ CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32 \
CONFIG_BUILDBOT=n" CONFIG_BUILDBOT=n"
[files]="/mnt/backup" [files]="/mnt/backup"
[cherrypicks]="59d6e31 bb251b8"
) )
declare -Ag ax6000=( declare -Ag ax6000=(