Hi Bruce,
I noticed that you originally created the meta-tlk layer. Will this
change conflict with anything you guys are doing?
Thanks,
Cal
On 05/30/2017 03:04 PM, California Sullivan wrote:
Only one recipe uses this .inc file, and we need to add a linux-intel
bbappend that is slightly different, so this .inc file will not be
appropriate there either. Instead just keep everything in the bbappend.
We can reuse the time-limited-kernel config fragment, so move that to a
neutral location as well.
Signed-off-by: California Sullivan <california.l.sulli...@intel.com>
---
meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg | 3 +++
meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg | 3 ---
meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend | 3 ++-
meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc | 2 --
4 files changed, 5 insertions(+), 6 deletions(-)
create mode 100644 meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
delete mode 100644
meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg
delete mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
diff --git a/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
b/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
new file mode 100644
index 0000000..44f4bea
--- /dev/null
+++ b/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
@@ -0,0 +1,3 @@
+CONFIG_UPTIME_LIMITED_KERNEL=y
+CONFIG_UPTIME_LIMIT_DURATION=14400
+CONFIG_UPTIME_LIMIT_KERNEL_REBOOT=y
diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg
b/meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg
deleted file mode 100644
index 44f4bea..0000000
--- a/meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_UPTIME_LIMITED_KERNEL=y
-CONFIG_UPTIME_LIMIT_DURATION=14400
-CONFIG_UPTIME_LIMIT_KERNEL_REBOOT=y
diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend
b/meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend
index f580168..3008512 100644
--- a/meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1 +1,2 @@
-require ${PN}_tlk.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_append = " file://time-limited-kernel.cfg"
diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
b/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
deleted file mode 100644
index f4c0db3..0000000
--- a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
-SRC_URI_append = " file://time-limited-kernel.cfg"
--
_______________________________________________
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
