Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 7 messages May 5, 2014

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/6 kernel-yocto: quote kconfig mode check

In reply to Bruce Ashfield

We allow inheriting recipes to control the kconfig mode used by merge_config.sh via the KCONFIG_MODE variable. An error crept into the variable reference, and since it is not quoted, the true condition always runs.

The result is that operations without an explicit kconfig mode cannot trigger allnoconfig for defconfig builds, which can result in some options being dropped from the final .config.

Quoting the reference allows it to evaluate properly.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel-yocto.bbclass +1 -1
index 53bc6d443cdb..6010dc94e026 100644
@@ -241,7 +241,7 @@ do_kernel_configme() {
 	echo "[INFO] doing kernel configme"
 	export KMETA=${KMETA}
 
-	if [ -n ${KCONFIG_MODE} ]; then
+	if [ -n "${KCONFIG_MODE}" ]; then
 		configmeflags=${KCONFIG_MODE}
 	else
 		# If a defconfig was passed, use =n as the baseline, which is achieved
Signature · 1 line
1.8.1.2
author
#3 lore raw

PATCH 3/6 linux-yocto/3.4: update to v3.4.88

In reply to Bruce Ashfield

Updating the 3.4 SRCREVs to import the korg v3.4.88 -stable release.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +4 -4
index dc3813ca6d00..493317c38275 100644
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.85"
+LINUX_VERSION ?= "3.4.88"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "fd1626cc2a1144a7760bcfc9c6e48a14de28624e"
-SRCREV_machine_qemuppc ?= "605cdff89f2d36d44ebfc75d6427eea5f236a940"
-SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e"
+SRCREV_machine ?= "990282c0af215b2d4261c5c6dacbb27d7248f4f4"
+SRCREV_machine_qemuppc ?= "c1d13a32b44fab908fe821f67ac7947195385652"
+SRCREV_meta ?= "03cd6f841fd2566b033db19eb6665228ea406adf"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +3 -3
index f22a3f46a0b9..4639a90dd53c 100644
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.4.85"
+LINUX_VERSION ?= "3.4.88"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e"
-SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e"
+SRCREV_machine ?= "2ab0a0cc26d2fc3e59f66a27e8a6de8bd608a2d5"
+SRCREV_meta ?= "03cd6f841fd2566b033db19eb6665228ea406adf"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.4.bb +8 -8
index 3a2ff2f50417..4f959226853a 100644
@@ -11,17 +11,17 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "64f9a290683b1ab08136ef5d54d1845a961a6940"
-SRCREV_machine_qemumips  ?= "ad7aa3ecf8ab00055d31c3f7b059c8b8a8633e19"
-SRCREV_machine_qemuppc ?= "7aaa5a4debe4b1987d2d11707313e682b185e876"
-SRCREV_machine_qemux86 ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e"
-SRCREV_machine_qemux86-64 ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e"
-SRCREV_machine ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e"
-SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e"
+SRCREV_machine_qemuarm ?= "2ed52bacbd346dac90f65138daf16c17b2fd5066"
+SRCREV_machine_qemumips  ?= "3e67c74737d97909d7ec069579fde35419a04f00"
+SRCREV_machine_qemuppc ?= "fe300607aba102ec9f567eb966ed067645966e7b"
+SRCREV_machine_qemux86 ?= "2ab0a0cc26d2fc3e59f66a27e8a6de8bd608a2d5"
+SRCREV_machine_qemux86-64 ?= "2ab0a0cc26d2fc3e59f66a27e8a6de8bd608a2d5"
+SRCREV_machine ?= "2ab0a0cc26d2fc3e59f66a27e8a6de8bd608a2d5"
+SRCREV_meta ?= "03cd6f841fd2566b033db19eb6665228ea406adf"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.4.85"
+LINUX_VERSION ?= "3.4.88"
 
 PR = "${INC_PR}.5"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.8.1.2
author
#5 lore raw

PATCH 5/6 linux-yocto/3.14: update to v3.14.2

In reply to Bruce Ashfield

Updating to the korg 3.14.2 -stable release.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +4 -4
index 330eda4f1fd1..c7b74d661d33 100644
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "b5ed38affb23ff64a0382ee0dd116ffe74c4a379"
-SRCREV_machine_qemuppc ?= "79cb133d2d1b0b816cc1cd888f4ed4ef81570793"
-SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
+SRCREV_machine ?= "c88f5ec9b328da501be970b814fbc9cc4a09fa4f"
+SRCREV_machine_qemuppc ?= "05629993752031b9de3f4792cfbd98caf60593da"
+SRCREV_meta ?= "4df1e2ed992adeac4da60ad5118d0237e8cb88df"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.14"
+LINUX_VERSION ?= "3.14.2"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +3 -3
index c4cd331ab789..2110e8a45ec0 100644
@@ -4,12 +4,12 @@ KBRANCH = "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.14"
+LINUX_VERSION ?= "3.14.2"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
-SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
+SRCREV_machine ?= "b0b9c962ea01f9356fc1542b9696ebe4a38e196a"
+SRCREV_meta ?= "4df1e2ed992adeac4da60ad5118d0237e8cb88df"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.14.bb +9 -9
index 2c2cace0dd41..5271bb016356 100644
@@ -10,18 +10,18 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "d7a5330e50f78f63789b91cb9880b38633d33450"
-SRCREV_machine_qemumips ?= "38f344fcab8c0ee29f40edb92dd6612eff4579bf"
-SRCREV_machine_qemuppc ?= "b28241db34ab66f9e86718d8c94276d65d2457bb"
-SRCREV_machine_qemux86 ?= "f9048769cc178f2f64ed492a9a649827167d9a34"
-SRCREV_machine_qemux86-64 ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
-SRCREV_machine_qemumips64 ?= "c4e08d47c5eb36ae056f2eab82a74c3638e72e06"
-SRCREV_machine ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
-SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
+SRCREV_machine_qemuarm ?= "54ecc26cb84e939753eee811395435f8a4377c86"
+SRCREV_machine_qemumips ?= "cc7b8670680fcd794dba0b21a1db1dbbda432924"
+SRCREV_machine_qemuppc ?= "5ac4b714c656323b6099e8ab435fc05903d69874"
+SRCREV_machine_qemux86 ?= "3904476fb890e014a244e1fc48342683d7ff7e0e"
+SRCREV_machine_qemux86-64 ?= "b0b9c962ea01f9356fc1542b9696ebe4a38e196a"
+SRCREV_machine_qemumips64 ?= "a9c251d64f5df58c41473ccb1d52143cc5247911"
+SRCREV_machine ?= "b0b9c962ea01f9356fc1542b9696ebe4a38e196a"
+SRCREV_meta ?= "4df1e2ed992adeac4da60ad5118d0237e8cb88df"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.14"
+LINUX_VERSION ?= "3.14.2"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.8.1.2

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here's a consolidated pull request for kernel updates and small fixes that I've queued since the 1.6 release.

The quoting issue was reporting on the mailing list, and I realized that my fix for it had never been sent, so I dusted it off and here it is.

As a side effect of that fix, and the fact that there's no way to tell between a full defconfig and a saved alldefconfig by inspection .. that offering some guidance in the example custom recipe would be nice.

Everything else is are the -stable and SRCREV updates.

Cheers,

Bruce

The following changes since commit 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3:

cleanup-workdir: Fix crosssdk reference after addition of PN (2014-05-05 09:05:42 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
kernel-yocto: quote kconfig mode check
linux-yocto-custom: provide defconfig guidance linux-yocto/3.4: update to v3.4.88 linux-yocto/3.10: update to v3.10.38 linux-yocto/3.14: update to v3.14.2 linux-yocto/3.10: mei.cfg: enable Intel chipsets

 .../recipes-kernel/linux/linux-yocto-custom.bb         | 10 ++++++++++
 meta/classes/kernel-yocto.bbclass                      |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb       |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb       |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb        |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb     |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb     |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb      |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb          | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.14.bb          | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb           | 16 ++++++++--------
 11 files changed, 58 insertions(+), 48 deletions(-)
Signature · 1 line
1.8.1.2
author
#2 lore raw

PATCH 2/6 linux-yocto-custom: provide defconfig guidance

As reported by Andrea, defconfigs created with savedefconfig should specify their expansion mode as "--alldefconfig' for custom yocto recipes. To ensure that this is documented, we can add a comment in the skeleton recipe.

Reported-by Andrea Adami <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb +10 -0
index c3291064bb15..b1a0784c1b7d 100644
@@ -32,6 +32,16 @@
 #   patches: patches can be merged into to the source git tree itself,
 #            added via the SRC_URI, or controlled via a BSP
 #            configuration.
+#
+#   defconfig: When a defconfig is provided, the linux-yocto configuration
+#              uses the filename as a trigger to use a 'allnoconfig' baseline
+#              before merging the defconfig into the build. 
+#
+#              If the defconfig file was created with make_savedefconfig, 
+#              not all options are specified, and should be restored with their
+#              defaults, not set to 'n'. To properly expand a defconfig like
+#              this, specify: KCONFIG_MODE="--alldefconfig" in the kernel
+#              recipe.
 #   
 #   example configuration addition:
 #            SRC_URI += "file://smp.cfg"
Signature · 1 line
1.8.1.2
author
#4 lore raw

PATCH 4/6 linux-yocto/3.10: update to v3.10.38

In reply to Bruce Ashfield

Updating to the korg -stable release.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +4 -4
index 4087d02f6ba5..ff1e13fe64f6 100644
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "d1e73a1e09f9641c44e7d713d1a6b5b088411459"
-SRCREV_machine_qemuppc ?= "9a34d9c957e69f28e89e879d9dd6e8fe5c7270c5"
-SRCREV_meta ?= "7df9ef8ee47dc9023044614210f4c1d9d916dd5f"
+SRCREV_machine ?= "8aa9023c5e2e2ca4180e971da9a2c139d5b3c79e"
+SRCREV_machine_qemuppc ?= "3dd7fd5d191245ab92889e69060ff732bdec770b"
+SRCREV_meta ?= "1eb79862c2959cfa305773e7f785d6d1810bf190"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.10.35"
+LINUX_VERSION ?= "3.10.38"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +3 -3
index 099655f381e3..57f12fe9ecdc 100644
@@ -5,12 +5,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.10.35"
+LINUX_VERSION ?= "3.10.38"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
-SRCREV_meta ?= "7df9ef8ee47dc9023044614210f4c1d9d916dd5f"
+SRCREV_machine ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
+SRCREV_meta ?= "1eb79862c2959cfa305773e7f785d6d1810bf190"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +9 -9
index 89263d98b91e..f6e05c2c6edf 100644
@@ -11,18 +11,18 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "7b466aae62395490769f96635bd077ee8f313f18"
-SRCREV_machine_qemumips ?= "cc5059ae360e0586375bbd1ed46e1e6f3e267dea"
-SRCREV_machine_qemuppc ?= "663a3068c9756137a84bbfb3a76eeae7cb4373e1"
-SRCREV_machine_qemux86 ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
-SRCREV_machine_qemux86-64 ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
-SRCREV_machine_qemumips64 ?= "a1491c3b367a75c7003b2fb58706e3631413b337"
-SRCREV_machine ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
-SRCREV_meta ?= "7df9ef8ee47dc9023044614210f4c1d9d916dd5f"
+SRCREV_machine_qemuarm ?= "dd18759fd19771885589066811e254852e56d421"
+SRCREV_machine_qemumips ?= "2dbb607d161aeaa8d542b128203d7a10527aec7e"
+SRCREV_machine_qemuppc ?= "92dda91b216cbacfa71fd9036413dba0d2406332"
+SRCREV_machine_qemux86 ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
+SRCREV_machine_qemux86-64 ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
+SRCREV_machine_qemumips64 ?= "ebd521c1b609b445d8baf522d71453d4c26a0440"
+SRCREV_machine ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
+SRCREV_meta ?= "1eb79862c2959cfa305773e7f785d6d1810bf190"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.10.35"
+LINUX_VERSION ?= "3.10.38"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.8.1.2
author
#6 lore raw

PATCH 6/6 linux-yocto/3.10: mei.cfg: enable Intel chipsets

In reply to Bruce Ashfield

Importing the mei meta data change from the yocto 3.14 kernel tree.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +1 -1
index ff1e13fe64f6..893d9852c08d 100644
@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "8aa9023c5e2e2ca4180e971da9a2c139d5b3c79e"
 SRCREV_machine_qemuppc ?= "3dd7fd5d191245ab92889e69060ff732bdec770b"
-SRCREV_meta ?= "1eb79862c2959cfa305773e7f785d6d1810bf190"
+SRCREV_meta ?= "617c6158c3d5b931f0d6131e0b0a7b374c792599"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 57f12fe9ecdc..7081cd18aa57 100644
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "3.10.38"
 KMETA = "meta"
 
 SRCREV_machine ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
-SRCREV_meta ?= "1eb79862c2959cfa305773e7f785d6d1810bf190"
+SRCREV_meta ?= "617c6158c3d5b931f0d6131e0b0a7b374c792599"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +1 -1
index f6e05c2c6edf..e5774f99470e 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemux86 ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRCREV_machine_qemux86-64 ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRCREV_machine_qemumips64 ?= "ebd521c1b609b445d8baf522d71453d4c26a0440"
 SRCREV_machine ?= "02f7e63e56c061617957388c23bd5cf9b05c5388"
-SRCREV_meta ?= "1eb79862c2959cfa305773e7f785d6d1810bf190"
+SRCREV_meta ?= "617c6158c3d5b931f0d6131e0b0a7b374c792599"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.8.1.2