summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-08-06 20:18:07 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-08-06 20:18:07 +0000
commitba611b292bbdc55197d5890c9a53369e36ddd931 (patch)
treee01f8092e077212de8ce23a4c697d919db9b8402 /package
parent3b62de75ae6e55bd362f9fd732e904d3a8092da7 (diff)
mac80211: do not delete linux/*_platform.h, they are touched by patches. instead make the build fail if they differ from the ones in the kernel tree to prevent subtle runtime issues (see #11981)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33030 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index f1a797e607..986fd93a8c 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -1331,9 +1331,6 @@ define Build/Prepare
rm -rf $(PKG_BUILD_DIR)/include/linux/bcma
rm -rf $(PKG_BUILD_DIR)/include/net/bluetooth/
rm -f $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h
- rm -f $(PKG_BUILD_DIR)/include/linux/ath9k_platform.h
- rm -f $(PKG_BUILD_DIR)/include/linux/ath5k_platform.h
- rm -f $(PKG_BUILD_DIR)/include/linux/rt2x00_platform.h
rm -f $(PKG_BUILD_DIR)/include/linux/wl12xx.h
rm -f $(PKG_BUILD_DIR)/include/linux/spi/libertas_spi.h
rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h
@@ -1348,6 +1345,12 @@ ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
endef
endif
+define Build/Configure
+ cmp $(PKG_BUILD_DIR)/include/linux/ath9k_platform.h $(LINUX_DIR)/include/linux/ath9k_platform.h
+ cmp $(PKG_BUILD_DIR)/include/linux/ath5k_platform.h $(LINUX_DIR)/include/linux/ath5k_platform.h
+ cmp $(PKG_BUILD_DIR)/include/linux/rt2x00_platform.h $(LINUX_DIR)/include/linux/rt2x00_platform.h
+endef
+
define Build/Compile
$(call Build/Compile/kmod)
endef