From 99737b39a622ccd0eddfb7ff3916cf0389909832 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Tue, 30 May 2017 15:04:17 -0700 Subject: 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 Signed-off-by: Saul Wold --- 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 00000000..44f4beaa --- /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 44f4beaa..00000000 --- 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 f5801680..30085121 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 f4c0db32..00000000 --- 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" -- cgit v1.2.3-54-g00ecf