From 832db3af971cfce8d31442081486c3363b3f7f71 Mon Sep 17 00:00:00 2001
From: Zhenhua Luo <zhenhua.luo@freescale.com>
Date: Fri, 28 Aug 2015 18:36:48 +0800
Subject: Add kernel-module prefix for ipc kernel module bb and move bb to
 kernel-modules subdir

* rename ipc-modules-multi to kernel-module-ipc-multi
* rename ipc-modules-single to kernel-module-ipc-single
* rename ipc-modules to kernel-module-ipc
* move kernel module recipes to the kernel-modules subdirectory

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../ipc-modules/ipc-modules-multi_git.bb           | 11 ----------
 .../ipc-modules/ipc-modules-single_git.bb          | 11 ----------
 recipes-kernel/ipc-modules/ipc-modules.inc         | 25 ----------------------
 .../kernel-modules/kernel-module-ipc-multi_git.bb  | 11 ++++++++++
 .../kernel-modules/kernel-module-ipc-single_git.bb | 11 ++++++++++
 .../kernel-modules/kernel-module-ipc.inc           | 25 ++++++++++++++++++++++
 6 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 recipes-kernel/ipc-modules/ipc-modules-multi_git.bb
 delete mode 100644 recipes-kernel/ipc-modules/ipc-modules-single_git.bb
 delete mode 100644 recipes-kernel/ipc-modules/ipc-modules.inc
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-ipc.inc

(limited to 'recipes-kernel')

diff --git a/recipes-kernel/ipc-modules/ipc-modules-multi_git.bb b/recipes-kernel/ipc-modules/ipc-modules-multi_git.bb
deleted file mode 100644
index e5dc1151..00000000
--- a/recipes-kernel/ipc-modules/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-modules/ipc-modules-single_git.bb b/recipes-kernel/ipc-modules/ipc-modules-single_git.bb
deleted file mode 100644
index 03817e0e..00000000
--- a/recipes-kernel/ipc-modules/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-modules/ipc-modules.inc b/recipes-kernel/ipc-modules/ipc-modules.inc
deleted file mode 100644
index a496ab6d..00000000
--- a/recipes-kernel/ipc-modules/ipc-modules.inc
+++ /dev/null
@@ -1,25 +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-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/kernel-modules/kernel-module-ipc-multi_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb
new file mode 100644
index 00000000..4570e788
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc-multi_git.bb
@@ -0,0 +1,11 @@
+require kernel-module-ipc.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/kernel-modules/kernel-module-ipc-single_git.bb b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb
new file mode 100644
index 00000000..5c81d349
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc-single_git.bb
@@ -0,0 +1,11 @@
+require kernel-module-ipc.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/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
new file mode 100644
index 00000000..a496ab6d
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.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"
-- 
cgit v1.2.3-54-g00ecf