From 268548b2c808afaa7bd9b7404b63f6036d7c5963 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 24 Apr 2018 01:53:50 +0000 Subject: multiprocmgr: don't hardcode "uapi" kernel location This way keystone_remoteproc.h can also be found in sysroots, when available. Otherwise it can fall back to using kernel sources directly. Signed-off-by: Denys Dmytriyenko --- ...on-t-hardcode-kernel-s-uapi-location-keys.patch | 27 ++++++++++++++++++++++ recipes-ti/multiprocmgr/multiprocmgr_git.bb | 9 +++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch (limited to 'recipes-ti/multiprocmgr') diff --git a/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch b/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch new file mode 100644 index 00000000..25deedcc --- /dev/null +++ b/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch @@ -0,0 +1,27 @@ +From 17c307ff6e67af43f243366baa2ccc01f89cdddd Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Mon, 23 Apr 2018 15:35:44 -0400 +Subject: [PATCH] mpmdlif.c: don't hardcode kernel's "uapi" location + keystone_remoteproc.h + +Signed-off-by: Denys Dmytriyenko +--- + src/daemon/mpmdlif.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/mpmdlif.c b/src/daemon/mpmdlif.c +index 0c31604..d287bbc 100644 +--- a/src/daemon/mpmdlif.c ++++ b/src/daemon/mpmdlif.c +@@ -47,7 +47,7 @@ + #include + + #define _LINUX_TYPES_H +-#include "uapi/linux/keystone_remoteproc.h" ++#include "linux/keystone_remoteproc.h" + #include "internal/rsc_types.h" + //#include + // #define LOADER_DEBUG +-- +2.7.4 + diff --git a/recipes-ti/multiprocmgr/multiprocmgr_git.bb b/recipes-ti/multiprocmgr/multiprocmgr_git.bb index 053a04e5..f37b97e3 100644 --- a/recipes-ti/multiprocmgr/multiprocmgr_git.bb +++ b/recipes-ti/multiprocmgr/multiprocmgr_git.bb @@ -3,15 +3,18 @@ SUMMARY = "Provides download, debug and other utilities for other cores in the S include multiprocmgr.inc -SRC_URI_append = " file://mpmsrv-daemon.service" +SRC_URI += " \ + file://mpmsrv-daemon.service \ + file://0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch \ +" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" DEPENDS = "mpm-transport libdaemon virtual/kernel cmem" PACKAGE_ARCH = "${MACHINE_ARCH}" -CC += "-I${STAGING_KERNEL_DIR}/include" +CC += "-I${STAGING_KERNEL_DIR}/include -I${STAGING_KERNEL_DIR}/include/uapi" INITSCRIPT_NAME = "mpmsrv-daemon.sh" INITSCRIPT_PARAMS = "defaults 10" -- cgit v1.2.3-54-g00ecf