From bb3c546d3985fb4ce33f5cb1b790b0811e5abe86 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 5 Jul 2023 21:05:17 +0200 Subject: [PATCH] Fix kernel 5.15 compilation --- 5.15/target/linux/generic/config-5.15 | 2 ++ build.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/5.15/target/linux/generic/config-5.15 b/5.15/target/linux/generic/config-5.15 index 1b07217c..10cf1417 100644 --- a/5.15/target/linux/generic/config-5.15 +++ b/5.15/target/linux/generic/config-5.15 @@ -1592,6 +1592,7 @@ DRM_I915_REQUEST_TIMEOUT=20000 # CONFIG_DRM_RADEON_USERPTR is not set # CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_LVDS is not set +# CONFIG_DRM_RCAR_USE_LVDS is not set # CONFIG_DRM_SII902X is not set # CONFIG_DRM_SII9234 is not set # CONFIG_DRM_SIL_SII8620 is not set @@ -2588,6 +2589,7 @@ CONFIG_INET=y # CONFIG_INET_ESPINTCP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_LRO is not set +CONFIG_INET_MPTCP_DIAG=y CONFIG_INET_TABLE_PERTURB_ORDER=16 # CONFIG_INET_TCP_DIAG is not set # CONFIG_INET_TUNNEL is not set diff --git a/build.sh b/build.sh index d3e02112..2b2fc9ab 100755 --- a/build.sh +++ b/build.sh @@ -711,7 +711,7 @@ if [ "$OMR_KERNEL" = "6.1" ]; then if [ "$TARGET" = "bpi-r2" ]; then echo "# CONFIG_VERSION_CODE_FILENAMES is not set" >> ".config" fi - if [ "$OMR_TARGET" != "x86" ] && [ "$OMR_TARGET" != "x86_64" ] && [ "$OMR_TARGET" != "r2s" ] && [ "$OMR_TARGET" != "r4s" ] && [ "$OMR_TARGET" != "r5s" ] && [ "$OMR_TARGET" != "qnap-301w" ] && [ "$OMR_TARGET" != "rpi2" ] && [ "$OMR_TARGET" != "rpi3" ] && [ "$OMR_TARGET" != "rpi4" ] && [ "$OMR_TARGET" != "rpi3" ] && [ "$OMR_TARGET" != "wrt32x" ] && [ "$OMR_TARGET" != "wrt3200acm" ] && [ "$OMR_TARGET" != "bpi-r64" ] && [ "$OMR_TARGET" != "r7800" ] && [ "$OMR_TARGET" != "espressobin" ] && [ "$OMR_TARGET" != "rutx" ]; then + if [ "$OMR_TARGET" != "x86" ] && [ "$OMR_TARGET" != "x86_64" ] && [ "$OMR_TARGET" != "r2s" ] && [ "$OMR_TARGET" != "r4s" ] && [ "$OMR_TARGET" != "r5s" ] && [ "$OMR_TARGET" != "qnap-301w" ] && [ "$OMR_TARGET" != "rpi2" ] && [ "$OMR_TARGET" != "rpi3" ] && [ "$OMR_TARGET" != "rpi4" ] && [ "$OMR_TARGET" != "rpi3" ] && [ "$OMR_TARGET" != "wrt32x" ] && [ "$OMR_TARGET" != "wrt3200acm" ] && [ "$OMR_TARGET" != "bpi-r64" ] && [ "$OMR_TARGET" != "r7800" ] && [ "$OMR_TARGET" != "espressobin" ] && [ "$OMR_TARGET" != "rutx" ] && [ "$OMR_TARGET" != "ubnt-erx" ]; then echo "Sorry but kernel 6.1 is not supported on your arch yet" NOT_SUPPORTED="1" #exit 1