Regenerate the feed index

README.md

@@ -36,7 +36,7 @@ See `./profiles` for example device profile definitions.
 ## Examples
 
 * `./openwrtbuilder -p r4s -r snapshot --debug`
-* `./openwrtbuilder -p ax6000_stock -r 22.03.3 --source --debug`
+* `./openwrtbuilder -p ax6000 -r 22.03.3 --source --debug`
 * `./openwrtbuilder -p rpi4 -r 22.03.3 --flash /dev/sdX`
 * `./openwrtbuilder -p linksys -r snapshot --ssh-upgrade root@192.168.1.1`
 

openwrtbuilder

@@ -13,7 +13,7 @@
 #
 
 # Set default release
-: "${RELEASE:="22.03.3"}"
+: "${RELEASE:="22.03.5"}"
 
 printHelp() {
     debug "${FUNCNAME[0]}"
@@ -565,8 +565,13 @@ fromSource() {
  
     if [[ $RELEASE == "snapshot" ]]; then
         execute "${wt_cmd[@]}" master
+    elif [[ $RELEASE == openwrt-*.* ]]; then
+        execute "${wt_cmd[@]}" "origin/$RELEASE"
     else
-        execute "${wt_cmd[@]}" "origin/openwrt-${RELEASE%.*}"
+        # Split version into components
+        IFS="." read -ra version <<< "$RELEASE"
+        # Only use major/minor release for branch
+        execute "${wt_cmd[@]}" "origin/openwrt-${version[0]}.${version[1]}"
     fi
 
     # Print commit information
@@ -579,8 +584,9 @@ fromSource() {
     pushd "$SOURCEDIR" || return 1
 
     # Update package feed
-    ./scripts/feeds update -a &&
-    ./scripts/feeds install -a
+    ./scripts/feeds update -i -f &&
+    ./scripts/feeds update -a -f &&
+    ./scripts/feeds install -a -f
 
     # Grab the release seed config
     if ! curl -so "$seed_file" "$SEED_URL"; then
@@ -632,9 +638,6 @@ fromSource() {
         echo "$opt" >> "$seed_file"
     done
 
-    # [[ -v P_ARR[nested_kopts] ]] &&
-    # echo "${P_ARR[nested_kopts]}" >> "$seed_file"
-
     # Cleaning modes
     # make clean # compiled output
     # make targetclean # compiled output, toolchain

profiles

@@ -125,7 +125,6 @@ r4s['kopts']="\
 	CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \
 	CONFIG_BTRFS_PROGS_ZSTD=y \
 	CONFIG_TARGET_ROOTFS_PARTSIZE=1024"
-r4s['nested_kopts']="CONFIG_TARGET_OPTIMIZATION=\"-O3 -pipe -mcpu=cortex-a72.cortex-a53+crypto+crc\""
 r4s['files']="\
 	/mnt/backup"