Преглед изворни кода

Fix funky whitespace for kopts

bryan пре 2 година
родитељ
комит
6995284786
2 измењених фајлова са 5 додато и 3 уклоњено
  1. 4 2
      openwrtbuilder
  2. 1 1
      profiles

+ 4 - 2
openwrtbuilder

@@ -706,10 +706,12 @@ fromSource() {
     # Write options to config seed file
     # Write options to config seed file
     for opt in "${config_opts[@]}"; do
     for opt in "${config_opts[@]}"; do
         debug "Writing $opt to $seed_file"
         debug "Writing $opt to $seed_file"
-        # Respect nested quotes (ex. in kopts)
-        echo "$opt" | xargs >> "$seed_file"
+        echo "$opt" >> "$seed_file"
     done
     done
 
 
+    [[ -v P_ARR[nested_kopts] ]] &&
+    echo "${P_ARR[nested_kopts]}" >> "$seed_file"
+
     # TODO for now symlink clang for qosify
     # TODO for now symlink clang for qosify
     # declare llvm_dir="$GITSRCDIR/staging_dir/host/llvm-bpf/bin"
     # declare llvm_dir="$GITSRCDIR/staging_dir/host/llvm-bpf/bin"
     # [[ -d "$llvm_dir" ]] || mkdir -p "$llvm_dir"
     # [[ -d "$llvm_dir" ]] || mkdir -p "$llvm_dir"

+ 1 - 1
profiles

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