Update default release

openwrtbuilder

@@ -5,7 +5,7 @@
 # See README and ./profiles for device configuration
 
 # Set default release
-: "${RELEASE:="24.10.4"}"
+: "${RELEASE:="24.10.5"}"
 
 # @internal
 print_help() {
@@ -571,18 +571,77 @@ from_source() {
     fi
   fi
 
-  # Add cherrypick commits if specified in profile (skip if already included)
+  # Add cherrypicks
   for entry in ${P_ARR[cherrypicks]}; do
-    remote="${entry%%:*}"
+    url_branch="${entry%:*}"
     commit="${entry##*:}"
-    if ! git -C "$BUILD_DIR" remote | grep -q "^$remote$"; then
-      execute git -C "$BUILD_DIR" remote add "$remote" "https://github.com/$remote/openwrt.git"
+
+    branch=""
+    url="$url_branch"
+    if [[ "$url_branch" == *"@"* ]]; then
+      url="${url_branch%@*}"
+      branch="${url_branch#*@}"
     fi
+
+    remote="${url%.git}"
+    remote="${remote##*/}"
+    remote=${remote//[^A-Za-z0-9._-]/_}
+    [[ -z $remote ]] && remote="cherry"
+
+    if ! git -C "$BUILD_DIR" remote | grep -q "^$remote$"; then
+      execute git -C "$BUILD_DIR" remote add "$remote" "$url"
+    else
+      execute git -C "$BUILD_DIR" remote set-url "$remote" "$url"
+    fi
+
+    if [[ -n $branch ]]; then
+      execute git -C "$BUILD_DIR" fetch "$remote" "$branch"
+    else
       execute git -C "$BUILD_DIR" fetch "$remote"
+    fi
+
+    # Verify commit exists before attempting cherry-pick
+    if ! git -C "$BUILD_DIR" cat-file -e "$commit^{commit}" 2>/dev/null; then
+      debug "Commit $commit not found after fetching from $remote; skipping"
+      continue
+    fi
+
     execute git -C "$BUILD_DIR" merge-base --is-ancestor "$commit" HEAD ||
       execute git -C "$BUILD_DIR" cherry-pick "$commit"
   done
 
+  # Merge entire branches
+  for entry in ${P_ARR[branches]}; do
+    url_branch="$entry"
+    branch=""
+    url="$url_branch"
+    if [[ "$url_branch" == *"@"* ]]; then
+      url="${url_branch%@*}"
+      branch="${url_branch#*@}"
+    fi
+
+    remote="${url%.git}"
+    remote="${remote##*/}"
+    remote=${remote//[^A-Za-z0-9._-]/_}
+    [[ -z $remote ]] && remote="merge"
+
+    if ! git -C "$BUILD_DIR" remote | grep -q "^$remote$"; then
+      execute git -C "$BUILD_DIR" remote add "$remote" "$url"
+    else
+      execute git -C "$BUILD_DIR" remote set-url "$remote" "$url"
+    fi
+
+    if [[ -n $branch ]]; then
+      execute git -C "$BUILD_DIR" fetch "$remote" "$branch"
+      echo "Merging $remote/$branch into $(git -C "$BUILD_DIR" rev-parse --abbrev-ref HEAD)"
+      execute git -C "$BUILD_DIR" merge --allow-unrelated-histories -m "Merge $remote/$branch" "$remote/$branch" || \
+        { debug "Merge conflict or failed for $remote/$branch"; return 1; }
+    else
+      debug "Cannot merge: no branch specified in entry '$entry'"
+      continue
+    fi
+  done
+  
   # Print commit info
   commit=$(git -C "$BUILD_DIR" rev-parse HEAD)
   description=$(git -C "$BUILD_DIR" describe --always --dirty)

profiles

@@ -2,13 +2,18 @@
 # Device profiles for openwrtbuilder
 # shellcheck disable=SC2034
 
-# Default (but optional) packages (precede with "-" to exclude)
-default_packages=(nano htop diffutils tar iperf3 zsh rsync curl tcpdump
-  openssh-sftp-server luci luci-ssl luci-proto-wireguard luci-app-statistics
+RELEASE="25.12.0-rc4" # overrides default release in openwrtbuilder
+
+# Default packages (precede with "-" to exclude)
+default_packages=(
+  nano vim htop diffutils tar iperf3 zsh rsync tcpdump
+  openssh-sftp-server 
+  luci luci-ssl luci-proto-wireguard luci-app-statistics luci-app-filemanager
   collectd-mod-sensors collectd-mod-thermal collectd-mod-conntrack collectd-mod-cpu
+  ca-bundle ethtool
 )
 
-# Default (but optional) kernel configs
+# Default kernel configs
 default_configs=(
 )
 
@@ -19,8 +24,8 @@ declare -Ag r4s=(
   [target]="rockchip/armv8"
   [filesystem]="ext4"
   [packages]="${default_packages[*]} \
-    luci-app-ddns luci-app-sqm \
     adblock luci-app-adblock \
+    irqbalance luci-app-irqbalance \
     collectd-mod-df usbutils kmod-usb-storage kmod-usb-storage-uas \
     kmod-fs-btrfs btrfs-progs block-mount smcroute avahi-daemon \
     ethtool ca-bundle tailscale"
@@ -29,17 +34,17 @@ declare -Ag r4s=(
     CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32"
   [files]="/mnt/backup"
   # For 24.10 branch (Linux 6.6)
-  # [cherrypicks]="wurzerj:59d6e31 wurzerj:bb251b8" # fix inconsistent reboot
+  # [cherrypicks]="https://github.com/wurzerj/openwrt.git:59d6e31 \
+  # https://github.com/wurzerj/openwrt.git:bb251b8" # fix inconsistent reboot
 )
 
 declare -Ag ax6000=(
   [mode]="imagebuilder"
   [device]="xiaomi_redmi-router-ax6000-stock"
   [target]="mediatek/filogic"
-  [release]="snapshot"
   [filesystem]="squashfs"
   [packages]="${default_packages[*]} \
-    -dnsmasq -odhcpd-ipv6only -nftables -firewall4 tailscale"
+    tailscale"
 )
 
 declare -Ag ax6000_uboot=(
@@ -60,7 +65,7 @@ declare -Ag n5100=(
     luci-app-ddns irqbalance collectd-mod-df \
     usbutils kmod-usb-storage kmod-usb-storage-uas kmod-fs-btrfs \
     btrfs-progs block-mount cryptsetup kmod-crypto-xts smcroute \
-    avahi-daemon curl ethtool ca-bundle smartmontools intel-microcode \
+    avahi-daemon ethtool ca-bundle smartmontools intel-microcode \
     lm-sensors samba4-server luci-app-samba4 tailscale shadow-useradd"
   [config]="${default_configs[*]} \
     CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
@@ -68,6 +73,48 @@ declare -Ag n5100=(
   # [files]="/mnt/backup"
 )
 
+declare -Ag w1700k=(
+  [mode]="source"
+  [device]="gemtek_w1700k"
+  [target]="airoha/an7581"
+  [filesystem]="squashfs"
+  [release]="snapshot"
+  [packages]="${default_packages[*]} \
+    luci-app-sqm \
+    smcroute avahi-daemon \
+    lm-sensors samba4-server luci-app-samba4 shadow-useradd \
+    ca-bundle tailscale"
+  # [cherrypicks]="\
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:8d449e968cfaa774ab7a219b3a5ab4251b2f9352 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:3033241393ef6eb562539c6a3ccb9d3cf1a25d05 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:79a21e0986a9efe6de3a07394a71ac15a2107b16 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:2f8a1cbf901df0d325dfe112fdfe8013a72c8305 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:71b09bc5852797cdbf7cb3b56a7d8fcd9d4ca9db \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:fe0135f0b7037a9cc1985d5937dd24cb99bfccb1 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:cdb937180fb971fe702078f0e0fef63f2fcce337 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:6dc847c802b9dc597fc2c64711ca85499f128d1d \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:b6e6cf911915dd987eecde908a2013419565cff4 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:708089948949e66f5234249fc631e0453b58942e \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:9841a707a577385498591bcfb56b836176325c2f \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:8446ec6431a3247683a27070d3c69f2789b52c70 \
+  #   https://github.com/OpenWRT-fanboy/OpenW1700k.git@lumos:05380e2ef5fb96c171da23453ba32aa349a4b126"
+  [branches]="https://github.com/OpenWRT-fanboy/OpenW1700k.git@minimal"
+)
+
+declare -Ag w1700k_ap=(
+  [mode]="source"
+  [device]="gemtek_w1700k"
+  [target]="airoha/an7581"
+  [filesystem]="squashfs"
+  [release]="snapshot"
+  [packages]="${default_packages[*]} \
+    -dnsmasq -odhcpd-ipv6only -nftables -firewall4 \
+    irqblance luci-app-irqbalance \
+    wpad-openssl libiwinfo-data tailscale bridger switch smp_util \
+    kmod-crypto-hw-eip93"
+  [branches]="https://github.com/OpenWRT-fanboy/OpenW1700k.git@minimal"
+)
+
 declare -Ag rpi4=(
   [device]="rpi-4"
   [target]="bcm27xx/bcm2711"