[meta-freescale] ][PATCH 11/31] ipc: optimize the ipc recipes directories
Zhenhua Luo
zhenhua.luo at freescale.com
Wed Aug 12 07:42:22 PDT 2015
* move ipc-ust recipes to recipes-extended folder
* move ipc-modules to recipes-kernel folder
Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
recipes-bsp/ipc/ipc-ust_git.bb | 50 ----------------------
recipes-bsp/ipc/ipc.inc | 7 ---
recipes-extended/ipc-ust/ipc-ust_git.bb | 50 ++++++++++++++++++++++
recipes-extended/ipc-ust/ipc.inc | 6 +++
.../ipc-modules/ipc-modules-multi_git.bb | 11 +++++
.../ipc-modules/ipc-modules-single_git.bb | 11 +++++
recipes-kernel/ipc-modules/ipc-modules.inc | 25 +++++++++++
recipes-kernel/ipc/ipc-modules-multi_git.bb | 11 -----
recipes-kernel/ipc/ipc-modules-single_git.bb | 11 -----
recipes-kernel/ipc/ipc-modules.inc | 26 -----------
10 files changed, 103 insertions(+), 105 deletions(-)
delete mode 100644 recipes-bsp/ipc/ipc-ust_git.bb
delete mode 100644 recipes-bsp/ipc/ipc.inc
create mode 100644 recipes-extended/ipc-ust/ipc-ust_git.bb
create mode 100644 recipes-extended/ipc-ust/ipc.inc
create mode 100644 recipes-kernel/ipc-modules/ipc-modules-multi_git.bb
create mode 100644 recipes-kernel/ipc-modules/ipc-modules-single_git.bb
create mode 100644 recipes-kernel/ipc-modules/ipc-modules.inc
delete mode 100644 recipes-kernel/ipc/ipc-modules-multi_git.bb
delete mode 100644 recipes-kernel/ipc/ipc-modules-single_git.bb
delete mode 100644 recipes-kernel/ipc/ipc-modules.inc
diff --git a/recipes-bsp/ipc/ipc-ust_git.bb b/recipes-bsp/ipc/ipc-ust_git.bb
deleted file mode 100644
index c6b3cfe..0000000
--- a/recipes-bsp/ipc/ipc-ust_git.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "Linux IPC Userspace Tool"
-DESCRIPTION = "DSP boot application and ipc test application"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
-
-require ipc.inc
-
-S = "${WORKDIR}/git"
-
-# workaround for issue of parallel build, required a actual fix in ipc source
-PARALLEL_MAKE = ""
-
-EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}"'
-
-do_compile () {
- case ${MACHINE} in
- bsc9132qds|bsc9131rdb) SOC=B913x;;
- b4860qds|b4420qds|b4860qds-64b) SOC=B4860;;
- esac
- oe_runmake ${SOC}=1
-}
-
-do_install () {
- install -d ${D}${bindir}
- install -d ${D}${includedir}
- install -d ${D}/ipc
- install -m 755 ${S}/dsp_boot/dsp_bt ${D}/ipc
- install -m 755 ${S}/ipc/ipc_test ${D}/ipc
- install -m 755 ${S}/ipc/ipc_test67 ${D}/ipc
- install -m 755 ${S}/ipc/l1d_app ${D}/ipc
- install -m 755 ${S}/fsl_shm/app ${D}${bindir}/lg_shm_test
- install -d ${D}${base_libdir}
- install -m 755 ${S}/ipc/libipc.so ${D}${base_libdir}
- install -m 755 ${S}/ipc/libmem.so ${D}${base_libdir}
- install -m 755 ${S}/ipc/libdspboot.so ${D}${base_libdir}
- install -d ${D}${includedir}/ipc
- install -d ${D}${includedir}/ipc/ipc/include
- install -d ${D}${includedir}/ipc/fsl_shm/lib
- install ${S}/ipc/include/*.h ${D}${includedir}/ipc/ipc/include
- install ${S}/dsp_boot/*.h ${D}${includedir}/ipc/ipc/include
- install ${S}/kernel/fsl_ipc_types.h ${D}${includedir}/ipc/ipc/include
- install ${S}/kernel/fsl_heterogeneous_common.h ${D}${includedir}/ipc/ipc/include
- install ${S}/kernel/fsl_heterogeneous_l1_defense.h ${D}${includedir}/ipc/ipc/include
- install ${S}/fsl_shm/include/*.h ${D}${includedir}/ipc/ipc/include
- install ${S}/fsl_shm/lib/*.h ${D}${includedir}/ipc/fsl_shm/lib
-}
-
-FILES_${PN} += "/ipc/*"
-FILES_${PN}-dbg += "/ipc/.debug"
-
diff --git a/recipes-bsp/ipc/ipc.inc b/recipes-bsp/ipc/ipc.inc
deleted file mode 100644
index 547771a..0000000
--- a/recipes-bsp/ipc/ipc.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-DEPENDS = "virtual/kernel"
-
-SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;nobranch=1"
-SRCREV = "c9c92ac6a7a31c9d878096eb7d135c22a38f20ff"
-
-COMPATIBLE_MACHINE = "(bsc9132qds|bsc9131rdb|b4860qds|b4420qds)"
-
diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb
new file mode 100644
index 0000000..5ba3411
--- /dev/null
+++ b/recipes-extended/ipc-ust/ipc-ust_git.bb
@@ -0,0 +1,50 @@
+SUMMARY = "Linux IPC Userspace Tool"
+DESCRIPTION = "DSP boot application and ipc test application"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
+
+require ipc.inc
+
+S = "${WORKDIR}/git"
+
+# workaround for issue of parallel build, required a actual fix in ipc source
+PARALLEL_MAKE = ""
+
+EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}"'
+
+do_compile () {
+ case ${MACHINE} in
+ bsc9132qds|bsc9131rdb) SOC=B913x;;
+ b4860qds|b4420qds|b4860qds-64b) SOC=B4860;;
+ esac
+ oe_runmake ${SOC}=1
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -d ${D}${includedir}
+ install -d ${D}/ipc
+ install -m 755 ${S}/dsp_boot/dsp_bt ${D}/ipc
+ install -m 755 ${S}/ipc/ipc_test ${D}/ipc
+ install -m 755 ${S}/ipc/ipc_test67 ${D}/ipc
+ install -m 755 ${S}/ipc/l1d_app ${D}/ipc
+ install -m 755 ${S}/fsl_shm/app ${D}${bindir}/lg_shm_test
+ install -d ${D}${base_libdir}
+ install -m 755 ${S}/ipc/libipc.so ${D}${base_libdir}
+ install -m 755 ${S}/ipc/libmem.so ${D}${base_libdir}
+ install -m 755 ${S}/ipc/libdspboot.so ${D}${base_libdir}
+ install -d ${D}${includedir}/ipc
+ install -d ${D}${includedir}/ipc/ipc/include
+ install -d ${D}${includedir}/ipc/fsl_shm/lib
+ install ${S}/ipc/include/*.h ${D}${includedir}/ipc/ipc/include
+ install ${S}/dsp_boot/*.h ${D}${includedir}/ipc/ipc/include
+ install ${S}/kernel/fsl_ipc_types.h ${D}${includedir}/ipc/ipc/include
+ install ${S}/kernel/fsl_heterogeneous_common.h ${D}${includedir}/ipc/ipc/include
+ install ${S}/kernel/fsl_heterogeneous_l1_defense.h ${D}${includedir}/ipc/ipc/include
+ install ${S}/fsl_shm/include/*.h ${D}${includedir}/ipc/ipc/include
+ install ${S}/fsl_shm/lib/*.h ${D}${includedir}/ipc/fsl_shm/lib
+}
+
+FILES_${PN} += "${base_libdir}/*.so /ipc/*"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dbg += "/ipc/.debug"
diff --git a/recipes-extended/ipc-ust/ipc.inc b/recipes-extended/ipc-ust/ipc.inc
new file mode 100644
index 0000000..61b7976
--- /dev/null
+++ b/recipes-extended/ipc-ust/ipc.inc
@@ -0,0 +1,6 @@
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/ipc.git;nobranch=1"
+SRCREV = "c9c92ac6a7a31c9d878096eb7d135c22a38f20ff"
+
+COMPATIBLE_MACHINE = "(bsc9132qds|bsc9131rdb|b4860qds|b4420qds)"
diff --git a/recipes-kernel/ipc-modules/ipc-modules-multi_git.bb b/recipes-kernel/ipc-modules/ipc-modules-multi_git.bb
new file mode 100644
index 0000000..e5dc115
--- /dev/null
+++ b/recipes-kernel/ipc-modules/ipc-modules-multi_git.bb
@@ -0,0 +1,11 @@
+require ipc-modules.inc
+
+EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} ${SOC}=1 CONFIG_MULTI_RAT=1"
+
+do_install(){
+ install -d ${D}/usr/driver/IPC/multi_rat
+ install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/multi_rat
+}
+
+FILES_${PN} += "/usr/driver/IPC/multi_rat/*.ko"
+FILES_${PN}-dbg += "/usr/driver/IPC/multi_rat/.debug"
diff --git a/recipes-kernel/ipc-modules/ipc-modules-single_git.bb b/recipes-kernel/ipc-modules/ipc-modules-single_git.bb
new file mode 100644
index 0000000..03817e0
--- /dev/null
+++ b/recipes-kernel/ipc-modules/ipc-modules-single_git.bb
@@ -0,0 +1,11 @@
+require ipc-modules.inc
+
+EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} ${SOC}=1"
+
+do_install(){
+ install -d ${D}/usr/driver/IPC/single_rat
+ install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/single_rat
+}
+
+FILES_${PN} += "/usr/driver/IPC/single_rat/*.ko"
+FILES_${PN}-dbg += "/usr/driver/IPC/single_rat/.debug"
diff --git a/recipes-kernel/ipc-modules/ipc-modules.inc b/recipes-kernel/ipc-modules/ipc-modules.inc
new file mode 100644
index 0000000..a496ab6
--- /dev/null
+++ b/recipes-kernel/ipc-modules/ipc-modules.inc
@@ -0,0 +1,25 @@
+SUMMARY = "Linux IPC KERNEL MODULE "
+DESCRIPTION = "DSP boot application and ipc test application"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
+
+require recipes-extended/ipc-ust/ipc.inc
+
+inherit module qoriq_build_64bit_kernel
+
+S = "${WORKDIR}/git"
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+do_configure_prepend() {
+ sed -i 's,$(KERNEL_DIR)/.config,$(KBUILD_OUTPUT)/.config,' ${S}/kernel/Makefile
+}
+
+do_compile_prepend () {
+ cd ${S}/kernel
+ case ${MACHINE} in
+ bsc9132qds|bsc9131rdb) SOC=B913x;;
+ b4860qds|b4420qds) SOC=B4860;;
+ esac
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes-kernel/ipc/ipc-modules-multi_git.bb b/recipes-kernel/ipc/ipc-modules-multi_git.bb
deleted file mode 100644
index e5dc115..0000000
--- a/recipes-kernel/ipc/ipc-modules-multi_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ipc-modules.inc
-
-EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} ${SOC}=1 CONFIG_MULTI_RAT=1"
-
-do_install(){
- install -d ${D}/usr/driver/IPC/multi_rat
- install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/multi_rat
-}
-
-FILES_${PN} += "/usr/driver/IPC/multi_rat/*.ko"
-FILES_${PN}-dbg += "/usr/driver/IPC/multi_rat/.debug"
diff --git a/recipes-kernel/ipc/ipc-modules-single_git.bb b/recipes-kernel/ipc/ipc-modules-single_git.bb
deleted file mode 100644
index 03817e0..0000000
--- a/recipes-kernel/ipc/ipc-modules-single_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ipc-modules.inc
-
-EXTRA_OEMAKE ="KERNEL_DIR=${STAGING_KERNEL_DIR} ${SOC}=1"
-
-do_install(){
- install -d ${D}/usr/driver/IPC/single_rat
- install -m 755 ${S}/kernel/*.ko ${D}/usr/driver/IPC/single_rat
-}
-
-FILES_${PN} += "/usr/driver/IPC/single_rat/*.ko"
-FILES_${PN}-dbg += "/usr/driver/IPC/single_rat/.debug"
diff --git a/recipes-kernel/ipc/ipc-modules.inc b/recipes-kernel/ipc/ipc-modules.inc
deleted file mode 100644
index 79ba7ef..0000000
--- a/recipes-kernel/ipc/ipc-modules.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Linux IPC KERNEL MODULE "
-DESCRIPTION = "DSP boot application and ipc test application"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
-
-require recipes-bsp/ipc/ipc.inc
-
-inherit module qoriq_build_64bit_kernel
-
-S = "${WORKDIR}/git"
-
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
-do_configure_prepend() {
- sed -i 's,$(KERNEL_DIR)/.config,$(KBUILD_OUTPUT)/.config,' ${S}/kernel/Makefile
-}
-
-do_compile_prepend () {
- cd ${S}/kernel
- case ${MACHINE} in
- bsc9132qds|bsc9131rdb) SOC=B913x;;
- b4860qds|b4420qds) SOC=B4860;;
- esac
-}
-
-INHIBIT_PACKAGE_STRIP = "1"
-
--
2.4.3
More information about the meta-freescale
mailing list