summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-05-30 22:04:17 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-07-07 23:45:25 (GMT)
commit99737b39a622ccd0eddfb7ff3916cf0389909832 (patch)
tree5700b41c45b6a7e2e63661451a2cc2b796f9215b
parent7d4813ef84dedc546be8620fcd5f93e6dbe422e2 (diff)
downloadmeta-intel-99737b39a622ccd0eddfb7ff3916cf0389909832.tar.gz
meta-tlk: merge linux-yocto_tlk.inc with bbappend
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.sullivan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg (renamed from meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg)0
-rw-r--r--meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend3
-rw-r--r--meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc2
3 files changed, 2 insertions, 3 deletions
diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg b/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
index 44f4bea..44f4bea 100644
--- a/meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg
+++ b/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
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 @@
1require ${PN}_tlk.inc 1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2SRC_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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
2SRC_URI_append = " file://time-limited-kernel.cfg"