Browse Source

Update default release

bryan 2 weeks ago
parent
commit
e80dddf9a7
3 changed files with 9 additions and 6 deletions
  1. 2 1
      README.md
  2. 4 2
      openwrtbuilder
  3. 3 3
      profiles

+ 2 - 1
README.md

@@ -1,6 +1,6 @@
 # openwrtbuilder
 # openwrtbuilder
 
 
-Sanely build and deploy OpenWRT images using the Image Builder or from source code.
+Build and deploy OpenWRT images using convenient profiles.
 
 
 ## Usage
 ## Usage
 
 
@@ -15,6 +15,7 @@ Sanely build and deploy OpenWRT images using the Image Builder or from source co
 --source
 --source
   Build image from source, not from Image Builder
   Build image from source, not from Image Builder
   Allows make config options to be passed in profile
   Allows make config options to be passed in profile
+  Uses git worktree for multi-profile deduplication
 --ssh-upgrade HOST
 --ssh-upgrade HOST
   Example: root@192.168.1.1
   Example: root@192.168.1.1
 --ssh-backup SSH_PATH
 --ssh-backup SSH_PATH

+ 4 - 2
openwrtbuilder

@@ -5,14 +5,14 @@
 # See README.md and ./profiles for device configuration
 # See README.md and ./profiles for device configuration
 
 
 # Set default release
 # Set default release
-: "${RELEASE:="24.10.0"}"
+: "${RELEASE:="24.10.1"}"
 
 
 # @internal
 # @internal
 print_help() {
 print_help() {
   debug "${FUNCNAME[0]}"
   debug "${FUNCNAME[0]}"
 
 
   cat <<-'EOF'
   cat <<-'EOF'
-	Build and deploy OpenWRT images
+	Build and deploy OpenWRT images using convenient profiles.
 
 
 	USAGE:
 	USAGE:
 	  openwrtbuilder [OPTION [VALUE]]... -p PROFILE [-p PROFILE]...
 	  openwrtbuilder [OPTION [VALUE]]... -p PROFILE [-p PROFILE]...
@@ -24,6 +24,8 @@ print_help() {
 	    Default: location of openwrtbuilder script
 	    Default: location of openwrtbuilder script
 	  --source
 	  --source
 	    Build image from source, not from Image Builder
 	    Build image from source, not from Image Builder
+	    Allows make config options to be passed in profile
+	    Uses git worktree for multi-profile deduplication
 	  --ssh-upgrade HOST
 	  --ssh-upgrade HOST
 	    Examples: root@192.168.1.1, root@router.lan
 	    Examples: root@192.168.1.1, root@router.lan
 	  --ssh-backup SSH_PATH
 	  --ssh-backup SSH_PATH

+ 3 - 3
profiles

@@ -16,7 +16,7 @@ declare -Ag r4s=(
   [packages]="$default_packages luci-app-ddns luci-app-sqm irqbalance \
   [packages]="$default_packages luci-app-ddns luci-app-sqm irqbalance \
     collectd-mod-df usbutils kmod-usb-storage kmod-usb-storage-uas \
     collectd-mod-df usbutils kmod-usb-storage kmod-usb-storage-uas \
     kmod-fs-btrfs btrfs-progs block-mount smcroute avahi-daemon \
     kmod-fs-btrfs btrfs-progs block-mount smcroute avahi-daemon \
-    curl ethtool ca-bundle"
+    curl ethtool ca-bundle tailscale"
   [config]="CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
   [config]="CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
     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"
@@ -28,7 +28,7 @@ declare -Ag ax6000=(
   [target]="mediatek/filogic"
   [target]="mediatek/filogic"
   [release]="snapshot"
   [release]="snapshot"
   [filesystem]="squashfs"
   [filesystem]="squashfs"
-  [packages]="$default_packages -dnsmasq -odhcpd-ipv6only -nftables -firewall4"
+  [packages]="$default_packages -dnsmasq -odhcpd-ipv6only -nftables -firewall4 tailscale"
 )
 )
 
 
 declare -Ag ax6000_uboot=(
 declare -Ag ax6000_uboot=(
@@ -50,7 +50,7 @@ declare -Ag n5100=(
     lm-sensors samba4-server luci-app-samba4 tailscale shadow-useradd"
     lm-sensors samba4-server luci-app-samba4 tailscale shadow-useradd"
   [config]="CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
   [config]="CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
     CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32"
     CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32"
-  [files]="/mnt/backup"
+  # [files]="/mnt/backup"
 )
 )
 
 
 declare -Ag rpi4=(
 declare -Ag rpi4=(