aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-kernel
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-01-13 15:34:05 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2015-01-13 15:34:05 +0200
commiteff1ca92efd40f5ab12ad6b4f9040a440668e24e (patch)
tree0626f91cad78c836e8189cbd2431c1418b9e0b73 /meta-linaro/recipes-kernel
parente4548a1441db09344e4d4fc53eeda4f7811510c6 (diff)
downloadmeta-linaro-eff1ca92efd40f5ab12ad6b4f9040a440668e24e.tar.gz
linaro-lng: fix build failure on LNG x86 machines
merge_config.sh is used to generate the kernel config file. change to kernel source directory for do_configure_prepend() Change-Id: Iacb6d44501eccec5f003111d0f0973ad896d529e Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-kernel')
-rw-r--r--meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_git.bb18
-rw-r--r--meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_git.bb17
-rw-r--r--meta-linaro/recipes-kernel/linux/linaro-lng.inc25
3 files changed, 30 insertions, 30 deletions
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_git.bb b/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_git.bb
index cd75e84f..548a9327 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_git.bb
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng-rt-x86-64_git.bb
@@ -1,9 +1,19 @@
DESCRIPTION = "Linaro LNG Kernel For x86"
-
-require linaro-lng.inc
-
PV = "3.14+git${SRCPV}"
-inherit kernel siteinfo
+require linaro-lng.inc
SRC_URI = "git://git.linaro.org/kernel/linux-linaro-lng.git;branch=linux-linaro-lng-v3.14-rt"
+
+do_configure_prepend() {
+ cd ${S}
+ scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
+ linaro/configs/hugepage.conf linaro/configs/preempt-rt.conf \
+ linaro/configs/ovs.conf linaro/configs/kvm-host.conf \
+ linaro/configs/no_hz_full.conf
+ scripts/config -e CONFIG_DEVTMPFS
+ scripts/config -e CONFIG_DEVTMPFS_MOUNT
+ scripts/config -e CONFIG_E1000E
+ scripts/config -e CONFIG_IXGBE
+ cd ${B}
+}
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_git.bb b/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_git.bb
index 334acbd9..b2d3182b 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_git.bb
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng-x86-64_git.bb
@@ -1,9 +1,18 @@
DESCRIPTION = "Linaro LNG Kernel For x86"
-
-require linaro-lng.inc
-
PV = "3.14+git${SRCPV}"
-inherit kernel siteinfo
+require linaro-lng.inc
SRC_URI = "git://git.linaro.org/kernel/linux-linaro-lng.git;branch=linux-linaro-lng-v3.14"
+
+do_configure_prepend() {
+ cd ${S}
+ scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
+ linaro/configs/hugepage.conf linaro/configs/ovs.conf \
+ linaro/configs/kvm-host.conf linaro/configs/no_hz_full.conf
+ scripts/config -e CONFIG_DEVTMPFS
+ scripts/config -e CONFIG_DEVTMPFS_MOUNT
+ scripts/config -e CONFIG_E1000E
+ scripts/config -e CONFIG_IXGBE
+ cd ${B}
+}
diff --git a/meta-linaro/recipes-kernel/linux/linaro-lng.inc b/meta-linaro/recipes-kernel/linux/linaro-lng.inc
index 00ea5238..62d5d847 100644
--- a/meta-linaro/recipes-kernel/linux/linaro-lng.inc
+++ b/meta-linaro/recipes-kernel/linux/linaro-lng.inc
@@ -2,30 +2,11 @@ DESCRIPTION = "Linaro LNG Kernel Basic support recipe"
SECTION = "kernel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
SRCREV = "${AUTOREV}"
SRCREV_FORMAT = "kernel"
-S = "${WORKDIR}/git"
-COMPATIBLE_MACHINE = "(lng-x86-64|lng-rt-x86-64)"
+inherit kernel siteinfo
-do_configure_prepend_lng-x86-64() {
- scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
- linaro/configs/hugepage.conf linaro/configs/ovs.conf \
- linaro/configs/kvm-host.conf linaro/configs/no_hz_full.conf
- scripts/config -e CONFIG_DEVTMPFS
- scripts/config -e CONFIG_DEVTMPFS_MOUNT
- scripts/config -e CONFIG_E1000E
- scripts/config -e CONFIG_IXGBE
-}
+S = "${WORKDIR}/git"
-do_configure_prepend_lng-rt-x86-64() {
- scripts/kconfig/merge_config.sh -m arch/x86/configs/x86_64_defconfig \
- linaro/configs/hugepage.conf linaro/configs/preempt-rt.conf \
- linaro/configs/ovs.conf linaro/configs/kvm-host.conf \
- linaro/configs/no_hz_full.conf
- scripts/config -e CONFIG_DEVTMPFS
- scripts/config -e CONFIG_DEVTMPFS_MOUNT
- scripts/config -e CONFIG_E1000E
- scripts/config -e CONFIG_IXGBE
-}
+COMPATIBLE_MACHINE = "(lng-x86-64|lng-rt-x86-64)"