From 7b23e443e100d4fff5b62731d12e239cf5af0ea0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Sat, 14 Jul 2018 12:59:47 +0200 Subject: [PATCH] modules: update OpenWrt bc7abe8729f3 include/kernel-build.mk: fix kernel rebuild on backport patch changes c99c70e05303 kernel: backport page fragment API changes from 4.10+ to 4.9 --- modules | 2 +- .../0008-mt76-depend-on-kernel-4.14.patch | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 patches/openwrt/0008-mt76-depend-on-kernel-4.14.patch diff --git a/modules b/modules index bfe5fa546..095dfc66d 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing luci gluon' OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-18.06 -OPENWRT_COMMIT=3e81365141e4626522c616e7870d246594eff26d +OPENWRT_COMMIT=bc7abe8729f3ff611dec597ae2831aefdc748567 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-18.06 diff --git a/patches/openwrt/0008-mt76-depend-on-kernel-4.14.patch b/patches/openwrt/0008-mt76-depend-on-kernel-4.14.patch deleted file mode 100644 index 9b311d6f4..000000000 --- a/patches/openwrt/0008-mt76-depend-on-kernel-4.14.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Matthias Schiffer <mschiffer@universe-factory.net> -Date: Sat, 14 Jul 2018 01:17:16 +0200 -Subject: mt76: depend on kernel 4.14 - -Do not break the build on kernel 4.9. - -Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> - -diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile -index 2906849cf1e43424daa090026123737452dd1a61..e53dcb21515495181959ad1f19cd4d21a4e97e07 100644 ---- a/package/kernel/mt76/Makefile -+++ b/package/kernel/mt76/Makefile -@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk - define KernelPackage/mt76-default - SUBMENU:=Wireless Drivers - DEPENDS:= \ -- +kmod-mac80211 @PCI_SUPPORT @!LINUX_3_18 \ -+ +kmod-mac80211 @PCI_SUPPORT @LINUX_4_14 \ - +@DRIVER_11AC_SUPPORT +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT - endef - -- GitLab