[yocto] [meta-measured][PATCH] linux-yocto.inc: rename to linux-yocto-measured.inc

[wenzong.fan at windriver.com]

From: Wenzong Fan <wenzong.fan at windriver.com>

To avoid conflict with the one from oe-core:
  oe-core/meta/recipes-kernel/linux/linux-yocto.inc

Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
---
 recipes-kernel/linux/linux-intel_4.%.bbappend    |  2 +-
 recipes-kernel/linux/linux-yocto-measured.inc    | 13 +++++++++++++
 recipes-kernel/linux/linux-yocto-rt_4.%.bbappend |  2 +-
 recipes-kernel/linux/linux-yocto.inc             | 13 -------------
 recipes-kernel/linux/linux-yocto_4.%.bbappend    |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-yocto-measured.inc
 delete mode 100644 recipes-kernel/linux/linux-yocto.inc

diff --git a/recipes-kernel/linux/linux-intel_4.%.bbappend b/recipes-kernel/linux/linux-intel_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-intel_4.%.bbappend
+++ b/recipes-kernel/linux/linux-intel_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto-measured.inc b/recipes-kernel/linux/linux-yocto-measured.inc
new file mode 100644
index 0000000..f6930d1
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-measured.inc
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+
+# Enable kernel support if the feature is available on the machine.
+SRC_URI += " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.cfg', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.scc','', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.cfg','', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.scc', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.cfg', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.scc', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.cfg', '', d)} \
+"
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto.inc b/recipes-kernel/linux/linux-yocto.inc
deleted file mode 100644
index f6930d1..0000000
--- a/recipes-kernel/linux/linux-yocto.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
-
-# Enable kernel support if the feature is available on the machine.
-SRC_URI += " \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.cfg', '', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.scc','', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.cfg','', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.scc', '', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.cfg', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.scc', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.cfg', '', d)} \
-"
diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend b/recipes-kernel/linux/linux-yocto_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-yocto_4.%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
-- 
2.8.1