Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH In review Bruce Ashfield 2 participants 8 messages Apr 13, 2016 – Apr 15, 2016

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull request

Hi all,

This series contains some changes that I've been gathering over the past week. Nothing serious, just BSP mainline backports, configuration tweaks to tiny (for usability) and a change to make aufs4 opt-in (versus always on).

I've built and booted this for qemu* (standard and -rt).

Cheers,

Bruce

The following changes since commit e912c468875ffea7e8070cb7813bca262d1cbb0b:

kbd: remove uclibc-stdarg.patch (2016-04-13 10:12:53 +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 (5):
linux-yocto/4.4: gpio-pca953x: fix the "drive" property cannot
read/write
linux-yocto/4.1: mainline SPI backports linux-yocto/4.4: BXT enablement
linux-yocto: tiny and pin ctrl config updates
linux-yocto: make aufs4 optional

 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 18 +++++++++---------
 6 files changed, 26 insertions(+), 26 deletions(-)
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 1/5 linux-yocto/4.4: gpio-pca953x: fix the "drive" property cannot read/write

The gpio_drive_show/store use incorrect gpio_desc, this causes the drive sysfs property cannot be used, This patch fixes this issue

Upstream-status: Inappropriate, custom code for legacy userspace

Signed-off-by Yong Li <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1
index 87b46e48c5ea..9ae4174f96cc 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "8611de4e967b16bd5b63714045329d621ee744d0"
+SRCREV_machine ?= "d5a75e64945b378d22b136d8c33a1e9120c3bbb9"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +1 -1
index 9bae4faeb0f9..b6a5fea6cb0d 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.4.3"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
+SRCREV_machine ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.4.bb +8 -8
index 7aeb7c35db23..8a9e67126645 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "8809b2c36a60829bb9a7c3b04cdf42e95d8e93ae"
-SRCREV_machine_qemuarm64 ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
-SRCREV_machine_qemumips ?= "6a62ed62536c0f50050e24ee385b9e3965d43c97"
-SRCREV_machine_qemuppc ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
-SRCREV_machine_qemux86 ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
-SRCREV_machine_qemux86-64 ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
-SRCREV_machine_qemumips64 ?= "c61be23279c09c6906571de734b583dc7eacedc6"
-SRCREV_machine ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
+SRCREV_machine_qemuarm ?= "a1201019dd589ee33964da46a8402c7e00133ee2"
+SRCREV_machine_qemuarm64 ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
+SRCREV_machine_qemumips ?= "2f8a14c3f7c6372b00bfa4fea186f277d8125963"
+SRCREV_machine_qemuppc ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
+SRCREV_machine_qemux86 ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
+SRCREV_machine_qemux86-64 ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
+SRCREV_machine_qemumips64 ?= "b65cb9e6c3ed6e8f97150d4de0f651c7cd1c4fdf"
+SRCREV_machine ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
Signature · 1 line
2.5.0
author
#2 lore raw

PATCH 2/5 linux-yocto/4.1: mainline SPI backports

In reply to Bruce Ashfield

Backporting SPI changes for the Broxton and Apollo lake:

91f62d4a0a31 spi: pxa2xx: derive struct chip_data from struct drv_data a9ed63a84921 spi: pxa2xx: Remove CONFIG_SPI_PXA2XX_DMA
f218d99d91ad spi: pxa2xx: Remove redundant call to lpss_ssp_setup() in probe c02fa78f26b3 spi: pxa2xx: Rework self-initiated platform data creation for non-ACPI 7e576a63daf8 spi: pxa2xx: Add support for Intel Broxton
5afb534233ea spi: pxa2xx: Detect number of enabled Intel LPSS SPI chip select signals 9dfe49803d54 spi: pxa2xx: Add output control for multiple Intel LPSS chip selects c3ea9f8cb427 spi: pxa2xx: Use LPSS prefix for defines that are Intel LPSS specific 769387d447c6 spi: pxa2xx: Align a few defines
c4d5f4b2c5e1 spi: pxa2xx: Save other reg_cs_ctrl bits when configuring chip select cef6fd04c480 spi: pxa2xx: Convert unique ID string of ACPI device as unsigned integer 5cd1fcbbe756 spi: pxa2xx: move debug messages to pump_transfer() 86d77af087c1 spi: pxa2xx: choose closest lower speed
b92f9ddf2a03 spi: pxa2xx: Remove unused psp member variable from struct chip_data eead50ab6d02 spi: pxa2xx: Remove empty function pxa2xx_spi_dma_resume() 59956c05a4c1 spi: pxa2xx: Use ACPI_COMPANION() instead of acpi_bus_get_device() 362498a7e09b spi: pxa2xx: Set the max_speed_hz of the master 34b9b6d72a6e spi: pxa2xx: Remove cr0 variable from struct chip_data 906a045e325a spi: pxa2xx: Remove if statement that is always true in pump_transfers() 9dcbad25be03 spi: pxa2xx: Remove two variables from struct chip_data 3a166657678e spi: pxa2xx: Add terminating entry for pxa2xx_spi_pci_compound_match f8912dd06280 spi: spi-pxa2xx: Remove unused legacy PXA DMA API channel numbers b75adec5ab03 spi: pxa2xx: Add support for Intel Sunrisepoint 54f13620b12e spi: spi-pxa2xx: Remove clk.h include
c4dcefa9a892 spi: pxa2xx: Constify ACPI device ids
e1deb5e11adc spi: spi-pxa2xx: remove legacy PXA DMA bits
1cae65e20310 spi: pxa2xx: Make LPSS SPI general register optional dffc716a7725 spi: pxa2xx: Prepare for new Intel LPSS SPI type 9641b2e46b6a spi: pxa2xx: Differentiate Intel LPSS types

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1
index 304b0dd2ef0e..521eff41246a 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "8380fdf86b5d1ff542153e647f2ded0026a91852"
+SRCREV_machine ?= "28d8cfdbcb18a6eef202099cca66430fd3b6eae0"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +1 -1
index 22a8dbee4b38..62cf57d49536 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
+SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.1.bb +8 -8
index 5682b66a1240..d8e864394f57 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "75d5fa3b94efe0eb2101946d51015ce5bdc126cf"
-SRCREV_machine_qemuarm64 ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
-SRCREV_machine_qemumips ?= "5b7969dfff341c7d81b3726e0bb100cafa1cbfa1"
-SRCREV_machine_qemuppc ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
-SRCREV_machine_qemux86 ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
-SRCREV_machine_qemux86-64 ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
-SRCREV_machine_qemumips64 ?= "a3a35132a724752464ee13b10432cbdb2a110404"
-SRCREV_machine ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
+SRCREV_machine_qemuarm ?= "232e2d88841c7e20857350275d80f5585ed93734"
+SRCREV_machine_qemuarm64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
+SRCREV_machine_qemumips ?= "7d3690c0762f11e038f14310a50ca1cdc813cc22"
+SRCREV_machine_qemuppc ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
+SRCREV_machine_qemux86 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
+SRCREV_machine_qemux86-64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
+SRCREV_machine_qemumips64 ?= "b71e4cd7d45f03048ad31e2a36dfe5a43f021b51"
+SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
Signature · 1 line
2.5.0
author
#3 lore raw

PATCH 3/5 linux-yocto/4.4: BXT enablement

In reply to Bruce Ashfield

ASoC HDMI audio backports + mmc fixes backports + misc enablement changes (all backports):

db28bb1e7a68 async: export current_is_async()
e89355d51cc4 PM / runtime: Add new helper for conditional usage count incrementation dcf8de0931b1 ALSA: hda - hdmi defer to register acomp eld notifier
da1bcdb4415e ALSA: hda - Allow i915 binding later in codec driver
fb95901a1724 ALSA: hda - Enable audio component for old Intel PCH devices 0a082020f0c4 ALSA: hda - Autosuspend controller after probe even if codecs are already suspended 7f7608752b37 ALSA: hda - hdmi add wmb barrier for audio component
7a32403bb06f ALSA: hdac: add snd_hdac_ext_bus_link_power_up_all
0d593c9fcf75 ALSA: hdac: Add support for hda DMA Resume capability
e453b7e42563 ALSA: hdac: structure definition for ext_dma_params
da5b15cea3a0 drm/edid: Add API to help find connection type
723224e90dfe ASoC: hdac_hdmi: Fix codec power state in S3 during playback 006d407c400d ASoC: hdac_hdmi: Fix to use dev_pm ops instead soc pm
149316f63e17 ASoC: hdac_hdmi: Add broxton device ID
f94dc80e4ac5 ASoC: hdac_hdmi: Fix infoframe programming
623b2f9b33f1 ASoC: hdac_hdmi: Add PM support
9d0c9e8114f8 ASoC: hdac_hdmi: Fix to reconfigure registers in runtime resume 4afb4f7a3760 ASoC: hdac_hdmi: Don't fail in dai startup to make userland happy ec497d3f13c3 ASoC: hdac_hdmi: Enable playback on all enumerated ports d94da5c4fe3b ASoC: hdac_hdmi: Apply constraints based on ELD
401a43cac5a4 ASoC: hdac_hdmi: Fix to wait for D3 before powering off codec 69fd08bfd8a8 ASoC: hdac_hdmi: Fix to keep codec power active during enumeration. fe945a86a8c8 ASoC: hdac_hdmi: Fix possible memory leak in hw_params
2e2a20f383c4 ASoC: hdac_hdmi: Remove 'edev' NULL check
9f781dd80b54 ASoC: hdac_hdmi: Add infoframe support for dp audio
b8110510884a ASoC: hdac_hdmi: Add jack reporting
1cdebc2d6e78 ASoC: hdac_hdmi: Create widget/route based on nodes enumerated 73b4b1dc5b63 ASoC: hdac_hdmi: create dais based on number of cvts
e59b34525953 ASoC: hdac_hdmi: Enable DP1.2 and all converters/pins
760989e722ef ASoC: hdac_hdmi: Add hotplug notification and read ELD
30364a5601ae ASoC: hdac_hdmi: remove unused hdac_hdmi_query_pin_connlist 2764583d744e ASoC: hdac_hdmi: Use list to add pins and converters
9458ca02aa7e ASoC: hdac_hdmi: Fix to warn instead of err for no connected nids 477a88699c5e ASoC: hdac_hdmi: Fix to check num nodes correctly
acdc6421f720 ASoC: hdac_hdmi: use dev_to_hdac_dev and to_ehdac_device bd4ba9cdf188 ASoC: hdac_hdmi: check error return
b6898f18eaca ASoC: hdac_hdmi: fix possible NULL dereference
4836a9c5bc4e ASoC: hdac_hdmi: Use i915 component framework for PM
c70f3eab8f81 ASoC: hdac_hdmi: Setup and start infoframe
f0f09f63f4f5 ASoC: hdac_hdmi: Add hdac hdmi dai ops
4bab2c42e58a ASoC: hdac_hdmi: Add PM support for HDMI
d1237b8c1a21 ASoC: hdac-hdmi: Add hdmi driver
0e0a7bb86eb8 mei: me: add broxton pci device ids
2af333b2beee usb: xhci: applying XHCI_PME_STUCK_QUIRK to Intel BXT B0 host 7ae2e3bce771 dmaengine: idma64: set maximum allowed segment size for DMA 53e822a3c638 dmaengine: idma64: drop IRQ enable / disable in handler 97e4071b6885 spi: pxa2xx: Fix too early chipselect deassert
46cc317c74dd i2c: designware: remove redundant lock
03a6b1c85e0a i2c: designware: Prevent runtime suspend during adapter registration d5da4042ad5b mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers c3d97cf9fe19 mmc: sdhci-pci: Do not set DMA mask in enable_dma()
f20ad778b58e mmc: sdhci-pci: Do not default to 33 Ohm driver strength for Intel SPT ca9a77c6869b mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout 74982dc84940 mmc: sdhci-acpi: Fix card detect race for Intel BXT/APL 8017269a25bf mmc: sdhci-pci: Fix card detect race for Intel BXT/APL
b532b30c3e41 mmc: sdhci: Allow override of get_cd() called from sdhci_request() 9e96c0c00221 mmc: sdhci: Allow override of mmc host operations
0148b3601f29 gpio-pca953x: fix the "drive" property cannot read/write

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1
index 9ae4174f96cc..eb830ef4c49b 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "d5a75e64945b378d22b136d8c33a1e9120c3bbb9"
+SRCREV_machine ?= "328830680bc35257c83fc400d9d8e2ae94d86f77"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +1 -1
index b6a5fea6cb0d..00bdcf74d33d 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.4.3"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
+SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.4.bb +8 -8
index 8a9e67126645..76d45f7e9ac5 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "a1201019dd589ee33964da46a8402c7e00133ee2"
-SRCREV_machine_qemuarm64 ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
-SRCREV_machine_qemumips ?= "2f8a14c3f7c6372b00bfa4fea186f277d8125963"
-SRCREV_machine_qemuppc ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
-SRCREV_machine_qemux86 ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
-SRCREV_machine_qemux86-64 ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
-SRCREV_machine_qemumips64 ?= "b65cb9e6c3ed6e8f97150d4de0f651c7cd1c4fdf"
-SRCREV_machine ?= "0148b3601f29b159b4f84c1478ff1859bbd48efe"
+SRCREV_machine_qemuarm ?= "d0dae8a98254e7ddd8d9be107e33c3a492bccdae"
+SRCREV_machine_qemuarm64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
+SRCREV_machine_qemumips ?= "9024e9c842557e258a88470f8b1a772df18d9813"
+SRCREV_machine_qemuppc ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
+SRCREV_machine_qemux86 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
+SRCREV_machine_qemux86-64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
+SRCREV_machine_qemumips64 ?= "88fb42ec863d20ccde57dd35da06d6221cfb4c03"
+SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
Signature · 1 line
2.5.0
author
#4 lore raw

PATCH 4/5 linux-yocto: tiny and pin ctrl config updates

In reply to Bruce Ashfield

Merging the following two commits:

ab0d998117cc ktypes/tiny/tiny.cfg: support /proc/sys 349e9ce59f7b features: enable pinctrl driver for Broxton

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1
index 521eff41246a..a1389572766b 100644
@@ -3,7 +3,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 require recipes-kernel/linux/linux-yocto.inc
 
 SRCREV_machine ?= "28d8cfdbcb18a6eef202099cca66430fd3b6eae0"
-SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
+SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1
index eb830ef4c49b..cb245eeb913a 100644
@@ -3,7 +3,7 @@ KBRANCH ?= "standard/preempt-rt"
 require recipes-kernel/linux/linux-yocto.inc
 
 SRCREV_machine ?= "328830680bc35257c83fc400d9d8e2ae94d86f77"
-SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
+SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +1 -1
index 62cf57d49536..28c72132ae8d 100644
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
-SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
+SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +1 -1
index 00bdcf74d33d..2821f448e7f1 100644
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
+SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.1.bb +1 -1
index d8e864394f57..aecb517ed7bd 100644
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
 SRCREV_machine_qemux86-64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
 SRCREV_machine_qemumips64 ?= "b71e4cd7d45f03048ad31e2a36dfe5a43f021b51"
 SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e"
-SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
+SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto_4.4.bb +1 -1
index 76d45f7e9ac5..5509dd697bfb 100644
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
 SRCREV_machine_qemux86-64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
 SRCREV_machine_qemumips64 ?= "88fb42ec863d20ccde57dd35da06d6221cfb4c03"
 SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
+SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
Signature · 1 line
2.5.0
author
#5 lore raw

PATCH 5/5 linux-yocto: make aufs4 optional

In reply to Bruce Ashfield

An always on configuration of aufs4 crept into the default kernel configuration blocks.

With this change, aufs-enable.scc can be used to turn on aufs via a KERNEL_FEATURES entry. We can now have co-existing unionfs solutions and can update them without breaking builds that haven't opted-in.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +2 -2
index cb245eeb913a..d81ca13872c0 100644
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "328830680bc35257c83fc400d9d8e2ae94d86f77"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine ?= "2bc112a6ccd16800a4c45e47ccb3018a1042abdf"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +2 -2
index 2821f448e7f1..684e8809859a 100644
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.3"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.4.bb +9 -9
index 5509dd697bfb..3c5ee1bd43b2 100644
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "d0dae8a98254e7ddd8d9be107e33c3a492bccdae"
-SRCREV_machine_qemuarm64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemumips ?= "9024e9c842557e258a88470f8b1a772df18d9813"
-SRCREV_machine_qemuppc ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemux86 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemux86-64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemumips64 ?= "88fb42ec863d20ccde57dd35da06d6221cfb4c03"
-SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine_qemuarm ?= "ec9167bcb0ccd4897177c5e235af68b5890aa326"
+SRCREV_machine_qemuarm64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemumips ?= "900f98d3ab6498bc7f4ff6b7a489db3bca4e6417"
+SRCREV_machine_qemuppc ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemux86 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemux86-64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemumips64 ?= "4b08dfb1fb3bc7659e8f3e13665597d9a9f0816d"
+SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
Signature · 1 line
2.5.0
#6 lore raw

Re: [PATCH 5/5] linux-yocto: make aufs4 optional

Hi Bruce,

I got do_patch error when add features/aufs/aufs.scc:

KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/aufs/aufs.scc"

MACHINE = "qemux86-64"

$ bitbake virtual/kernel -ccleansstate && bitbake bitbake virtual/kernel
|    mark --> aufs.scc
|          patch aufs-kbuild-support.patch (.kernel-meta/patches/standard/base/series)
|          patch aufs4-base-support.patch (.kernel-meta/patches/standard/base/series)
|          patch aufs4-mmap-support.patch (.kernel-meta/patches/standard/base/series)
|          patch aufs4-standalone-module-support.patch (.kernel-meta/patches/standard/base/series)
|          patch aufs-core-filesystem.patch (.kernel-meta/patches/standard/base/series)
|    mark <-- aufs.scc
| (1/5) aufs-kbuild-support.patch
| [INFO]: check of .kernel-meta/patches/standard/base/links/kernel-meta/features/aufs/aufs-kbuild-support.patch with "git am" did not pass, trying reduced context.
| [INFO]: Context reduced git-am of .kernel-meta/patches/standard/base/links/kernel-meta/features/aufs/aufs-kbuild-support.patch with "git am" did not work, trying "apply".
| error: patch failed: fs/Kconfig:222
| error: fs/Kconfig: patch does not apply
| error: patch failed: include/uapi/linux/Kbuild:59
| error: include/uapi/linux/Kbuild: patch does not apply
| [ERROR]: Application of .kernel-meta/patches/standard/base/links/kernel-meta/features/aufs/aufs-kbuild-support.patch failed.
|          Patch needs to be refreshed. Sample resolution script:
|              .git/rebase-apply/resolve_rejects
| ERROR. could not update git tree
| WARNING: exit code 1 from a shell command.

// Robert

Quoted 74 lines · Bruce Ashfield

An always on configuration of aufs4 crept into the default kernel configuration blocks.

With this change, aufs-enable.scc can be used to turn on aufs via a KERNEL_FEATURES entry. We can now have co-existing unionfs solutions and can update them without breaking builds that haven't opted-in.

Signed-off-by Bruce Ashfield <[email protected]>
---
  meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  4 ++--
  meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 18 +++++++++---------
  3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +2 -2
index cb245eeb913a..d81ca13872c0 100644
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
 
  require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "328830680bc35257c83fc400d9d8e2ae94d86f77"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine ?= "2bc112a6ccd16800a4c45e47ccb3018a1042abdf"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
  SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +2 -2
index 2821f448e7f1..684e8809859a 100644
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.3"
  KMETA = "kernel-meta"
  KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.4.bb +9 -9
index 5509dd697bfb..3c5ee1bd43b2 100644
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
  KBRANCH_qemux86-64 ?= "standard/base"
  KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "d0dae8a98254e7ddd8d9be107e33c3a492bccdae"
-SRCREV_machine_qemuarm64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemumips ?= "9024e9c842557e258a88470f8b1a772df18d9813"
-SRCREV_machine_qemuppc ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemux86 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemux86-64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemumips64 ?= "88fb42ec863d20ccde57dd35da06d6221cfb4c03"
-SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine_qemuarm ?= "ec9167bcb0ccd4897177c5e235af68b5890aa326"
+SRCREV_machine_qemuarm64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemumips ?= "900f98d3ab6498bc7f4ff6b7a489db3bca4e6417"
+SRCREV_machine_qemuppc ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemux86 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemux86-64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemumips64 ?= "4b08dfb1fb3bc7659e8f3e13665597d9a9f0816d"
+SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
  SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
             git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
author
#7 lore raw

Re: [PATCH 5/5] linux-yocto: make aufs4 optional

Quoted 4 lines · Robert Yang

Hi Bruce,

I got do_patch error when add features/aufs/aufs.scc:

That's expected. aufs is integrated into the branches already, that feature actually applies patches, so you are trying to apply everything twice.

aufs-enable.scc is the one that only does the config.

Bruce

Quoted 129 lines

KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/aufs/aufs.scc"

MACHINE = "qemux86-64"

$ bitbake virtual/kernel -ccleansstate && bitbake bitbake virtual/kernel

| mark --> aufs.scc
| patch aufs-kbuild-support.patch
(.kernel-meta/patches/standard/base/series)
| patch aufs4-base-support.patch
(.kernel-meta/patches/standard/base/series)
| patch aufs4-mmap-support.patch
(.kernel-meta/patches/standard/base/series)
| patch aufs4-standalone-module-support.patch
(.kernel-meta/patches/standard/base/series)
| patch aufs-core-filesystem.patch
(.kernel-meta/patches/standard/base/series)

|    mark <-- aufs.scc
| (1/5) aufs-kbuild-support.patch
| [INFO]: check of

.kernel-meta/patches/standard/base/links/kernel-meta/features/aufs/aufs-kbuild-support.patch with "git am" did not pass, trying reduced context.
| [INFO]: Context reduced git-am of .kernel-meta/patches/standard/base/links/kernel-meta/features/aufs/aufs-kbuild-support.patch with "git am" did not work, trying "apply".

| error: patch failed: fs/Kconfig:222
| error: fs/Kconfig: patch does not apply
| error: patch failed: include/uapi/linux/Kbuild:59
| error: include/uapi/linux/Kbuild: patch does not apply
| [ERROR]: Application of
.kernel-meta/patches/standard/base/links/kernel-meta/features/aufs/aufs-kbuild-support.patch
failed.
|          Patch needs to be refreshed. Sample resolution script:
|              .git/rebase-apply/resolve_rejects
| ERROR. could not update git tree
| WARNING: exit code 1 from a shell command.

// Robert

Quoted 86 lines · Bruce Ashfield

An always on configuration of aufs4 crept into the default kernel configuration blocks.

With this change, aufs-enable.scc can be used to turn on aufs via a KERNEL_FEATURES entry. We can now have co-existing unionfs solutions and can update them without breaking builds that haven't opted-in.

Signed-off-by Bruce Ashfield <[email protected]>
---
  meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  4 ++--
  meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  4 ++--
  meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 18
+++++++++---------
  3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +2 -2
index cb245eeb913a..d81ca13872c0 100644
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
 
  require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "328830680bc35257c83fc400d9d8e2ae94d86f77"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine ?= "2bc112a6ccd16800a4c45e47ccb3018a1042abdf"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
  SRC_URI =

"git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"

meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +2 -2
index 2821f448e7f1..684e8809859a 100644
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.3"
  KMETA = "kernel-meta"
  KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
  PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.4.bb +9 -9
index 5509dd697bfb..3c5ee1bd43b2 100644
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
  KBRANCH_qemux86-64 ?= "standard/base"
  KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "d0dae8a98254e7ddd8d9be107e33c3a492bccdae"
-SRCREV_machine_qemuarm64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemumips ?= "9024e9c842557e258a88470f8b1a772df18d9813"
-SRCREV_machine_qemuppc ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemux86 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemux86-64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_machine_qemumips64 ?= "88fb42ec863d20ccde57dd35da06d6221cfb4c03"
-SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7"
-SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b"
+SRCREV_machine_qemuarm ?= "ec9167bcb0ccd4897177c5e235af68b5890aa326"
+SRCREV_machine_qemuarm64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemumips ?= "900f98d3ab6498bc7f4ff6b7a489db3bca4e6417"
+SRCREV_machine_qemuppc ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemux86 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemux86-64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_machine_qemumips64 ?= "4b08dfb1fb3bc7659e8f3e13665597d9a9f0816d"
+SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
+SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
 
  SRC_URI =
 "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH};

\

git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"