From b61721b554de9bdac386900c8eb1c56a5a546fb8 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 21 May 2020 21:49:21 +0200 Subject: [PATCH 1/6] mac80211: Fix build on mpc85xx target This fixes the following compile error seen on the mpc85xx target: CC [M] /linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.o In file included from /builder/shared-workdir/build/staging_dir/toolchain-powerpc_8540_gcc-8.4.0_musl/include/stddef.h:17, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/include/uapi/linux/wireless.h:77, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/include/linux/wireless.h:13, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.c:89: /builder/shared-workdir/build/staging_dir/toolchain-powerpc_8540_gcc-8.4.0_musl/include/bits/alltypes.h:106:15: error: conflicting types for 'ptrdiff_t' typedef _Addr ptrdiff_t; ^~~~~~~~~ In file included from /linux-mpc85xx_p2020/backports-5.7-rc3-1/backport-include/linux/types.h:4, from ./include/linux/list.h:5, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/backport-include/linux/list.h:3, from ./include/linux/module.h:9, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/backport-include/linux/module.h:3, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.c:79: ./include/linux/types.h:65:28: note: previous declaration of 'ptrdiff_t' was here typedef __kernel_ptrdiff_t ptrdiff_t; ^~~~~~~~~ scripts/Makefile.build:265: recipe for target '/linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.o' failed Fixes: d6b158b86981 ("mac80211: Update to 4.19.137-1") Signed-off-by: Hauke Mehrtens (cherry picked from commit 04b1a11f5ca72a741493addca1b1ae093f37934f) --- package/kernel/mac80211/Makefile | 2 +- ...e-linux-stddef.h-instead-of-stddef.h.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 package/kernel/mac80211/patches/subsys/090-wireless-Use-linux-stddef.h-instead-of-stddef.h.patch diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index b71a004096..06a7aefb51 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=4.19.137-1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v4.19.137/ PKG_HASH:=dc5eea4f77fc5c43b69e38f46fbf766880fa4bdeef83dcc8dcc85aa6b645bb7c diff --git a/package/kernel/mac80211/patches/subsys/090-wireless-Use-linux-stddef.h-instead-of-stddef.h.patch b/package/kernel/mac80211/patches/subsys/090-wireless-Use-linux-stddef.h-instead-of-stddef.h.patch new file mode 100644 index 0000000000..1661d2726b --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/090-wireless-Use-linux-stddef.h-instead-of-stddef.h.patch @@ -0,0 +1,33 @@ +From 1b9ae0c92925ac40489be526d67d0010d0724ce0 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Thu, 21 May 2020 22:14:22 +0200 +Subject: [PATCH] wireless: Use linux/stddef.h instead of stddef.h + +When compiling inside the kernel include linux/stddef.h instead of +stddef.h. When I compile this header file in backports for power PC I +run into a conflict with ptrdiff_t. I was unable to reproduce this in +mainline kernel. I still would like to fix this problem in the kernel. + +Fixes: 6989310f5d43 ("wireless: Use offsetof instead of custom macro.") +Signed-off-by: Hauke Mehrtens +Link: https://lore.kernel.org/r/20200521201422.16493-1-hauke@hauke-m.de +Signed-off-by: Johannes Berg +--- + include/uapi/linux/wireless.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/include/uapi/linux/wireless.h ++++ b/include/uapi/linux/wireless.h +@@ -74,7 +74,11 @@ + #include /* for "struct sockaddr" et al */ + #include /* for IFNAMSIZ and co... */ + +-#include /* for offsetof */ ++#ifdef __KERNEL__ ++# include /* for offsetof */ ++#else ++# include /* for offsetof */ ++#endif + + /***************************** VERSION *****************************/ + /* From 79e05d9b81ddcc602275c409d25f4048379a8536 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 11 Aug 2020 18:50:34 +0200 Subject: [PATCH 2/6] x86: Add CONFIG_EFI_CUSTOM_SSDT_OVERLAYS The CONFIG_EFI_CUSTOM_SSDT_OVERLAYS option was added in kernel 4.14.188, set it for the x86/generic target. This fixes a build problem in the x86/generic target. Fixes: 148d59c67edd ("kernel: update kernel 4.14 to version 4.14.193") Signed-off-by: Hauke Mehrtens --- target/linux/x86/generic/config-4.14 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/x86/generic/config-4.14 b/target/linux/x86/generic/config-4.14 index de20438aed..b752f2e55b 100644 --- a/target/linux/x86/generic/config-4.14 +++ b/target/linux/x86/generic/config-4.14 @@ -104,6 +104,7 @@ CONFIG_EFIVAR_FS=m # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set +# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set # CONFIG_EFI_DEV_PATH_PARSER is not set CONFIG_EFI_ESRT=y # CONFIG_EFI_FAKE_MEMMAP is not set From 88cee4653dd38fe2984ffbd78fb0c97b044af8b3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 14 Jul 2020 16:32:28 -0500 Subject: [PATCH 3/6] pcre: add host variant of libpcre This is needed to build the host variant of libselinux. Signed-off-by: Thomas Petazzoni --- package/libs/pcre/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile index b638c876da..3655614169 100644 --- a/package/libs/pcre/Makefile +++ b/package/libs/pcre/Makefile @@ -61,6 +61,18 @@ define Package/libpcrecpp DEPENDS:=+libpcre $(CXX_DEPENDS) endef +include $(INCLUDE_DIR)/host-build.mk + +HOST_CONFIGURE_ARGS += \ + --enable-utf8 \ + --enable-unicode-properties \ + --enable-pcre16 \ + --with-match-limit-recursion=16000 \ + --enable-cpp + +$(eval $(call HostBuild)) + + TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ From 47f1112d6b521203a16f03bcee266ed0388228a3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 14 Aug 2020 02:38:21 +0100 Subject: [PATCH 4/6] pcre: clean up Makefile line order The most recent patch added add lines in one block instead of in the appropriate places to keep Makefiles in consistent style. Fix that. Fixes: ff02e1561f ("pcre: add host variant of libpcre") Signed-off-by: Daniel Golle --- package/libs/pcre/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile index 3655614169..bf3f733a5c 100644 --- a/package/libs/pcre/Makefile +++ b/package/libs/pcre/Makefile @@ -29,6 +29,7 @@ PKG_CONFIG_DEPENDS:=\ include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/libpcre/default SECTION:=libs @@ -61,7 +62,6 @@ define Package/libpcrecpp DEPENDS:=+libpcre $(CXX_DEPENDS) endef -include $(INCLUDE_DIR)/host-build.mk HOST_CONFIGURE_ARGS += \ --enable-utf8 \ @@ -70,9 +70,6 @@ HOST_CONFIGURE_ARGS += \ --with-match-limit-recursion=16000 \ --enable-cpp -$(eval $(call HostBuild)) - - TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ @@ -129,3 +126,4 @@ $(eval $(call BuildPackage,libpcre)) $(eval $(call BuildPackage,libpcre16)) $(eval $(call BuildPackage,libpcre32)) $(eval $(call BuildPackage,libpcrecpp)) +$(eval $(call HostBuild)) From fbc4012e54937e5ab1a1a61ab923ee4d7d620d35 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 14 Aug 2020 02:40:47 +0100 Subject: [PATCH 5/6] libsepol: fix Makefile style Fix line ordering (cosmetic). Signed-off-by: Daniel Golle --- package/libs/libsepol/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libs/libsepol/Makefile b/package/libs/libsepol/Makefile index 5309523659..2a6bd46ad0 100644 --- a/package/libs/libsepol/Makefile +++ b/package/libs/libsepol/Makefile @@ -16,6 +16,7 @@ PKG_HASH:=ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc PKG_MAINTAINER:=Thomas Petazzoni include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/libsepol SECTION:=libs @@ -27,9 +28,7 @@ endef define Package/libsepol/description Libsepol is the binary policy manipulation library. It doesn't depend upon or use any of the other SELinux components. -endef #' - -include $(INCLUDE_DIR)/host-build.mk +endef HOST_MAKE_FLAGS += \ PREFIX=$(STAGING_DIR_HOSTPKG) \ From 92807427005e5bc629f566a9d67d04197616a2c8 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 14 Aug 2020 02:41:39 +0100 Subject: [PATCH 6/6] libselinux: fix Makefile style Also fix line order in libselinux Makefile. Signed-off-by: Daniel Golle --- package/libs/libselinux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libs/libselinux/Makefile b/package/libs/libselinux/Makefile index aea1e49e5c..9270e88a04 100644 --- a/package/libs/libselinux/Makefile +++ b/package/libs/libselinux/Makefile @@ -17,6 +17,7 @@ HOST_BUILD_DEPENDS:=libsepol/host pcre/host PKG_MAINTAINER:=Thomas Petazzoni include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/libselinux SECTION:=libs @@ -36,7 +37,6 @@ define Package/libselinux/description older version supported by the kernel) when loading policy. endef -include $(INCLUDE_DIR)/host-build.mk # Needed to link libselinux utilities, which link against # libselinux.so, which indirectly depends on libpcre.so, installed in