[meta-lsi] [PATCH 11/41] linux-yocto-3.4: use configuration fragments selectively
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Jan 28 04:29:14 PST 2016
From: Cristian Bercaru <cristian.bercaru at windriver.com>
This patch modified the yocto recipes for linux kernel 3.4 such that
- When compiling the kernel from github private and public
repositories the defconfigs from meta-lsi are used.
- When compiling the kernel from the yocto repository, configuration
fragments are used to build the defconfigs. The fragments are taken
from the meta branches of the repository and from the meta-lsi layer.
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 6 +-----
recipes-kernel/linux/linux-yocto-rt_3.4.inc | 11 +++++++----
recipes-kernel/linux/linux-yocto_3.4.bbappend | 10 ++++------
recipes-kernel/linux/linux-yocto_3.4.inc | 9 +++++++--
recipes-kernel/linux/lsi-public-rt_3.4.inc | 8 ++++++--
recipes-kernel/linux/lsi-public_3.4.inc | 8 ++++++--
recipes-kernel/linux/lsi-tip-rt_3.4.inc | 6 +++++-
recipes-kernel/linux/lsi-tip_3.4.inc | 6 +++++-
8 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index c941a5c..dbdd715 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -3,10 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${KARCH}:${THISDIR}:"
LINUX_KERNEL_TYPE = "preempt-rt"
LSI_SRC ?= "linux-yocto"
KV = "3.4"
+KERNEL_EXTRA_FEATURES = ""
require ${LSI_SRC}-rt_3.4.inc
-
-SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-
-SRC_URI += "file://defconfig"
-SRC_URI += "file://fit"
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.4.inc b/recipes-kernel/linux/linux-yocto-rt_3.4.inc
index 58d045a..0e031e4 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.4.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.4.inc
@@ -3,9 +3,12 @@ require linux-yocto.inc
LINUX_VERSION = "3.4.91"
-#KBRANCH = "standard/preempt-rt/axxia/base"
-KBRANCH = "standard/axxia/base"
+KBRANCH = "standard/preempt-rt/axxia/base"
KREPO = "git://git.yoctoproject.org/linux-yocto-3.4.git"
-SRCREV_machine = "6d3786b9fc093b7fffd5f0b4434e5a2d7e08d781"
-SRCREV_meta = "a8742041c8b9f447d4ad4c3f478e022f1e4bfcfd"
+SRCREV_machine = "875653fbfa0664859bc014ce547874116b044d64"
+SRCREV_meta = "5da29766338644adce97d3ab0c8be7f8e4e746bd"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/linux-yocto_3.4.bbappend b/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 3376a43..fff3513 100644
--- a/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,12 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${KARCH}:${THISDIR}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}:\
+${THISDIR}/${PN}/linux-3.4/${KARCH}:\
+${THISDIR}/conf/linux-3.4/${MACHINE}:"
LINUX_KERNEL_TYPE = "standard"
LSI_SRC ?= "linux-yocto"
KV = "3.4"
+KERNEL_EXTRA_FEATURES = ""
require ${LSI_SRC}_3.4.inc
-
-SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-
-SRC_URI += "file://defconfig"
-SRC_URI += "file://fit"
diff --git a/recipes-kernel/linux/linux-yocto_3.4.inc b/recipes-kernel/linux/linux-yocto_3.4.inc
index 79192bc..e37f0e2 100644
--- a/recipes-kernel/linux/linux-yocto_3.4.inc
+++ b/recipes-kernel/linux/linux-yocto_3.4.inc
@@ -4,7 +4,12 @@ require linux-yocto.inc
LINUX_VERSION = "3.4.91"
KBRANCH = "standard/axxia/base"
+KMETA = "meta"
KREPO = "git://git.yoctoproject.org/linux-yocto-3.4.git"
-SRCREV_machine = "6d3786b9fc093b7fffd5f0b4434e5a2d7e08d781"
-SRCREV_meta = "a8742041c8b9f447d4ad4c3f478e022f1e4bfcfd"
+SRCREV_machine = "2991cb14f151762ba0856facf600c18eaf3ee382"
+SRCREV_meta = "5da29766338644adce97d3ab0c8be7f8e4e746bd"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://standard.scc"
diff --git a/recipes-kernel/linux/lsi-public-rt_3.4.inc b/recipes-kernel/linux/lsi-public-rt_3.4.inc
index 0c02538..ed5ec01 100644
--- a/recipes-kernel/linux/lsi-public-rt_3.4.inc
+++ b/recipes-kernel/linux/lsi-public-rt_3.4.inc
@@ -1,11 +1,15 @@
require linux-yocto.inc
-LSI_KERNEL_TAG = "7.8.1.41"
+LSI_KERNEL_TAG = "7.8.1.42"
LINUX_VERSION = "3.4.88-${LSI_KERNEL_TAG}"
KBRANCH = "standard/preempt-rt/lsi/base"
KREPO = "git://github.com/lsigithub/lsi_axxia_yocto_public.git"
-SRCREV_machine="9f93c826370adecdcd5cbe6de7d5761f6062b258"
+SRCREV_machine="b657b7007e802521ea062c47cd65d23488cdc28d"
SRCREV_meta="03cd6f841fd2566b033db19eb6665228ea406adf"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-public_3.4.inc b/recipes-kernel/linux/lsi-public_3.4.inc
index 78f2431..b1fbcf0 100644
--- a/recipes-kernel/linux/lsi-public_3.4.inc
+++ b/recipes-kernel/linux/lsi-public_3.4.inc
@@ -1,11 +1,15 @@
require linux-yocto.inc
-LSI_KERNEL_TAG = "7.8.1.41"
+LSI_KERNEL_TAG = "7.8.1.42"
LINUX_VERSION = "3.4.88-${LSI_KERNEL_TAG}"
KBRANCH = "standard/lsi/base"
KREPO = "git://github.com/lsigithub/lsi_axxia_yocto_public.git"
-SRCREV_machine="7b725b5147553a4f4013daf0e9dcf2dd46f94f4c"
+SRCREV_machine="cf69c445b907ed2b9e2a5f6621656fb4b2a4f6fb"
SRCREV_meta="03cd6f841fd2566b033db19eb6665228ea406adf"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.4.inc b/recipes-kernel/linux/lsi-tip-rt_3.4.inc
index d7fd7df..cdf212b 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.4.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.4.inc
@@ -8,4 +8,8 @@ KBRANCH = "standard/preempt-rt/lsi/base"
KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto.git;protocol=ssh"
SRCREV_machine="${AUTOREV}"
-SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRCREV_meta="${AUTOREV}"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_3.4.inc b/recipes-kernel/linux/lsi-tip_3.4.inc
index 392d485..ca07f56 100644
--- a/recipes-kernel/linux/lsi-tip_3.4.inc
+++ b/recipes-kernel/linux/lsi-tip_3.4.inc
@@ -8,4 +8,8 @@ KBRANCH = "standard/lsi/base"
KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto.git;protocol=ssh"
SRCREV_machine="${AUTOREV}"
-SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRCREV_meta="${AUTOREV}"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
--
1.9.1
More information about the meta-lsi
mailing list