From b01305c8d26d8eb3525cf79591075601b04736cc Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 9 Nov 2019 20:07:18 +0100 Subject: [PATCH 1/2] strace: Fix build on PowerPC This patch breaks building on PowerPC, like the mpc85xx_generic target for me. Fixes: FS#2585 Signed-off-by: Hauke Mehrtens --- .../100-workaround--pt-reg-collisions-ppc.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch diff --git a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch b/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch deleted file mode 100644 index 93e2980749..0000000000 --- a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/ptrace.h -+++ b/ptrace.h -@@ -30,7 +30,14 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # endif - -+#if POWERPC -+#include -+#define __ASSEMBLY__ -+#endif - # include -+#if POWERPC -+#undef __ASSEMBLY__ -+#endif - - # ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg From 3ff3b044c01949cd7280978b17d0348ee9e7f4ae Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 9 Nov 2019 20:10:58 +0100 Subject: [PATCH 2/2] mac80211: Fix dependencies of kmod-rsi91x-usb Instead of depending on kmod-usb2 make it depend on the normal USB dependencies. This should hopefully fix some problems seen in the build bot builds for powerpc_8540. In addition also activate DRIVER_11N_SUPPORT support. Signed-off-by: Hauke Mehrtens --- package/kernel/mac80211/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 7e74182ef3..dd5d4f9456 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -299,14 +299,14 @@ endef define KernelPackage/rsi91x $(call KernelPackage/mac80211/Default) TITLE:=Redpine Signals Inc 91x WLAN driver support - DEPENDS+= +kmod-mac80211 +rs9113-firmware + DEPENDS+= +kmod-mac80211 +rs9113-firmware +@DRIVER_11N_SUPPORT FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rsi/rsi_91x.ko endef define KernelPackage/rsi91x-usb $(call KernelPackage/mac80211/Default) TITLE:=Redpine Signals USB bus support - DEPENDS+= +kmod-mac80211 +kmod-usb2 +kmod-rsi91x +rs9113-firmware + DEPENDS+=@USB_SUPPORT +kmod-usb-core +kmod-mac80211 +kmod-rsi91x +rs9113-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rsi/rsi_usb.ko AUTOLOAD:=$(call AutoProbe,rsi_usb) endef