Selaa lähdekoodia

Update profiles

bryan 9 kuukautta sitten
vanhempi
commit
a2d72c218a
2 muutettua tiedostoa jossa 11 lisäystä ja 11 poistoa
  1. 7 7
      openwrtbuilder
  2. 4 4
      profiles

+ 7 - 7
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

+ 4 - 4
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 \