[PATCH 1/2] poky-tiny: Update kernel version to 3.14

[PATCH 1/2] poky-tiny: Update kernel version to 3.14

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta-yocto/conf/distro/poky-tiny.conf              | 2 +-
 meta-yocto/recipes-core/busybox/busybox_%.bbappend | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
index 2548d79..3350491 100644
--- a/meta-yocto/conf/distro/poky-tiny.conf
+++ b/meta-yocto/conf/distro/poky-tiny.conf
@@ -37,7 +37,7 @@ DISTRO = "poky-tiny"
 # Distro config is evaluated after the machine config, so we have to explicitly
 # set the kernel provider to override a machine config.
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
-PREFERRED_VERSION_linux-yocto-tiny = "3.8%"
+PREFERRED_VERSION_linux-yocto-tiny = "3.14%"
 
 # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny
 #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot"
diff --git a/meta-yocto/recipes-core/busybox/busybox_%.bbappend b/meta-yocto/recipes-core/busybox/busybox_%.bbappend
index ffe8631..0005787 100644
--- a/meta-yocto/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-yocto/recipes-core/busybox/busybox_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_poky := "${THISDIR}/${P}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-- 
1.8.3.1

[PATCH 2/2] busybox: fix meta-yocto's bbappend's FILESEXTRAPATH

[Saul Wold]

The FILESEXTRAPATH was not getting used correctly since our distro
OVERRIDE is for poky-tiny, not poky, so just remove it, also we are
not using a version directory so ensure we get correct BPN (Base Package
Name).

[YOCTO #6353]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta-yocto/recipes-core/busybox/busybox_%.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto/recipes-core/busybox/busybox_%.bbappend b/meta-yocto/recipes-core/busybox/busybox_%.bbappend
index 0005787..ffe8631 100644
--- a/meta-yocto/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-yocto/recipes-core/busybox/busybox_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS_prepend_poky := "${THISDIR}/${P}:"
 
-- 
1.8.3.1