diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2017-05-30 15:04:17 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-07-07 16:45:25 -0700 |
commit | 99737b39a622ccd0eddfb7ff3916cf0389909832 (patch) | |
tree | 5700b41c45b6a7e2e63661451a2cc2b796f9215b | |
parent | 7d4813ef84dedc546be8620fcd5f93e6dbe422e2 (diff) | |
download | meta-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_%.bbappend | 3 | ||||
-rw-r--r-- | meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc | 2 |
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 44f4beaa..44f4beaa 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 f5801680..30085121 100644 --- a/meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend | |||
@@ -1 +1,2 @@ | |||
1 | require ${PN}_tlk.inc | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 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 f4c0db32..00000000 --- a/meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" | ||
2 | SRC_URI_append = " file://time-limited-kernel.cfg" | ||