Author: nico Date: 2015-06-26 02:43:03 +0200 (Fri, 26 Jun 2015) New Revision: 46133
Added: trunk/package/kernel/mac80211/patches/010-fix-uml-build.patch Modified: trunk/package/kernel/mac80211/Makefile Log: mac80211: fix build on UML A duplicate include guard prevents inclusion of barrier.h in UML build and this prevents mac80211 from building. This patch re-enables mac80211 hwsim and renames the include guard. See https://lists.openwrt.org/pipermail/openwrt-devel/2015-June/033614.html for details. Signed-off-by: Martin Tippmann <[email protected]> Signed-off-by: Nicolas Thill <[email protected]> Modified: trunk/package/kernel/mac80211/Makefile =================================================================== --- trunk/package/kernel/mac80211/Makefile 2015-06-25 22:02:10 UTC (rev 46132) +++ trunk/package/kernel/mac80211/Makefile 2015-06-26 00:43:03 UTC (rev 46133) @@ -60,7 +60,7 @@ SUBMENU:=$(WMENU) URL:=https://wireless.wiki.kernel.org/ MAINTAINER:=Felix Fietkau <[email protected]> - DEPENDS:=@!TARGET_uml @!LINUX_4_1 + DEPENDS:=@!LINUX_4_1 endef define KernelPackage/cfg80211 Added: trunk/package/kernel/mac80211/patches/010-fix-uml-build.patch =================================================================== --- trunk/package/kernel/mac80211/patches/010-fix-uml-build.patch (rev 0) +++ trunk/package/kernel/mac80211/patches/010-fix-uml-build.patch 2015-06-26 00:43:03 UTC (rev 46133) @@ -0,0 +1,15 @@ +--- a/backport-include/asm/barrier.h ++++ b/backport-include/asm/barrier.h +@@ -1,9 +1,9 @@ +-#ifndef __BACKPORT_ASM_GENERIC_BARRIER_H +-#define __BACKPORT_ASM_GENERIC_BARRIER_H ++#ifndef __BACKPORT_ASM_BARRIER_H ++#define __BACKPORT_ASM_BARRIER_H + #include_next <asm/barrier.h> + + #ifndef dma_rmb + #define dma_rmb() rmb() + #endif + +-#endif /* __BACKPORT_ASM_GENERIC_BARRIER_H */ ++#endif /* __BACKPORT_ASM_BARRIER_H */ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
