linux-yocto/3.14: aufs, edgerouter and -rt

PATCH New Bruce Ashfield 1 participant 2 messages Apr 12, 2014

lore

Share & tools

lore

Bruce Ashfield

author

2014-04-12 04:10 UTC #0 lore raw

cover linux-yocto/3.14: aufs, edgerouter and -rt

Richard,

Stemming from a thread about defconfigs not being applied, I realized that in my final integration of aufs the patch which actually linked it into the kernel build was dropped. As such, it hasn't been building for the past week or so.

I've restored that patch, and built for all arches, so aufs is active again.

We also have a minor config update to get rid of a warning that was reported with the RTC in the edgerouter during boot.

And finally, we got lucky and a 3.14 -rt was released today. The changes are completely isolated on the preempt-rt/* branches and cannot impact any existing BSPs. So there's no reason to not merge them, and introduce the 3.14 variant of the recipe. I've already built and booted -rt on the qemu boards, so it is sane and ready to go.

Cheers,

Bruce

The following changes since commit e63348fb8cc827d0472981e80e9884ceaafc9ffd:

ref-manual: Edits to DISK_SIGNATURE variable. (2014-04-11 18:22:51 +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 (1):
linux-yocto/3.14: aufs, edgerouter config and -rt

 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   | 27 ++++++++++++++++++++++
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 16 ++++++-------
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb

Signature · 1 line

1.8.1.2

Bruce Ashfield

author

2014-04-12 04:10 UTC #1 lore raw

PATCH 1/1 linux-yocto/3.14: aufs, edgerouter config and -rt

Updating the 3.14 SRCREVs to import the following changes:

- enable AUFS: a missing Kbuild patch was preventing aufs from compiling
- edgerouter: remove RTC configuration options
- preempt-rt recipe. The patch for 3.14 is availble, so we populate the recipe.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   | 27 ++++++++++++++++++++++
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 16 ++++++-------
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb

meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb new file +27 -0

new file mode 100644
index 000000000000..bc447c14fcc4
@@ -0,0 +1,27 @@
+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"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
+
+LINUX_VERSION ?= "3.14"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "meta"
+
+LINUX_KERNEL_TYPE = "preempt-rt"
+
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
+KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"

+KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +2 -2

index a441a53fb95b..c4cd331ab789 100644
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
-SRCREV_meta ?= "928d7b2ddad0abc8827055c51ba34225878344a0"
+SRCREV_machine ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
+SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.14.bb +8 -8

index 7f0ec2b559a3..2c2cace0dd41 100644
@@ -10,14 +10,14 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "c966987f88a0ee5753c3dee87e7a962d0cad5376"
-SRCREV_machine_qemumips ?= "61811c215c601ee96ccbf79333bbc73482b0f017"
-SRCREV_machine_qemuppc ?= "0d5cf5e938f4e6d3c6a398e98c8ece3ce05539f7"
-SRCREV_machine_qemux86 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
-SRCREV_machine_qemux86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
-SRCREV_machine_qemumips64 ?= "ccb2a788551a7951563ac44a27175c6f28501008"
-SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
-SRCREV_meta ?= "928d7b2ddad0abc8827055c51ba34225878344a0"
+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"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

Signature · 1 line

1.8.1.2