Re-add specific device config

openwrtbuilder

@@ -5,7 +5,7 @@
 # See README and ./profiles for device configuration
 
 # Set default release
-: "${RELEASE:="24.10.3"}"
+: "${RELEASE:="24.10.4"}"
 
 # @internal
 print_help() {
@@ -22,18 +22,16 @@ print_help() {
 	  --release,-r,--version,-v RELEASE ("snapshot", "22.03.5") 
 	  --buildroot,-b PATH
 	    Default: location of openwrtbuilder script
-	  --source
+	  --source[=CLEAN]
 	    Build image from source, not from Image Builder
-	    Allows make config options to be passed in profile
-	    Uses git worktree for multi-profile deduplication
+	    Optional CLEAN runs the given clean mode before building
+	      (clean|targetclean|dirclean|distclean)
 	  --ssh-upgrade HOST
 	    Examples: root@192.168.1.1, root@router.lan
 	  --ssh-backup SSH_PATH
 	    Enabled by default for --ssh-upgrade
 	  --flash,-f DEVICE
 	    Example: /dev/sdX
-	  --reset
-	    Cleanup all source and output files
 	  --depends
 	    Force dependency installation
 	  --yes,-y
@@ -127,8 +125,8 @@ parse_input() {
   debug "${FUNCNAME[0]}" "$*"
   declare -ga PROFILES
   declare -gi RESET=0 FROM_SOURCE=0 YES=0 DEBUG=0 FORCE_DEPENDS=0
-  declare -g USER_RELEASE SSH_UPGRADE_PATH SSH_BACKUP_PATH FLASH_DEV
-  local long_opts='release:,version:,profile:,buildroot:,source,'
+  declare -g USER_RELEASE SSH_UPGRADE_PATH SSH_BACKUP_PATH FLASH_DEV SOURCE_CLEAN 
+  local long_opts='release:,version:,profile:,buildroot:,source::,'
   long_opts+='ssh-upgrade:,ssh-backup:,flash:,reset,depends,yes,debug,help'
 
   if _input=$(getopt -o +r:v:p:b:sf:ydh -l $long_opts -- "$@"); then
@@ -138,7 +136,12 @@ parse_input() {
         --release|-r|--version|-v) shift; USER_RELEASE="$1" ;;
         --profile|-p) shift; PROFILES+=("$1") ;;
         --buildroot|-b) shift; BUILD_ROOT="$1" ;;
-        --source|-s) FROM_SOURCE=1 ;;
+        --source|-s) FROM_SOURCE=1
+          case "$1" in
+            -*|"") ;; # if empty
+            *) SOURCE_CLEAN="$1"; shift ;;
+          esac
+          ;;
         --ssh-upgrade) shift; SSH_UPGRADE_PATH="$1" ;;
         --ssh-backup) shift; SSH_BACKUP_PATH="$1" ;;
         --flash|-f) shift; FLASH_DEV="$1" ;;
@@ -514,11 +517,29 @@ from_source() {
   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
+  local -a config_opts=(
+    "CONFIG_TARGET_${TARGET%%/*}=y"
+    "CONFIG_TARGET_${TARGET//\//_}=y"
+    "CONFIG_TARGET_PROFILE=DEVICE_$DEVICE"
+    "CONFIG_TARGET_${TARGET//\//_}_DEVICE_$DEVICE=y"
+    "CONFIG_TARGET_ROOTFS_${FILESYSTEM^^}=y"
+    "CONFIG_TARGET_MULTI_PROFILE=n"
+    "CONFIG_BUILDBOT=n"
+    "CONFIG_ALL_KMODS=n" 
+    "CONFIG_ALL_NONSHARED=n"
+    "CONFIG_DEVEL=n"
+    "CONFIG_COLLECT_KERNEL_DEBUG=n"
+    "CONFIG_SDK=n"
+    "CONFIG_SDK_LLVM_BPF=n"
+    "CONFIG_IB=n"
+    "CONFIG_MAKE_TOOLCHAIN=n"
+    "CONFIG_TARGET_PER_DEVICE_ROOTFS=n"
+  )
 
   echo "Building from source is under development"
 
-  # Remove all build directories and worktrees
+  # Remove all build directories and worktrees if --reset
   if ((RESET)); then
     if [[ -d "$BUILD_DIR" || -d "$worktree_meta" ]]; then
       execute git -C "$SRC_DIR" worktree remove --force --force "$BUILD_DIR"
@@ -536,29 +557,35 @@ from_source() {
     execute git clone "$src_url" "$SRC_DIR"
   fi
 
-  # Recreate worktree from the remote ref
-  execute git -C "$SRC_DIR" worktree remove --force "$BUILD_DIR" || true
-  execute rm -rf "$BUILD_DIR"
-  execute git -C "$SRC_DIR" worktree prune --verbose
-  execute git -C "$SRC_DIR" worktree add --detach "$BUILD_DIR" "origin/$ref"
+  # Reuse worktree if present; otherwise create it (support branches and tags)
+  if git -C "$BUILD_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    execute git -C "$BUILD_DIR" fetch origin --tags --prune
+    execute git -C "$BUILD_DIR" reset --hard "origin/$ref" || \
+      execute git -C "$BUILD_DIR" reset --hard "$ref" || \
+      execute git -C "$BUILD_DIR" checkout --detach "$ref"
+  else
+    execute git -C "$SRC_DIR" worktree prune --verbose
+    # Prefer local tag/branch if present, otherwise use remote-tracking branch
+    if ! execute git -C "$SRC_DIR" worktree add --detach "$BUILD_DIR" "$ref"; then
+      execute git -C "$SRC_DIR" worktree add --detach "$BUILD_DIR" "origin/$ref"
+    fi
+  fi
 
-  # Add cherrypick commits if specified in profile
+  # Add cherrypick commits if specified in profile (skip if already included)
   for entry in ${P_ARR[cherrypicks]}; do
     remote="${entry%%:*}"
     commit="${entry##*:}"
-    # Add remote if not present
     if ! git -C "$BUILD_DIR" remote | grep -q "^$remote$"; then
       execute git -C "$BUILD_DIR" remote add "$remote" "https://github.com/$remote/openwrt.git"
     fi
-    # Fetch remote
     execute git -C "$BUILD_DIR" fetch "$remote"
-    # Cherry-pick commit
-    execute git -C "$BUILD_DIR" cherry-pick "$commit"
+    execute git -C "$BUILD_DIR" merge-base --is-ancestor "$commit" HEAD ||
+      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)
+  description=$(git -C "$BUILD_DIR" describe --always --dirty)
   echo "Current commit hash: $commit"
   echo "Git worktree description: $description"
 
@@ -570,29 +597,24 @@ from_source() {
   # Begin OpenWRT build process
   ((DEBUG)) && make_opts+=("V=sc")
   
-  # Cleanup build environment
-  execute make "${make_opts[@]}" "-j1" distclean
+  # Cleanup build environment: heavy clean only when --reset was used earlier
   # make clean # compiled output
   # make targetclean # compiled output, toolchain
   # make dirclean # compiled output, toolchain, build tools
   # make distclean # compiled output, toolchain, build tools, .config, feeds, .ccache
-
+  if [[ -n $SOURCE_CLEAN ]]; then
+    execute make "${make_opts[@]}" "-j1" "$SOURCE_CLEAN"
+  else
+    debug "Skipping cleanup step"
+  fi
+  
   # Use a custom (faster) mirror
-  # execute sed -i -E 's;git.openwrt.org/(feed|project);github.com/openwrt;' feeds.conf.default
+  execute sed -i -E 's;git.openwrt.org/(feed|project);github.com/openwrt;' feeds.conf.default
 
   # Update package feed
   ./scripts/feeds update -a -f &&
   ./scripts/feeds install -a -f
 
-  # Grab the release seed config
-  if ! execute "$DL_TOOL" "-o" "$seed_file" "$seed_url"; then
-    echo "Could not obtain $seed_file from $seed_url"
-    return 1
-  fi
-
-  # Set compilation output dir
-  config_opts+=("CONFIG_BINARY_FOLDER=\"$BIN_DIR\"")
-
   # Add custom packages
   for pkg in $PACKAGES; do
     if [[ $pkg == -* ]]; then
@@ -602,33 +624,13 @@ from_source() {
     fi
   done
 
-  # Add config options from profile
+  # Add profile config options
   for config in ${P_ARR[config]}; do
     config_opts+=("$config")
   done
 
-  # Only compile selected fs
-  execute sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file"
-  config_opts+=("CONFIG_TARGET_PER_DEVICE_ROOTFS=n")
-  if [[ $FILESYSTEM == "squashfs" ]]; then
-    config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=n")
-    config_opts+=("CONFIG_TARGET_ROOTFS_SQUASHFS=y")
-  elif [[ $FILESYSTEM == "ext4" ]]; then
-    config_opts+=("CONFIG_TARGET_ROOTFS_SQUASHFS=n")
-    config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=y")
-  fi
-
-  # Only compile selected target image
-  execute sed -i '/CONFIG_TARGET_DEVICE_/d' "$seed_file"
-  config_opts+=("CONFIG_TARGET_MULTI_PROFILE=n")
-  config_opts+=("CONFIG_TARGET_PROFILE=DEVICE_$DEVICE")
-  config_opts+=("CONFIG_TARGET_${TARGET//\//_}_DEVICE_$DEVICE=y")
-  config_opts+=("CONFIG_SDK=n")
-  config_opts+=("CONFIG_SDK_LLVM_BPF=n")
-  config_opts+=("CONFIG_IB=n")
-  config_opts+=("CONFIG_MAKE_TOOLCHAIN=n")
-
-  # Write options to config seed file
+  # Reset and write options to config seed file
+  [[ -f $seed_file ]] && execute rm -f "$seed_file"
   for config in "${config_opts[@]}"; do
     debug "Writing $config to $seed_file"
     echo "$config" >> "$seed_file"
@@ -637,18 +639,22 @@ from_source() {
   # Expand seed into full config
   execute make "${make_opts[@]}" "-j1" defconfig
 
-  # make_opts+=("-j$(($(nproc)-2))")
-  ((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-2))")
+  # Run serial make download for better reliability
+  execute make "${make_opts[@]}" "-j1" download
+
+  # (Optional) Disable multicore make world
+  # ((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-2))")
+  make_opts+=("-j$(($(nproc)-2))")
 
   # Make image
-  if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" download world; then
+  if ! execute ionice -c2 -n7 nice -n19 make "${make_opts[@]}" BIN_DIR="$BIN_DIR" world; then
     echo "Error: make failed"
     return 1
   fi
 
   execute popd || return 1
 
-  # Symlink output images to root of BIN_DIR (match Image Builder)
+  # Symlink output images to root of BIN_DIR (match Image Builder behavior)
   shopt -s nullglob
   for image in "$BIN_DIR/targets/${TARGET}/"*.{img,img.gz,ubi}; do
     execute ln -fs "$image" "$BIN_DIR/${image##*/}"

profiles

@@ -10,11 +10,6 @@ default_packages=(nano htop diffutils tar iperf3 zsh rsync curl tcpdump
 
 # Default (but optional) kernel configs
 default_configs=(
-  "CONFIG_BUILDBOT=n"
-  "CONFIG_ALL_KMODS=n" 
-  "CONFIG_ALL_NONSHARED=n"
-  "CONFIG_DEVEL=n"
-  "CONFIG_COLLECT_KERNEL_DEBUG=n"
 )
 
 # Current devices
@@ -24,7 +19,7 @@ declare -Ag r4s=(
   [target]="rockchip/armv8"
   [filesystem]="ext4"
   [packages]="${default_packages[*]} \
-    luci-app-ddns luci-app-sqm irqbalance \
+    luci-app-ddns luci-app-sqm \
     adblock luci-app-adblock \
     collectd-mod-df usbutils kmod-usb-storage kmod-usb-storage-uas \
     kmod-fs-btrfs btrfs-progs block-mount smcroute avahi-daemon \