From a6048db8a0fb5c79ca0e0d0f6f23c853ce2eb0d5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2015 11:07:08 -0300 Subject: kernel-module-mcc: move to kernel-modules subdir There are more kernel modules which are going to be packaged so it makes sense to have them all in same subdirectory. Signed-off-by: Otavio Salvador --- ...h-Only-include-mvf_sema4.h-if-building-in.patch | 51 ---------------------- .../kernel-module-mcc/kernel-module-mcc_1.06.bb | 20 --------- ...h-Only-include-mvf_sema4.h-if-building-in.patch | 51 ++++++++++++++++++++++ .../kernel-modules/kernel-module-mcc_1.06.bb | 20 +++++++++ 4 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch delete mode 100644 recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.06.bb create mode 100644 recipes-kernel/kernel-modules/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch create mode 100644 recipes-kernel/kernel-modules/kernel-module-mcc_1.06.bb diff --git a/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch b/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch deleted file mode 100644 index 570edaa..0000000 --- a/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 17e04c68557c4c9cb1a0112717019329a0cc3f96 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Tue, 6 Jan 2015 13:39:50 -0200 -Subject: [PATCH] mcc_config.h: Only include mvf_sema4.h if building in kernel -Organization: O.S. Systems Software LTDA. - -When mcc_config.h is used to make application we shouldn't include -mvf_sema4.h as it is an internal symbol of kernel and shouldn't be -directly referenced by user space applications using the MCC -interface. - -This patch puts a guard using __KERNEL__ define, avoiding the include -and the definition of MCC_SHMEM_SEMAPHORE_NUMBER as -MVF_SHMEM_SEMAPHORE_NUMBER would be undefined. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador ---- - mcc_config.h | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/mcc_config.h b/mcc_config.h -index 6a12c6d..3887aad 100644 ---- a/mcc_config.h -+++ b/mcc_config.h -@@ -18,8 +18,13 @@ - #ifndef __MCC_CONFIG__ - #define __MCC_CONFIG__ - -+#ifdef __KERNEL__ - #include - -+/* semaphore number */ -+#define MCC_SHMEM_SEMAPHORE_NUMBER (MVF_SHMEM_SEMAPHORE_NUMBER) -+#endif -+ - /* used OS */ - #define MCC_OS_USED (MCC_LINUX) - -@@ -47,7 +52,4 @@ - /* other cores, besides this participating in mcc */ - #define MCC_OTHER_CORES {1} - --/* semaphore number */ --#define MCC_SHMEM_SEMAPHORE_NUMBER (MVF_SHMEM_SEMAPHORE_NUMBER) -- - #endif /* __MCC_CONFIG__ */ --- -2.1.4 - diff --git a/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.06.bb b/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.06.bb deleted file mode 100644 index db3eb02..0000000 --- a/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.06.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2013 Timesys Corporation -SUMMARY = "Multicore communication kernel module" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c8959abcbbe4d6676c58eab9354019e6" - -PROVIDES = "virtual/kernel-module-mcc" -RPROVIDES_${PN} = "virtual/kernel-module-mcc" -RPROVIDES_${PN}-dev = "virtual/kernel-module-mcc-dev" - -inherit module - -SRC_URI = "http://repository.timesys.com/buildsources/m/mcc-kmod/mcc-kmod-${PV}/mcc-kmod-${PV}.tar.bz2 \ - file://mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch" - -SRC_URI[md5sum] = "d0507968592af5d8781e8bdbbb249e7d" -SRC_URI[sha256sum] = "43f834ddf9845da843c7790a307a0dbc8b04a40deed06aed7c3c99ad3a273f6c" - -S = "${WORKDIR}/mcc-kmod-${PV}" - -COMPATIBLE_MACHINE = "(vf60)" diff --git a/recipes-kernel/kernel-modules/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch b/recipes-kernel/kernel-modules/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch new file mode 100644 index 0000000..570edaa --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch @@ -0,0 +1,51 @@ +From 17e04c68557c4c9cb1a0112717019329a0cc3f96 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Tue, 6 Jan 2015 13:39:50 -0200 +Subject: [PATCH] mcc_config.h: Only include mvf_sema4.h if building in kernel +Organization: O.S. Systems Software LTDA. + +When mcc_config.h is used to make application we shouldn't include +mvf_sema4.h as it is an internal symbol of kernel and shouldn't be +directly referenced by user space applications using the MCC +interface. + +This patch puts a guard using __KERNEL__ define, avoiding the include +and the definition of MCC_SHMEM_SEMAPHORE_NUMBER as +MVF_SHMEM_SEMAPHORE_NUMBER would be undefined. + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador +--- + mcc_config.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/mcc_config.h b/mcc_config.h +index 6a12c6d..3887aad 100644 +--- a/mcc_config.h ++++ b/mcc_config.h +@@ -18,8 +18,13 @@ + #ifndef __MCC_CONFIG__ + #define __MCC_CONFIG__ + ++#ifdef __KERNEL__ + #include + ++/* semaphore number */ ++#define MCC_SHMEM_SEMAPHORE_NUMBER (MVF_SHMEM_SEMAPHORE_NUMBER) ++#endif ++ + /* used OS */ + #define MCC_OS_USED (MCC_LINUX) + +@@ -47,7 +52,4 @@ + /* other cores, besides this participating in mcc */ + #define MCC_OTHER_CORES {1} + +-/* semaphore number */ +-#define MCC_SHMEM_SEMAPHORE_NUMBER (MVF_SHMEM_SEMAPHORE_NUMBER) +- + #endif /* __MCC_CONFIG__ */ +-- +2.1.4 + diff --git a/recipes-kernel/kernel-modules/kernel-module-mcc_1.06.bb b/recipes-kernel/kernel-modules/kernel-module-mcc_1.06.bb new file mode 100644 index 0000000..db3eb02 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-mcc_1.06.bb @@ -0,0 +1,20 @@ +# Copyright (C) 2013 Timesys Corporation +SUMMARY = "Multicore communication kernel module" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c8959abcbbe4d6676c58eab9354019e6" + +PROVIDES = "virtual/kernel-module-mcc" +RPROVIDES_${PN} = "virtual/kernel-module-mcc" +RPROVIDES_${PN}-dev = "virtual/kernel-module-mcc-dev" + +inherit module + +SRC_URI = "http://repository.timesys.com/buildsources/m/mcc-kmod/mcc-kmod-${PV}/mcc-kmod-${PV}.tar.bz2 \ + file://mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch" + +SRC_URI[md5sum] = "d0507968592af5d8781e8bdbbb249e7d" +SRC_URI[sha256sum] = "43f834ddf9845da843c7790a307a0dbc8b04a40deed06aed7c3c99ad3a273f6c" + +S = "${WORKDIR}/mcc-kmod-${PV}" + +COMPATIBLE_MACHINE = "(vf60)" -- cgit v1.2.3-54-g00ecf