From: California Sullivan <[email protected]> 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 <[email protected]> Signed-off-by: Saul Wold <[email protected]> --- .../linux/{linux-yocto => files}/time-limited-kernel.cfg | 0 meta-tlk/recipes-kernel/linux/linux-yocto_%.bbappend | 3 ++- meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename meta-tlk/recipes-kernel/linux/{linux-yocto => files}/time-limited-kernel.cfg (100%) delete mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_tlk.inc 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 similarity index 100% rename from meta-tlk/recipes-kernel/linux/linux-yocto/time-limited-kernel.cfg rename to 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 @@ -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" -- 2.7.5 -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
