From d4d43a90493b594ef254ef9acc25a091ca16a300 Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 8 Sep 2021 23:23:00 +0800 Subject: [PATCH] package: remove duplicated driver of r8152 --- r1p.config.seed | 1 - r2c.config.seed | 1 - r2s.config.seed | 1 - r4s.config.seed | 1 - scripts/patches.sh | 4 ++-- x86.config.seed | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/r1p.config.seed b/r1p.config.seed index 59b2744..3e1b713 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -37,7 +37,6 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y diff --git a/r2c.config.seed b/r2c.config.seed index 374a149..056d8f0 100644 --- a/r2c.config.seed +++ b/r2c.config.seed @@ -37,7 +37,6 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y diff --git a/r2s.config.seed b/r2s.config.seed index 5bcf56b..7304bb2 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -37,7 +37,6 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y diff --git a/r4s.config.seed b/r4s.config.seed index 1a50717..92b6b17 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -37,7 +37,6 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y diff --git a/scripts/patches.sh b/scripts/patches.sh index efd7d0d..099ee8b 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -15,8 +15,8 @@ sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find package/ -follow -type f -path '*/ksmbd-t sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find package/ -follow -type f -path '*/automount/Makefile'` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount` -mkdir `find package/ -follow -type d -path '*/pdnsd-alt'`/patches -mv patches/99-disallow-aaaa.patch `find package/ -follow -type d -path '*/pdnsd-alt'`/patches +mkdir -p `find package/ -follow -type d -path '*/pdnsd-alt'`/patches +mv $GITHUB_WORKSPACE/patches/99-disallow-aaaa.patch `find package/ -follow -type d -path '*/pdnsd-alt'`/patches if [ $DEVICE != 'r1s' ]; then diff --git a/x86.config.seed b/x86.config.seed index a79500c..9a6cdff 100644 --- a/x86.config.seed +++ b/x86.config.seed @@ -35,7 +35,6 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y