mac80211: update to backports-4.14-rc2

[openwrt/staging/lynxis.git] / package / kernel / mac80211 / patches / 001-fix_build.patch

diff --git a/package/kernel/mac80211/patches/001-fix_build.patch b/package/kernel/mac80211/patches/001-fix_build.patch
index 99ef50e1829ea6eb2df65e9728a394a833b6fb4e..9e272e90af0fb9e13df125bc4a9645de9ce47ec7 100644 (file)
--- a/package/kernel/mac80211/patches/001-fix_build.patch
+++ b/package/kernel/mac80211/patches/001-fix_build.patch
@@ -1,12 +1,21 @@
 --- a/Makefile
 +++ b/Makefile
+@@ -5,7 +5,7 @@
+ ifeq ($(KERNELRELEASE),)
+ 
+ MAKEFLAGS += --no-print-directory
+-SHELL := /bin/bash
++SHELL := /usr/bin/env bash
+ BACKPORT_DIR := $(shell pwd)
+ 
+ KMODDIR ?= updates
 @@ -19,6 +19,7 @@ KLIB_BUILD ?= $(KLIB)/build/
  KERNEL_CONFIG := $(KLIB_BUILD)/.config
  KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile
  CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) 2>/dev/null | sed 's/\s.*//')
 +STAMP_KERNEL_CONFIG := .kernel_config_md5_$(CONFIG_MD5)
  
- export KLIB KLIB_BUILD BACKPORT_PWD KMODDIR KMODPATH_ARG
+ export KLIB KLIB_BUILD BACKPORT_DIR KMODDIR KMODPATH_ARG
  
 @@ -36,7 +37,8 @@ mrproper:
        @rm -f .kernel_config_md5 Kconfig.versions Kconfig.kernel
@@ -15,17 +24,17 @@
 -.DEFAULT:
 +.SILENT: $(STAMP_KERNEL_CONFIG)
 +$(STAMP_KERNEL_CONFIG):
-       @set -e ; test -f .local-symbols || (                                           \
+       @set -e ; test -f local-symbols || (                                            \
        echo "/--------------"                                                          ;\
        echo "| You shouldn't run make in the backports tree, but only in"              ;\
-@@ -60,56 +62,60 @@ mrproper:
+@@ -60,57 +62,61 @@ mrproper:
        echo "| (that isn't currently running.)"                                        ;\
        echo "\\--"                                                                     ;\
        false)
 -      @set -e ; if [ "$$(cat .kernel_config_md5 2>/dev/null)" != "$(CONFIG_MD5)" ]    ;\
 -      then                                                                            \
 -              echo -n "Generating local configuration database from kernel ..."       ;\
--              grep -v -f .local-symbols $(KERNEL_CONFIG) | grep = | (                 \
+-              grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | (                  \
 -                      while read l ; do                                               \
 -                              if [ "$${l:0:7}" != "CONFIG_" ] ; then                  \
 -                                      continue                                        ;\
@@ -47,15 +56,16 @@
 -                      done                                                            \
 -              ) > Kconfig.kernel                                                      ;\
 -              kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |   \
--                      sed 's/^\(\(3\|2\.6\)\.[0-9]\+\).*/\1/;t;d')                    ;\
+-                      sed 's/^\(\([3-4]\|2\.6\)\.[0-9]\+\).*/\1/;t;d')                ;\
 -              test "$$kver" != "" || echo "Kernel version parse failed!"              ;\
 -              test "$$kver" != ""                                                     ;\
 -              kvers="$$(seq 14 39 | sed 's/^/2.6./')"                                 ;\
--              kvers="$$kvers $$(seq 0 99 | sed 's/^/3./')"                            ;\
+-              kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')"                            ;\
+-              kvers="$$kvers $$(seq 0 99 | sed 's/^/4./')"                            ;\
 -              print=0                                                                 ;\
 -              for v in $$kvers ; do                                                   \
 -                      if [ "$$print" = "1" ] ; then                                   \
--                              echo config BACKPORT_KERNEL_$$(echo $$v | tr . _)       ;\
+-                              echo config KERNEL_$$(echo $$v | tr . _)        ;\
 -                              echo "    def_bool y"                                   ;\
 -                      fi                                                              ;\
 -                      if [ "$$v" = "$$kver" ] ; then print=1 ; fi                     ;\
@@ -75,9 +85,9 @@
 +      @rm -f .kernel_config_md5_*
 +      @touch $@
 +
-+Kconfig.kernel: $(STAMP_KERNEL_CONFIG) .local-symbols
++Kconfig.kernel: $(STAMP_KERNEL_CONFIG) local-symbols
 +      @printf "Generating local configuration database from kernel ..."
-+      @grep -v -f .local-symbols $(KERNEL_CONFIG) | grep = | (                        \
++      @grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | (                 \
 +              while read l ; do                                               \
 +                      if [ "$${l:0:7}" != "CONFIG_" ] ; then                  \
 +                              continue                                        ;\
@@ -102,15 +112,16 @@
 +
 +Kconfig.versions: Kconfig.kernel
 +      @kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |  \
-+              sed 's/^\(\(3\|2\.6\)\.[0-9]\+\).*/\1/;t;d')                    ;\
++              sed 's/^\(\([3-4]\|2\.6\)\.[0-9]\+\).*/\1/;t;d')                ;\
 +      test "$$kver" != "" || echo "Kernel version parse failed!"              ;\
 +      test "$$kver" != ""                                                     ;\
 +      kvers="$$(seq 14 39 | sed 's/^/2.6./')"                                 ;\
-+      kvers="$$kvers $$(seq 0 99 | sed 's/^/3./')"                            ;\
++      kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')"                            ;\
++      kvers="$$kvers $$(seq 0 99 | sed 's/^/4./')"                            ;\
 +      print=0                                                                 ;\
 +      for v in $$kvers ; do                                                   \
 +              if [ "$$print" = "1" ] ; then                                   \
-+                      echo config BACKPORT_KERNEL_$$(echo $$v | tr . _)       ;\
++                      echo config KERNEL_$$(echo $$v | tr . _)        ;\
 +                      echo "    def_bool y"                                   ;\
 +              fi                                                              ;\
 +              if [ "$$v" = "$$kver" ] ; then print=1 ; fi                     ;\
@@ -137,7 +148,7 @@
        @$(MAKE) oldconfig
 -      @echo -n "Building backport-include/backport/autoconf.h ..."
 +      @printf "Building backport-include/backport/autoconf.h ..."
-       @grep -f .local-symbols .config | (                             \
+       @grep -f local-symbols .config | (                              \
                echo "#ifndef COMPAT_AUTOCONF_INCLUDED"                 ;\
                echo "#define COMPAT_AUTOCONF_INCLUDED"                 ;\
 @@ -80,7 +80,12 @@ backport-include/backport/autoconf.h: .c