From 5cafd1b92edace7500e5852dacc57a13e695402c Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 6 Mar 2021 20:42:41 +0100 Subject: [PATCH] Reverted to patch removal due to problems in DSA mode --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 757d0320..8a8f5259 100755 --- a/build.sh +++ b/build.sh @@ -226,6 +226,11 @@ if [ "$OMR_TARGET" = "bpi-r1" ]; then exit 1 fi + # Remove the 310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th patch + echo -n "Removing unwanted patches from kernel $OMR_KERNEL..." + rm -f "$OMR_TARGET/source/target/linux/sunxi/patches-$OMR_KERNEL/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch" >/dev/null 2>&1 + echo "done" + if [ "$OMR_FORCE_DSA" = "1" ]; then # Remove support for swconfig echo -n "Removing swconfig support from openwrt config..." @@ -253,11 +258,6 @@ if [ "$OMR_TARGET" = "bpi-r1" ]; then # Mark as DSA touch "$OMR_TARGET/source/target/linux/sunxi/base-files/etc/.lamobo-r1.dsa" else - # Remove the 310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th patch - echo -n "Removing unwanted patches from kernel $OMR_KERNEL..." - rm -f "$OMR_TARGET/source/target/linux/sunxi/patches-$OMR_KERNEL/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch" >/dev/null 2>&1 - echo "done" - # Remove ip-bridge echo -n "Removing ip-bridge support from openwrt config..." for i in PACKAGE_ip-bridge; do