فهرست منبع

Refactor IPv6 NAT configuration script

Refactored the script to enable IPv6 NAT configurations directly without using an array. Updated the patch application command to remove the '-F 3' option.
jimsterino98 1 ماه پیش
والد
کامیت
90df0018cb
1فایلهای تغییر یافته به همراه23 افزوده شده و 37 حذف شده
  1. 23 37
      .github/actions/IPv6_NAT/action.yml

+ 23 - 37
.github/actions/IPv6_NAT/action.yml

@@ -7,43 +7,29 @@ runs:
   - name: add ip-set and ipv6_NAT support in defconfig and apply patch
     shell: bash
     run: |
-     config=(
-     "CONFIG_IP_SET=y"
-     "CONFIG_IP_SET_MAX=65534"
-     "CONFIG_IP_SET_BITMAP_IP=y"
-     "CONFIG_IP_SET_BITMAP_IPMAC=y"
-     "CONFIG_IP_SET_BITMAP_PORT=y"
-     "CONFIG_IP_SET_HASH_IP=y"
-     "CONFIG_IP_SET_HASH_IPMARK=y"
-     "CONFIG_IP_SET_HASH_IPPORT=y"
-     "CONFIG_IP_SET_HASH_IPPORTIP=y"
-     "CONFIG_IP_SET_HASH_IPPORTNET=y"
-     "CONFIG_IP_SET_HASH_IPMAC=y"
-     "CONFIG_IP_SET_HASH_MAC=y"
-     "CONFIG_IP_SET_HASH_NETPORTNET=y"
-     "CONFIG_IP_SET_HASH_NET=y"
-     "CONFIG_IP_SET_HASH_NETNET=y"
-     "CONFIG_IP_SET_HASH_NETPORT=y"
-     "CONFIG_IP_SET_HASH_NETIFACE=y"
-     "CONFIG_IP_SET_LIST_SET=y"
-     "CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y"
-     "CONFIG_NETFILTER_XT_SET=y"
-     "CONFIG_IP6_NF_NAT=y"
-     "CONFIG_IP6_NF_TARGET_MASQUERADE=y"
-     )
 
-     for config in "${configs[@]}"; do
-         key="${config%%=*}"
-
-         if grep -qE "^(${key}=|# ${key} is not set$)" "$GKI_DEFCONFIG"; then
-             sed -i -E \
-                 -e "s/^${key}=.*/${config}/" \
-                 -e "s/^# ${key} is not set\$/${config}/" \
-                 "$GKI_DEFCONFIG"
-         else
-             echo "$config" >> "$GKI_DEFCONFIG"
-         fi
-     done
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_MAX=65534"
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_BITMAP_IP
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_BITMAP_IPMAC
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_BITMAP_PORT
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IP
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IPMARK
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IPPORT
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IPPORTIP
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IPPORTNET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_IPMAC
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_MAC
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_NETPORTNET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_NET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_NETNET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_NETPORT
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_HASH_NETIFACE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP_SET_LIST_SET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_MATCH_ADDRTYPE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NETFILTER_XT_SET
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP6_NF_NAT
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_IP6_NF_TARGET_MASQUERADE
 
      cd "$COMMON"
-     patch -p1 -F 3 < "$KERNEL_PATCHES/common/IPv6_NAT_FIX.patch"
+     patch -p1 < "$KERNEL_PATCHES/common/IPv6_NAT_FIX.patch"