diff --git a/r1p-lts.config.seed b/r1p-lts.config.seed index c4aabaa1d2..bf12f650d1 100644 --- a/r1p-lts.config.seed +++ b/r1p-lts.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y diff --git a/r1p.config.seed b/r1p.config.seed index c10418f1ce..09ea24011b 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 5a3b8d73e0..9a2341de56 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -39,4 +39,4 @@ CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y diff --git a/r2c.config.seed b/r2c.config.seed index 8a9e75db14..091e4535bd 100644 --- a/r2c.config.seed +++ b/r2c.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y diff --git a/r2s.config.seed b/r2s.config.seed index 569cf89535..a8db889dad 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y diff --git a/r4s.config.seed b/r4s.config.seed index d1a90f6d54..c2194a78f7 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y diff --git a/r5s.config.seed b/r5s.config.seed index e6c8c7f6d7..7aa6b9d492 100644 --- a/r5s.config.seed +++ b/r5s.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y diff --git a/scripts/patches.sh b/scripts/patches.sh index b587e3e907..743a05134d 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -104,7 +104,7 @@ if [[ $DEVICE == 'r1s' ]]; then git log --grep r1s -i | grep '^commit ' | head -n -2 | cut -d' ' -f2 | tac | xargs git show | sed '0,/UENV/s//ATF/' > r1s.diff git show 632c4c91e7640a354dc421fa324fd705b734252d 7fb1b00f5f6214bf7a29d3781d260a7e7c8547c9 >> r1s.diff cd ~/lede && chmod +x target/linux/sunxi/base-files/etc/board.d/* && git apply ~/immortalwrt/r1s.diff - sed -i 's/kmod-rtl8189es//' target/linux/sunxi/image/cortexa53.mk + sed -i 's/kmod-rtl8189es//;s/wpad-basic-openssl/wpad-basic-wolfssl/' target/linux/sunxi/image/cortexa53.mk sed -i 's/arm-trusted-firmware-sunxi-a64/trusted-firmware-a-sunxi-a64/' package/boot/uboot-sunxi/Makefile merge_package https://github.com/immortalwrt/immortalwrt/branches/openwrt-18.06-k5.4/package/emortal/autocore fi @@ -117,7 +117,7 @@ fi # fix for r1s-h3 if [[ $DEVICE == 'r1s-h3' ]]; then - sed -i 's/kmod-leds-gpio//;s/wpad-basic-wolfssl/wpad-basic-openssl/;' target/linux/sunxi/image/cortexa7.mk + sed -i 's/kmod-leds-gpio//' target/linux/sunxi/image/cortexa7.mk fi case $DEVICE in diff --git a/x86.config.seed b/x86.config.seed index 174f889627..46dc177bc8 100644 --- a/x86.config.seed +++ b/x86.config.seed @@ -36,7 +36,7 @@ CONFIG_PACKAGE_kmod-sound-core=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_wpad-basic-openssl=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y CONFIG_DRIVER_11W_SUPPORT=y