From 0b7ad6f7f061e0cd7a3f267b23d411cc2bd44e00 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 5 Feb 2020 19:48:27 +0000 Subject: [PATCH 1/3] kernel: 5.4 fix build on darwin Fix typedef clash on darwin. HOSTCC scripts/mod/file2alias.o scripts/mod/file2alias.c:47:3: error: typedef redefinition with different types ('struct uuid_t' vs '__darwin_uuid_t' (aka 'unsigned char [16]')) } uuid_t; ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/_types/_uuid_t.h:31:25: note: previous definition is here typedef __darwin_uuid_t uuid_t; ^ scripts/mod/file2alias.c:1305:42: error: array initializer must be an initializer list or string literal DEF_FIELD(symval, tee_client_device_id, uuid); ^ 2 errors generated. Signed-off-by: Kevin Darbyshire-Bryant --- .../211-darwin-uuid-typedef-clash.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch diff --git a/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch b/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch new file mode 100644 index 0000000000..4a424c99c1 --- /dev/null +++ b/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch @@ -0,0 +1,27 @@ +From e44fc2af1ddc452b6659d08c16973d65c73b7d0a Mon Sep 17 00:00:00 2001 +From: Kevin Darbyshire-Bryant +Date: Wed, 5 Feb 2020 18:36:43 +0000 +Subject: [PATCH] file2alias: build on macos + +Signed-off-by: Kevin Darbyshire-Bryant +--- + scripts/mod/file2alias.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c +index c91eba751804..e756fd80b721 100644 +--- a/scripts/mod/file2alias.c ++++ b/scripts/mod/file2alias.c +@@ -38,6 +38,9 @@ typedef struct { + __u8 b[16]; + } guid_t; + ++#ifdef __APPLE__ ++#define uuid_t compat_uuid_t ++#endif + /* backwards compatibility, don't use in new code */ + typedef struct { + __u8 b[16]; +-- +2.21.1 (Apple Git-122.3) + From 49737c359c05710e587fd08f9c3565d75cd247c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 28 Feb 2020 19:30:16 +0100 Subject: [PATCH 2/3] bcm27xx-userland: update to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove upstream cmake fix. Signed-off-by: Álvaro Fernández Rojas --- package/utils/bcm27xx-userland/Makefile | 11 ++++++++--- .../patches/001-interface-vcms_host-cmake-fixes.patch | 11 ----------- 2 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch diff --git a/package/utils/bcm27xx-userland/Makefile b/package/utils/bcm27xx-userland/Makefile index 718e853993..87e3216637 100644 --- a/package/utils/bcm27xx-userland/Makefile +++ b/package/utils/bcm27xx-userland/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 OpenWrt.org +# Copyright (C) 2019-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-userland -PKG_VERSION:=42ec119e03eb8dffc7c83e2ac0e665e333abbef6 +PKG_VERSION:=06bc6daa02137ca72b7a2104afad81e82a44de17 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? -PKG_HASH:=cb0f1d653fdb9975783f30359277d9de2868607381e081796eac68745e3e8324 +PKG_HASH:=cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9 PKG_FLAGS:=nonshared @@ -48,8 +48,13 @@ endef define Package/bcm27xx-userland/install $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtmerge $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtparam $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtoverlay $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raspistill $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raspivid $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raspividyuv $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/raspiyuv $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tvservice $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin diff --git a/package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch b/package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch deleted file mode 100644 index cb73512af9..0000000000 --- a/package/utils/bcm27xx-userland/patches/001-interface-vcms_host-cmake-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/interface/vmcs_host/CMakeLists.txt -+++ b/interface/vmcs_host/CMakeLists.txt -@@ -24,7 +24,7 @@ if(NOT ARM64) - - # ILCS pulls in EGL for the ILCS/EGL surface API support - target_link_libraries(vcilcs brcmEGL brcmGLESv2 khrn_client vchiq_arm vcos) -- set(INSTALL_TARGETS "${INSTALL_TARGETS} vcilcs") -+ set(INSTALL_TARGETS ${INSTALL_TARGETS} vcilcs) - endif() - - # vchostif needs ilcore as well (vmcs_main pulls it in) From 977c7f12deefc152b7d62de06f4973a54a71d746 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 28 Feb 2020 20:00:10 +0100 Subject: [PATCH 3/3] ipq807x: fix indent in image/Makefile Convert space indent to tab like the rest of the file. Signed-off-by: Adrian Schmutzler --- target/linux/ipq807x/image/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq807x/image/Makefile b/target/linux/ipq807x/image/Makefile index 0a19a9ea57..2a0c74554f 100644 --- a/target/linux/ipq807x/image/Makefile +++ b/target/linux/ipq807x/image/Makefile @@ -22,7 +22,7 @@ define Image/BuildKernel/FITInitramfs endef define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) endef define Image/BuildKernel