diff --git a/openwrtbuilder b/openwrtbuilder index 6740bcd..5903427 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -536,6 +536,12 @@ from_source() { execute git -C "$SRC_DIR" worktree prune --verbose 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 commit=$(git -C "$BUILD_DIR" rev-parse HEAD) description=$(git -C "$BUILD_DIR" describe) diff --git a/profiles b/profiles index 344c808..772e776 100644 --- a/profiles +++ b/profiles @@ -22,6 +22,7 @@ declare -Ag r4s=( CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32 \ CONFIG_BUILDBOT=n" [files]="/mnt/backup" + [cherrypicks]="59d6e31 bb251b8" ) declare -Ag ax6000=(