diff options
author | Denys Dmytriyenko <denys@ti.com> | 2014-05-23 23:13:47 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2014-05-23 23:13:47 -0400 |
commit | afabec7ba33b2b24298481d3325147b0f29a17fc (patch) | |
tree | dbdebede354adcc71a42f555285f7a481f1783c0 | |
parent | 5548cad9ffb24e06f645c6c8ff843ba1b79c290d (diff) | |
download | meta-ti-afabec7ba33b2b24298481d3325147b0f29a17fc.tar.gz |
linux-ti-staging: fix _append/_prepend logic in prev changes
* Add a missing space to KERNEL_CONFIG_FRAGMENTS_append
* Use FILESEXTRAPATHS_prepend instead of _append version
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.12.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.15.bb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb index cb289c4e..90dab23b 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.12.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb | |||
@@ -9,7 +9,7 @@ require recipes-kernel/linux/linux-dtb.inc | |||
9 | require recipes-kernel/linux/setup-defconfig.inc | 9 | require recipes-kernel/linux/setup-defconfig.inc |
10 | 10 | ||
11 | # Look in the generic major.minor directory for files | 11 | # Look in the generic major.minor directory for files |
12 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}-3.12:" | 12 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.12:" |
13 | 13 | ||
14 | # Pull in the devicetree files into the rootfs | 14 | # Pull in the devicetree files into the rootfs |
15 | RDEPENDS_kernel-base += "kernel-devicetree" | 15 | RDEPENDS_kernel-base += "kernel-devicetree" |
diff --git a/recipes-kernel/linux/linux-ti-staging_3.15.bb b/recipes-kernel/linux/linux-ti-staging_3.15.bb index 308a4125..a55b581f 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.15.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.15.bb | |||
@@ -9,7 +9,7 @@ require recipes-kernel/linux/linux-dtb.inc | |||
9 | require recipes-kernel/linux/setup-defconfig.inc | 9 | require recipes-kernel/linux/setup-defconfig.inc |
10 | 10 | ||
11 | # Look in the generic major.minor directory for files | 11 | # Look in the generic major.minor directory for files |
12 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}-3.15:" | 12 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.15:" |
13 | 13 | ||
14 | # Pull in the devicetree files into the rootfs | 14 | # Pull in the devicetree files into the rootfs |
15 | RDEPENDS_kernel-base += "kernel-devicetree" | 15 | RDEPENDS_kernel-base += "kernel-devicetree" |
@@ -48,8 +48,8 @@ PR = "${MACHINE_KERNEL_PR}" | |||
48 | 48 | ||
49 | KERNEL_CONFIG_DIR = "ti_config_fragments" | 49 | KERNEL_CONFIG_DIR = "ti_config_fragments" |
50 | KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/ipc.cfg" | 50 | KERNEL_CONFIG_FRAGMENTS = "${WORKDIR}/ipc.cfg" |
51 | KERNEL_CONFIG_FRAGMENTS_append_ti33x = "${WORKDIR}/non-smp.cfg" | 51 | KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${WORKDIR}/non-smp.cfg" |
52 | KERNEL_CONFIG_FRAGMENTS_append_ti43x = "${WORKDIR}/non-smp.cfg" | 52 | KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${WORKDIR}/non-smp.cfg" |
53 | 53 | ||
54 | SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ | 54 | SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ |
55 | file://defconfig \ | 55 | file://defconfig \ |