From a2d72c218a4322dc5367d6e22f325d463bd63004 Mon Sep 17 00:00:00 2001 From: bryan Date: Mon, 20 May 2024 18:33:06 -0400 Subject: [PATCH] Update profiles --- openwrtbuilder | 14 +++++++------- profiles | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openwrtbuilder b/openwrtbuilder index 15804ac..8010d39 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -550,7 +550,7 @@ fromSource() { declare src_url="https://github.com/openwrt/openwrt.git" declare seed_file="$GITWORKTREEDIR/.config" - declare pkg kopt opt commit seed_file wt_cmd wt_commit description + declare pkg config commit seed_file wt_cmd wt_commit description declare -a make_opts config_opts echo "Building from source is under development" @@ -633,9 +633,9 @@ fromSource() { fi done - # Add kopts from profile - for kopt in ${P_ARR[kopts]}; do - config_opts+=("$kopt") + # Add config options from profile + for config in ${P_ARR[config]}; do + config_opts+=("$config") done # Only compile selected fs @@ -660,9 +660,9 @@ fromSource() { config_opts+=("CONFIG_MAKE_TOOLCHAIN=n") # Write options to config seed file - for opt in "${config_opts[@]}"; do - debug "Writing $opt to $seed_file" - echo "$opt" >> "$seed_file" + for config in "${config_opts[@]}"; do + debug "Writing $config to $seed_file" + echo "$config" >> "$seed_file" done # Cleaning modes diff --git a/profiles b/profiles index a3b9b43..3bda705 100644 --- a/profiles +++ b/profiles @@ -35,6 +35,7 @@ r4s['packages']="\ luci-app-wireguard \ luci-proto-wireguard \ luci-app-ddns \ + luci-app-sqm \ irqbalance \ collectd-mod-df \ usbutils \ @@ -50,12 +51,11 @@ r4s['packages']="\ ca-bundle \ -libustream-wolfssl" # The following are source mode only -r4s['kopts']="\ +r4s['config']="\ CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \ CONFIG_BTRFS_PROGS_ZSTD=y \ CONFIG_TARGET_ROOTFS_PARTSIZE=512 \ - CONFIG_TARGET_KERNEL_PARTSIZE=32 \ - CONFIG_TESTING_KERNEL=y" + CONFIG_TARGET_KERNEL_PARTSIZE=32" r4s['files']="\ /mnt/backup" @@ -136,7 +136,7 @@ n5100['packages']="\ tailscale \ shadow-useradd" # The following are source mode only -n5100['kopts']="\ +n5100['config']="\ CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \ CONFIG_BTRFS_PROGS_ZSTD=y \ CONFIG_TARGET_ROOTFS_PARTSIZE=512 \