* [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
@ 2016-10-03 5:54 Bruce Ashfield
2016-10-03 5:54 ` [PATCH 1/7] linux-yocto/4.8: mmc configuration for x86* Bruce Ashfield
` (7 more replies)
0 siblings, 8 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Hi all,
Linus released 4.8 a few hours ago, so I triggered my final round of updates.
Along with the bump to 4.8-final, I've also included pending -stable updates
to 4.1 and 4.4.
We also have a fix for one -rt issue from Paul Gortmaker and hence a minor
update to the preempt-rt branches.
There are also some standard/base cleanups from Cal, as well as some mmc
configuration changes.
The big thing to note about this update .. is that the libc-headers bump
to the 4.8 final tarball picked up some uapi headers that broke the build
of ppp. I never would have thought it was possible, but it happened.
After hunting for a few hours, I found the offending kernel commits, and
have patched them back out of libc-headers. I didn't check this patch
against muslc .. there's only so much I can do. If someone can come up
with a better fix, that's great, I kept the patch i did separate from
the updated libc-headers to make it easy to drop.
I've built and booted core-image for standard and -rt on all arches, I've
built core-image-kernel-dev (which showed me the ppp error), and I've
built lttng*.
That's all that I could possible do in a few hours .. it is 2am, and
that's enough for one night.
Note: I'm sending this now, since I'm packing up and heading on vacation
Monday afternoon. I'll be around most evenings (eastern to pick up
any fixes), but I wanted to get this out, and onto the autobuilder
ASAP ..and more eyes to pick up issues would be great.
Cheers,
Bruce
The following changes since commit 3a73fe0efcb7aeefcca7011bba887caad03d4d03:
beaglebone.conf: produce wic images for Beaglebone (2016-10-01 21:45:57 +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 (7):
linux-yocto/4.8: mmc configuration for x86*
linux-yocto/4.1: update to 4.1.33
linux-yocto/4.4: update to v4.4.22
linux-yocto/4.1/4.4: remove innappropriate standard/base patches
linux-libc-headers: update to 4.8 final
linux-yocto/4.8: update to 4.8 -final release
linux-libc-headers: fix in/if.h includes
.../0001-ppp-fix-in-if.h-includes.patch | 83 ++++++++++++++++++++++
.../linux-libc-headers/linux-libc-headers_4.8.bb | 11 +--
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 +++---
meta/recipes-kernel/linux/linux-yocto_4.4.bb | 20 +++---
meta/recipes-kernel/linux/linux-yocto_4.8.bb | 20 +++---
11 files changed, 138 insertions(+), 52 deletions(-)
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
--
2.5.0
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/7] linux-yocto/4.8: mmc configuration for x86*
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 5:54 ` [PATCH 2/7] linux-yocto/4.1: update to 4.1.33 Bruce Ashfield
` (6 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Updating the common-pc* configuration to have the following mmc
configs available by default:
meta/common-pc-64: use mmc-sdhci feature
meta/common-pc: use mmc-sdhci feature
meta: add mmc/mmc-sdhci feature
meta: add mmc/mmc-block feature
meta: add mmc/base feature
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_4.8.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
index 8548af71c4b3..d667860ad0c3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "5e21764783494fe8cafa9a107775040d54a4d4d1"
-SRCREV_meta ?= "d0937e67c3c11fd0e6429bd050a86f6c295560e1"
+SRCREV_meta ?= "ab82ea0e92a1726d5135e2d7541acb958a74b6e5"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
index 18214e3925d6..7c175d60b14f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_meta ?= "d0937e67c3c11fd0e6429bd050a86f6c295560e1"
+SRCREV_meta ?= "ab82ea0e92a1726d5135e2d7541acb958a74b6e5"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
index cf4b9b729ea1..d4366c1cf4ac 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
SRCREV_machine_qemux86-64 ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
SRCREV_machine_qemumips64 ?= "dd0e6bc1cb1973d72ff9d3b4ee44a0edc04fea3c"
SRCREV_machine ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_meta ?= "d0937e67c3c11fd0e6429bd050a86f6c295560e1"
+SRCREV_meta ?= "ab82ea0e92a1726d5135e2d7541acb958a74b6e5"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/7] linux-yocto/4.1: update to 4.1.33
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
2016-10-03 5:54 ` [PATCH 1/7] linux-yocto/4.8: mmc configuration for x86* Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 5:54 ` [PATCH 3/7] linux-yocto/4.4: update to v4.4.22 Bruce Ashfield
` (5 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 ++++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 1f38a54bf551..77f1f1bcfef4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "91821a6c3a54fabf964037dd478944a8f3597f88"
-SRCREV_meta ?= "19cafe114e7d35e6202afa1079b32ce600646660"
+SRCREV_machine ?= "3389720cf9809d517de7188308132ef1ec066e55"
+SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
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}"
-LINUX_VERSION ?= "4.1.32"
+LINUX_VERSION ?= "4.1.33"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 5058954a814a..c57949b2aeb6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "4.1.32"
+LINUX_VERSION ?= "4.1.33"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1"
-SRCREV_meta ?= "19cafe114e7d35e6202afa1079b32ce600646660"
+SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 249209d6495f..b2ebe8b26baa 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
KBRANCH_qemux86-64 ?= "standard/base"
KBRANCH_qemumips64 ?= "standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "a2fde8c9a8b709574b36931f728fb78617892d98"
-SRCREV_machine_qemuarm64 ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1"
-SRCREV_machine_qemumips ?= "33efda07565f45c576671358e75b39dc6a069cbf"
-SRCREV_machine_qemuppc ?= "96b9a39490bc348b36d0de13397a086e66a4b1cb"
-SRCREV_machine_qemux86 ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1"
-SRCREV_machine_qemux86-64 ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1"
-SRCREV_machine_qemumips64 ?= "a46e08c52a6764b0e54f4dbbdfaa3050a379ac4a"
-SRCREV_machine ?= "a6b3a8cc120640bf5e528c8558ce060675757fc1"
-SRCREV_meta ?= "19cafe114e7d35e6202afa1079b32ce600646660"
+SRCREV_machine_qemuarm ?= "a8169bc7216752813a0a8be7d77ec8fcf0d8850e"
+SRCREV_machine_qemuarm64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_machine_qemumips ?= "d12861e340503a14614b655e77d8dcabadb18f8e"
+SRCREV_machine_qemuppc ?= "0e7c356e7c972e0f6f596d7d5f2621a3f68df8e4"
+SRCREV_machine_qemux86 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_machine_qemux86-64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_machine_qemumips64 ?= "c14be1d25b733ff6ff47e8f255e8196cf9b3e8c9"
+SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
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}"
-LINUX_VERSION ?= "4.1.32"
+LINUX_VERSION ?= "4.1.33"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/7] linux-yocto/4.4: update to v4.4.22
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
2016-10-03 5:54 ` [PATCH 1/7] linux-yocto/4.8: mmc configuration for x86* Bruce Ashfield
2016-10-03 5:54 ` [PATCH 2/7] linux-yocto/4.1: update to 4.1.33 Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 5:54 ` [PATCH 4/7] linux-yocto/4.1/4.4: remove innappropriate standard/base patches Bruce Ashfield
` (4 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto_4.4.bb | 20 ++++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index a97a14b66e32..5416ca499bc4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "76a02384d86df7b7499755f1650b5299740f5473"
-SRCREV_meta ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
+SRCREV_machine ?= "a1da5707fd13f31d25661b910c7377c8714c1123"
+SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece"
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}"
-LINUX_VERSION ?= "4.4.20"
+LINUX_VERSION ?= "4.4.22"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index 6befd233b317..e7e48adc4de3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "4.4.20"
+LINUX_VERSION ?= "4.4.22"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_meta ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
+SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
+SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index ec493cbd55f1..5cafa9166a23 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
KBRANCH_qemux86-64 ?= "standard/base"
KBRANCH_qemumips64 ?= "standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "a064c27e528be59412a892f3ed3ef8efe1f1d601"
-SRCREV_machine_qemuarm64 ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_machine_qemumips ?= "d644de0138c623c2b5e8a6a143a24234fd2cfb27"
-SRCREV_machine_qemuppc ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_machine_qemux86 ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_machine_qemux86-64 ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_machine_qemumips64 ?= "1fb08e61877b56fcbf800bfc66305b7a563c5f99"
-SRCREV_machine ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0"
-SRCREV_meta ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
+SRCREV_machine_qemuarm ?= "22a817dc851fac7ec9369c29b3a2803ec92781fb"
+SRCREV_machine_qemuarm64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
+SRCREV_machine_qemumips ?= "c1794372ab031297d1c4482d982e143386c247ea"
+SRCREV_machine_qemuppc ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
+SRCREV_machine_qemux86 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
+SRCREV_machine_qemux86-64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
+SRCREV_machine_qemumips64 ?= "ab08db0be1aec0daa5ac134fe1abcd6eba47b275"
+SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
+SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece"
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}"
-LINUX_VERSION ?= "4.4.20"
+LINUX_VERSION ?= "4.4.22"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/7] linux-yocto/4.1/4.4: remove innappropriate standard/base patches
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
` (2 preceding siblings ...)
2016-10-03 5:54 ` [PATCH 3/7] linux-yocto/4.4: update to v4.4.22 Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 5:54 ` [PATCH 5/7] linux-libc-headers: update to 4.8 final Bruce Ashfield
` (3 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Before standard/intel/* was created in the 4.1 and 4.4 kernel trees,
some patches were merged to standard/base to add features/support for
intel platforms.
While this isn't entirely bad, there have been some compile issues
reported in some configurations. Since we don't need these commits
on standard/base, we can relocate them to make standard/base upstream
clean.
This commit removes those patches from standard/base, and restores
then to the standard/intel/* branches.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 ++++++++--------
meta/recipes-kernel/linux/linux-yocto_4.4.bb | 18 +++++++++---------
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 77f1f1bcfef4..ed7a916be948 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -11,7 +11,7 @@ python () {
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "3389720cf9809d517de7188308132ef1ec066e55"
+SRCREV_machine ?= "71daecbcd3f3e8fa73aa036a5539722004e7759c"
SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index 5416ca499bc4..4fc3458b5fae 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "a1da5707fd13f31d25661b910c7377c8714c1123"
-SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece"
+SRCREV_machine ?= "6f27f97ed8466b5d7390e8fbb8696c13835a0b1f"
+SRCREV_meta ?= "d9f20333c42e024d42d633b3da2458f2e0d9c52a"
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}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index c57949b2aeb6..78600427b375 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.33"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_machine ?= "a38cb202738a2b055ac216b3699cc9377edea45a"
SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index e7e48adc4de3..7ca5d86dcd42 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.22"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
-SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece"
+SRCREV_machine ?= "f4e52341c304e044dbe581a35aad6b930c9410d1"
+SRCREV_meta ?= "d9f20333c42e024d42d633b3da2458f2e0d9c52a"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index b2ebe8b26baa..413234b6d559 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base"
KBRANCH_qemux86-64 ?= "standard/base"
KBRANCH_qemumips64 ?= "standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "a8169bc7216752813a0a8be7d77ec8fcf0d8850e"
-SRCREV_machine_qemuarm64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
-SRCREV_machine_qemumips ?= "d12861e340503a14614b655e77d8dcabadb18f8e"
-SRCREV_machine_qemuppc ?= "0e7c356e7c972e0f6f596d7d5f2621a3f68df8e4"
-SRCREV_machine_qemux86 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
-SRCREV_machine_qemux86-64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
-SRCREV_machine_qemumips64 ?= "c14be1d25b733ff6ff47e8f255e8196cf9b3e8c9"
-SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
+SRCREV_machine_qemuarm ?= "89241b98386f752ab073d3ab5518cb69bacbd97e"
+SRCREV_machine_qemuarm64 ?= "a38cb202738a2b055ac216b3699cc9377edea45a"
+SRCREV_machine_qemumips ?= "e00505a0c07a352d1dd57adb8da1768863022979"
+SRCREV_machine_qemuppc ?= "d5ef1ced9d019d20d986e205bddc317961407188"
+SRCREV_machine_qemux86 ?= "a38cb202738a2b055ac216b3699cc9377edea45a"
+SRCREV_machine_qemux86-64 ?= "a38cb202738a2b055ac216b3699cc9377edea45a"
+SRCREV_machine_qemumips64 ?= "ac476ecd7a56288e3e8ed1ef3872554de661e823"
+SRCREV_machine ?= "a38cb202738a2b055ac216b3699cc9377edea45a"
SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 5cafa9166a23..f2d07be2dc89 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base"
KBRANCH_qemux86-64 ?= "standard/base"
KBRANCH_qemumips64 ?= "standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "22a817dc851fac7ec9369c29b3a2803ec92781fb"
-SRCREV_machine_qemuarm64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
-SRCREV_machine_qemumips ?= "c1794372ab031297d1c4482d982e143386c247ea"
-SRCREV_machine_qemuppc ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
-SRCREV_machine_qemux86 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
-SRCREV_machine_qemux86-64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
-SRCREV_machine_qemumips64 ?= "ab08db0be1aec0daa5ac134fe1abcd6eba47b275"
-SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a"
-SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece"
+SRCREV_machine_qemuarm ?= "de294849e02680399a6dd03fedcc03a69e9a6a04"
+SRCREV_machine_qemuarm64 ?= "f4e52341c304e044dbe581a35aad6b930c9410d1"
+SRCREV_machine_qemumips ?= "a41dd187e7d42be65780f25997eb890ead6cc7d9"
+SRCREV_machine_qemuppc ?= "f4e52341c304e044dbe581a35aad6b930c9410d1"
+SRCREV_machine_qemux86 ?= "f4e52341c304e044dbe581a35aad6b930c9410d1"
+SRCREV_machine_qemux86-64 ?= "f4e52341c304e044dbe581a35aad6b930c9410d1"
+SRCREV_machine_qemumips64 ?= "857685d23d1e8d8a8deb4198b139b95a5bb80825"
+SRCREV_machine ?= "f4e52341c304e044dbe581a35aad6b930c9410d1"
+SRCREV_meta ?= "d9f20333c42e024d42d633b3da2458f2e0d9c52a"
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}"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/7] linux-libc-headers: update to 4.8 final
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
` (3 preceding siblings ...)
2016-10-03 5:54 ` [PATCH 4/7] linux-yocto/4.1/4.4: remove innappropriate standard/base patches Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 5:54 ` [PATCH 6/7] linux-yocto/4.8: update to 4.8 -final release Bruce Ashfield
` (2 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
We've been using a -rc4 variant of the libc-headers, now that
4.8 has been released, we switch to the final tgz of the headers.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
| 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
index f80f02cb1896..77e0870d326f 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
@@ -1,7 +1,6 @@
require linux-libc-headers.inc
-SRC_URI_forcevariable = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/testing/linux-4.8-rc4.tar.${KORG_ARCHIVE_COMPRESSION}"
-PV = "4.8-rc4"
+PV = "4.8"
SRC_URI_append_libc-musl = "\
file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
@@ -9,5 +8,5 @@ SRC_URI_append_libc-musl = "\
file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
"
-SRC_URI[md5sum] = "269067213995c7742730ce53b8140c90"
-SRC_URI[sha256sum] = "8f07a0d76a7d1a30490582ba9642b7f28370102bc4acc4bb4b2586c8eabf4447"
+SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07"
+SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 6/7] linux-yocto/4.8: update to 4.8 -final release
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
` (4 preceding siblings ...)
2016-10-03 5:54 ` [PATCH 5/7] linux-libc-headers: update to 4.8 final Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 5:54 ` [PATCH 7/7] linux-libc-headers: fix in/if.h includes Bruce Ashfield
2016-10-03 15:45 ` [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Burton, Ross
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto_4.8.bb | 20 ++++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
index d667860ad0c3..515f8783e906 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "5e21764783494fe8cafa9a107775040d54a4d4d1"
-SRCREV_meta ?= "ab82ea0e92a1726d5135e2d7541acb958a74b6e5"
+SRCREV_machine ?= "cd97b2cf4bc73316204a5148d2b0f5fc5d2ecc19"
+SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
-LINUX_VERSION ?= "4.8-rc8"
+LINUX_VERSION ?= "4.8"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
index 7c175d60b14f..8ed52ddbfc58 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "4.8-rc8"
+LINUX_VERSION ?= "4.8"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_meta ?= "ab82ea0e92a1726d5135e2d7541acb958a74b6e5"
+SRCREV_machine ?= "707621a083512f037f749a711df3f4f1fb3ef842"
+SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
index d4366c1cf4ac..71dc5ae35a0f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
KBRANCH_qemux86-64 ?= "standard/base"
KBRANCH_qemumips64 ?= "standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "3a2b4be23e0d3115962cd49302f80679c86a2df4"
-SRCREV_machine_qemuarm64 ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_machine_qemumips ?= "fc863e7a0f5664eef65ff36f35cc41c0be59ef3b"
-SRCREV_machine_qemuppc ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_machine_qemux86 ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_machine_qemux86-64 ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_machine_qemumips64 ?= "dd0e6bc1cb1973d72ff9d3b4ee44a0edc04fea3c"
-SRCREV_machine ?= "8edbf10bb6e0759bfb6f18035d1b4773f573d33c"
-SRCREV_meta ?= "ab82ea0e92a1726d5135e2d7541acb958a74b6e5"
+SRCREV_machine_qemuarm ?= "fc4881574f295bf2480f95d7c3e279ab32b44d8a"
+SRCREV_machine_qemuarm64 ?= "707621a083512f037f749a711df3f4f1fb3ef842"
+SRCREV_machine_qemumips ?= "013be1e230a0173677dfbfc081aea63fd7c58ec8"
+SRCREV_machine_qemuppc ?= "707621a083512f037f749a711df3f4f1fb3ef842"
+SRCREV_machine_qemux86 ?= "707621a083512f037f749a711df3f4f1fb3ef842"
+SRCREV_machine_qemux86-64 ?= "707621a083512f037f749a711df3f4f1fb3ef842"
+SRCREV_machine_qemumips64 ?= "7496d66804993fcfc569dd062f7e63a7490bc62f"
+SRCREV_machine ?= "707621a083512f037f749a711df3f4f1fb3ef842"
+SRCREV_meta ?= "6128a9e47cd1aeb46b604469c17bff3eba8d5f93"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
-LINUX_VERSION ?= "4.8-rc8"
+LINUX_VERSION ?= "4.8"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 7/7] linux-libc-headers: fix in/if.h includes
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
` (5 preceding siblings ...)
2016-10-03 5:54 ` [PATCH 6/7] linux-yocto/4.8: update to 4.8 -final release Bruce Ashfield
@ 2016-10-03 5:54 ` Bruce Ashfield
2016-10-03 15:45 ` [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Burton, Ross
7 siblings, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 5:54 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
The following kernel commits broke the compilation of ppp, due to redefined
structures.
Nothing else breaks in userspace with or without these uapi changes, so we
revert them to keep everything building.
commit 05ee5de7451796cf9a8aeb2f05a57790d4fd2336
Author: Mikko Rapeli <mikko.rapeli@iki.fi>
Date: Mon Aug 22 20:32:42 2016 +0200
include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
Fixes userspace compilation errors like:
error: field <E2><80><98>addr<E2><80><99> has incomplete type
struct sockaddr_in addr; /* IP address and port to send to */
^
error: field <E2><80><98>addr<E2><80><99> has incomplete type
struct sockaddr_in6 addr; /* IP address and port to send to */
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit eafe92114308acf14e45c6c3d154a5dad5523d1a
Author: Mikko Rapeli <mikko.rapeli@iki.fi>
Date: Mon Aug 22 20:32:43 2016 +0200
include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h
Fixes userspace compilation errors:
error: field <E2><80><98>addr<E2><80><99> has incomplete type
struct sockaddr_in addr; /* IP address and port to send to */
error: field <E2><80><98>addr<E2><80><99> has incomplete type
struct sockaddr_in6 addr; /* IP address and port to send to */
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../0001-ppp-fix-in-if.h-includes.patch | 83 ++++++++++++++++++++++
| 4 ++
2 files changed, 87 insertions(+)
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
new file mode 100644
index 000000000000..f31a53946ec0
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch
@@ -0,0 +1,83 @@
+From 80f3064c378f8c919aa6450bd7833a154c184f7f Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 3 Oct 2016 01:18:13 -0400
+Subject: [PATCH] ppp: fix in/if.h includes
+
+The following kernel commits broke the compilation of ppp, due to redefined
+structures.
+
+Nothing else breaks in userspace with or without these uapi changes, so we
+revert them to keep everything building.
+
+ commit 05ee5de7451796cf9a8aeb2f05a57790d4fd2336
+ Author: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Date: Mon Aug 22 20:32:42 2016 +0200
+
+ include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
+
+ Fixes userspace compilation errors like:
+
+ error: field <E2><80><98>addr<E2><80><99> has incomplete type
+ struct sockaddr_in addr; /* IP address and port to send to */
+ ^
+ error: field <E2><80><98>addr<E2><80><99> has incomplete type
+ struct sockaddr_in6 addr; /* IP address and port to send to */
+
+ Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+ commit eafe92114308acf14e45c6c3d154a5dad5523d1a
+ Author: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Date: Mon Aug 22 20:32:43 2016 +0200
+
+ include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h
+
+ Fixes userspace compilation errors:
+
+ error: field <E2><80><98>addr<E2><80><99> has incomplete type
+ struct sockaddr_in addr; /* IP address and port to send to */
+
+ error: field <E2><80><98>addr<E2><80><99> has incomplete type
+ struct sockaddr_in6 addr; /* IP address and port to send to */
+
+ Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+---
+ include/uapi/linux/if_pppol2tp.h | 2 --
+ include/uapi/linux/if_pppox.h | 3 ---
+ 2 files changed, 5 deletions(-)
+
+diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h
+index 4bd1f55..ca559c6 100644
+--- a/include/uapi/linux/if_pppol2tp.h
++++ b/include/uapi/linux/if_pppol2tp.h
+@@ -16,8 +16,6 @@
+ #define _UAPI__LINUX_IF_PPPOL2TP_H
+
+ #include <linux/types.h>
+-#include <linux/in.h>
+-#include <linux/in6.h>
+
+ /* Structure used to connect() the socket to a particular tunnel UDP
+ * socket over IPv4.
+diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h
+index d37bbb1..e128769 100644
+--- a/include/uapi/linux/if_pppox.h
++++ b/include/uapi/linux/if_pppox.h
+@@ -21,11 +21,8 @@
+ #include <asm/byteorder.h>
+
+ #include <linux/socket.h>
+-#include <linux/if.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_pppol2tp.h>
+-#include <linux/in.h>
+-#include <linux/in6.h>
+
+ /* For user-space programs to pick up these definitions
+ * which they wouldn't get otherwise without defining __KERNEL__
+--
+2.7.4
+
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
index 77e0870d326f..778f0b6e6443 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb
@@ -8,5 +8,9 @@ SRC_URI_append_libc-musl = "\
file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
"
+SRC_URI_append = "\
+ file://0001-ppp-fix-in-if.h-includes.patch \
+ "
+
SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07"
SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a"
--
2.5.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
` (6 preceding siblings ...)
2016-10-03 5:54 ` [PATCH 7/7] linux-libc-headers: fix in/if.h includes Bruce Ashfield
@ 2016-10-03 15:45 ` Burton, Ross
2016-10-03 15:51 ` Bruce Ashfield
7 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2016-10-03 15:45 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1141 bytes --]
On 3 October 2016 at 06:54, Bruce Ashfield <bruce.ashfield@windriver.com>
wrote:
> The big thing to note about this update .. is that the libc-headers bump
> to the 4.8 final tarball picked up some uapi headers that broke the build
> of ppp. I never would have thought it was possible, but it happened.
>
| In file included from
/data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/include/linux/if_tunnel.h:6:0,
| from iptunnel.c:39:
|
/data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/include/linux/ip.h:85:8:
error: redefinition of 'struct iphdr'
| struct iphdr {
| ^~~~~
| In file included from iptunnel.c:29:0:
|
/data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/include/netinet/ip.h:44:8:
note: originally defined here
| struct iphdr
| ^~~~~
| <builtin>: recipe for target 'iptunnel.o' failed
| make: *** [iptunnel.o] Error 1
| ERROR: Function failed: do_compile (log file is located at
/data/poky-master/tmp-glibc/work/corei7-64-poky-linux/net-tools/1.60-26-r0/temp/log.do_compile.27643)
Looks like net-tools is broken by something else too.
Ross
[-- Attachment #2: Type: text/html, Size: 2087 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 15:45 ` [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Burton, Ross
@ 2016-10-03 15:51 ` Bruce Ashfield
2016-10-03 15:57 ` Bruce Ashfield
0 siblings, 1 reply; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 15:51 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 2016-10-03 11:45 AM, Burton, Ross wrote:
>
> On 3 October 2016 at 06:54, Bruce Ashfield <bruce.ashfield@windriver.com
> <mailto:bruce.ashfield@windriver.com>> wrote:
>
> The big thing to note about this update .. is that the libc-headers bump
> to the 4.8 final tarball picked up some uapi headers that broke the
> build
> of ppp. I never would have thought it was possible, but it happened.
>
>
> | In file included from
> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/include/linux/if_tunnel.h:6:0,
> | from iptunnel.c:39:
> |
> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/include/linux/ip.h:85:8:
> error: redefinition of 'struct iphdr'
> | struct iphdr {
> | ^~~~~
> | In file included from iptunnel.c:29:0:
> |
> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/include/netinet/ip.h:44:8:
> note: originally defined here
> | struct iphdr
> | ^~~~~
> | <builtin>: recipe for target 'iptunnel.o' failed
> | make: *** [iptunnel.o] Error 1
> | ERROR: Function failed: do_compile (log file is located at
> /data/poky-master/tmp-glibc/work/corei7-64-poky-linux/net-tools/1.60-26-r0/temp/log.do_compile.27643)
>
> Looks like net-tools is broken by something else too.
I'm out of the office in about one hour. So someone else is
going to have to pick up the libc-headers fix.
Cheers,
Bruce
>
> Ross
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 15:51 ` Bruce Ashfield
@ 2016-10-03 15:57 ` Bruce Ashfield
2016-10-03 16:02 ` Bruce Ashfield
2016-10-03 16:03 ` Burton, Ross
0 siblings, 2 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 15:57 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2562 bytes --]
On Mon, Oct 3, 2016 at 11:51 AM, Bruce Ashfield <
bruce.ashfield@windriver.com> wrote:
> On 2016-10-03 11:45 AM, Burton, Ross wrote:
>
>>
>> On 3 October 2016 at 06:54, Bruce Ashfield <bruce.ashfield@windriver.com
>> <mailto:bruce.ashfield@windriver.com>> wrote:
>>
>> The big thing to note about this update .. is that the libc-headers
>> bump
>> to the 4.8 final tarball picked up some uapi headers that broke the
>> build
>> of ppp. I never would have thought it was possible, but it happened.
>>
>>
>> | In file included from
>> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/inc
>> lude/linux/if_tunnel.h:6:0,
>> | from iptunnel.c:39:
>> |
>> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/inc
>> lude/linux/ip.h:85:8:
>> error: redefinition of 'struct iphdr'
>> | struct iphdr {
>> | ^~~~~
>> | In file included from iptunnel.c:29:0:
>> |
>> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/inc
>> lude/netinet/ip.h:44:8:
>> note: originally defined here
>> | struct iphdr
>> | ^~~~~
>> | <builtin>: recipe for target 'iptunnel.o' failed
>> | make: *** [iptunnel.o] Error 1
>> | ERROR: Function failed: do_compile (log file is located at
>> /data/poky-master/tmp-glibc/work/corei7-64-poky-linux/net-to
>> ols/1.60-26-r0/temp/log.do_compile.27643)
>>
>> Looks like net-tools is broken by something else too.
>>
>
> I'm out of the office in about one hour. So someone else is
> going to have to pick up the libc-headers fix.
>
Switching to my gmail, so I can follow along.
I do have about a half hour now, I'll check the net uapi code in the kernel
and see
if there's another fixup I can do.
These errors have been lurking for about the last year, the answer from the
kernel
folks is typically "change the order of your includes".
So there are two routes to fix it. See if there's a newer userspace with
the includes
changed, or do what I did, take the change out of libc-headers.
I'll check to see if I can do the latter here.
Out of curiosity, what image type is this ? built core-image-sato,
kernel-dev for
x86-64 and they all worked.
Bruce
>
> Cheers,
>
> Bruce
>
>
>> Ross
>>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 4166 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 15:57 ` Bruce Ashfield
@ 2016-10-03 16:02 ` Bruce Ashfield
2016-10-03 16:03 ` Burton, Ross
1 sibling, 0 replies; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 16:02 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3642 bytes --]
On Mon, Oct 3, 2016 at 11:57 AM, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
>
>
> On Mon, Oct 3, 2016 at 11:51 AM, Bruce Ashfield <
> bruce.ashfield@windriver.com> wrote:
>
>> On 2016-10-03 11:45 AM, Burton, Ross wrote:
>>
>>>
>>> On 3 October 2016 at 06:54, Bruce Ashfield <bruce.ashfield@windriver.com
>>> <mailto:bruce.ashfield@windriver.com>> wrote:
>>>
>>> The big thing to note about this update .. is that the libc-headers
>>> bump
>>> to the 4.8 final tarball picked up some uapi headers that broke the
>>> build
>>> of ppp. I never would have thought it was possible, but it happened.
>>>
>>>
>>> | In file included from
>>> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/inc
>>> lude/linux/if_tunnel.h:6:0,
>>> | from iptunnel.c:39:
>>> |
>>> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/inc
>>> lude/linux/ip.h:85:8:
>>> error: redefinition of 'struct iphdr'
>>> | struct iphdr {
>>> | ^~~~~
>>> | In file included from iptunnel.c:29:0:
>>> |
>>> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/inc
>>> lude/netinet/ip.h:44:8:
>>> note: originally defined here
>>> | struct iphdr
>>> | ^~~~~
>>> | <builtin>: recipe for target 'iptunnel.o' failed
>>> | make: *** [iptunnel.o] Error 1
>>> | ERROR: Function failed: do_compile (log file is located at
>>> /data/poky-master/tmp-glibc/work/corei7-64-poky-linux/net-to
>>> ols/1.60-26-r0/temp/log.do_compile.27643)
>>>
>>> Looks like net-tools is broken by something else too.
>>>
>>
>> I'm out of the office in about one hour. So someone else is
>> going to have to pick up the libc-headers fix.
>>
>
>
> Switching to my gmail, so I can follow along.
>
> I do have about a half hour now, I'll check the net uapi code in the
> kernel and see
> if there's another fixup I can do.
>
> These errors have been lurking for about the last year, the answer from
> the kernel
> folks is typically "change the order of your includes".
>
> So there are two routes to fix it. See if there's a newer userspace with
> the includes
> changed, or do what I did, take the change out of libc-headers.
>
Yep. Same criminals, it is very likely this. I started a build, if it
breaks, I'll test a removal
of this:
-----------
commit 1fe8e0f074c77aa41aaa579345a9e675acbebfa9
Author: Mikko Rapeli <mikko.rapeli@iki.fi>
Date: Mon Aug 22 20:32:39 2016 +0200
include/uapi/linux/if_tunnel.h: include linux/if.h, linux/ip.h and
linux/in6.h
Fixes userspace compilation errors like:
error: field <E2><80><98>iph<E2><80><99> has incomplete type
error: field <E2><80><98>prefix<E2><80><99> has incomplete type
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
:100644 100644 1046f5515174... 777b6cdb1b7b... M
include/uapi/linux/if_tunnel.h
--------
>
> I'll check to see if I can do the latter here.
>
> Out of curiosity, what image type is this ? built core-image-sato,
> kernel-dev for
> x86-64 and they all worked.
>
> Bruce
>
>
>>
>> Cheers,
>>
>> Bruce
>>
>>
>>> Ross
>>>
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee
> at its end"
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 7396 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 15:57 ` Bruce Ashfield
2016-10-03 16:02 ` Bruce Ashfield
@ 2016-10-03 16:03 ` Burton, Ross
2016-10-03 16:07 ` Bruce Ashfield
1 sibling, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2016-10-03 16:03 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
On 3 October 2016 at 16:57, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> Out of curiosity, what image type is this ? built core-image-sato,
> kernel-dev for
> x86-64 and they all worked.
>
net-tools (via core-image-full-cmdline -c populate_sdk) for intel-corei7-64.
Ross
[-- Attachment #2: Type: text/html, Size: 668 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 16:03 ` Burton, Ross
@ 2016-10-03 16:07 ` Bruce Ashfield
2016-10-03 16:55 ` Bruce Ashfield
0 siblings, 1 reply; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 16:07 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
On Mon, Oct 3, 2016 at 12:03 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 3 October 2016 at 16:57, Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
>
>> Out of curiosity, what image type is this ? built core-image-sato,
>> kernel-dev for
>> x86-64 and they all worked.
>>
>
> net-tools (via core-image-full-cmdline -c populate_sdk) for
> intel-corei7-64.
>
ok. I've reproduced the failure by building just that package, with any
luck I can spin
something for it in the next few minutes and then launch a full build of
that image.
Bruce
>
> Ross
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 1737 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 16:07 ` Bruce Ashfield
@ 2016-10-03 16:55 ` Bruce Ashfield
2016-10-03 22:09 ` Richard Purdie
0 siblings, 1 reply; 16+ messages in thread
From: Bruce Ashfield @ 2016-10-03 16:55 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]
On Mon, Oct 3, 2016 at 12:07 PM, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
>
>
> On Mon, Oct 3, 2016 at 12:03 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
>
>>
>> On 3 October 2016 at 16:57, Bruce Ashfield <bruce.ashfield@gmail.com>
>> wrote:
>>
>>> Out of curiosity, what image type is this ? built core-image-sato,
>>> kernel-dev for
>>> x86-64 and they all worked.
>>>
>>
>> net-tools (via core-image-full-cmdline -c populate_sdk) for
>> intel-corei7-64.
>>
>
>
> ok. I've reproduced the failure by building just that package, with any
> luck I can spin
> something for it in the next few minutes and then launch a full build of
> that image.
>
>
patch sent. I can now build net-tools, and I launched a full build of
core-image-full-cmdline.
The clock is ticking on me now .. but I'll be around for another hour to
monitor things.=
Bruce
> Bruce
>
>
>>
>> Ross
>>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee
> at its end"
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 2927 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request
2016-10-03 16:55 ` Bruce Ashfield
@ 2016-10-03 22:09 ` Richard Purdie
0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2016-10-03 22:09 UTC (permalink / raw)
To: Bruce Ashfield, Burton, Ross; +Cc: OE-core
On Mon, 2016-10-03 at 12:55 -0400, Bruce Ashfield wrote:
>
>
> On Mon, Oct 3, 2016 at 12:07 PM, Bruce Ashfield <bruce.ashfield@gmail
> .com> wrote:
> >
> >
> > On Mon, Oct 3, 2016 at 12:03 PM, Burton, Ross <ross.burton@intel.co
> > m> wrote:
> > >
> > > On 3 October 2016 at 16:57, Bruce Ashfield <bruce.ashfield@gmail.
> > > com> wrote:
> > > > Out of curiosity, what image type is this ? built core-image-
> > > > sato, kernel-dev for
> > > > x86-64 and they all worked.
> > > >
> > > net-tools (via core-image-full-cmdline -c populate_sdk) for
> > > intel-corei7-64.
> > >
> >
> > ok. I've reproduced the failure by building just that package, with
> > any luck I can spin
> > something for it in the next few minutes and then launch a full
> > build of that image.
> >
> >
> patch sent. I can now build net-tools, and I launched a full build of
> core-image-full-cmdline.
> The clock is ticking on me now .. but I'll be around for another hour
> to monitor things.=
I've been running builds and it seems things are looking much greener
now FWIW!
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-10-03 22:09 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-03 5:54 [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Bruce Ashfield
2016-10-03 5:54 ` [PATCH 1/7] linux-yocto/4.8: mmc configuration for x86* Bruce Ashfield
2016-10-03 5:54 ` [PATCH 2/7] linux-yocto/4.1: update to 4.1.33 Bruce Ashfield
2016-10-03 5:54 ` [PATCH 3/7] linux-yocto/4.4: update to v4.4.22 Bruce Ashfield
2016-10-03 5:54 ` [PATCH 4/7] linux-yocto/4.1/4.4: remove innappropriate standard/base patches Bruce Ashfield
2016-10-03 5:54 ` [PATCH 5/7] linux-libc-headers: update to 4.8 final Bruce Ashfield
2016-10-03 5:54 ` [PATCH 6/7] linux-yocto/4.8: update to 4.8 -final release Bruce Ashfield
2016-10-03 5:54 ` [PATCH 7/7] linux-libc-headers: fix in/if.h includes Bruce Ashfield
2016-10-03 15:45 ` [PATCH 0/7] linux-yocto: consolidated (and hopefully final) pull request Burton, Ross
2016-10-03 15:51 ` Bruce Ashfield
2016-10-03 15:57 ` Bruce Ashfield
2016-10-03 16:02 ` Bruce Ashfield
2016-10-03 16:03 ` Burton, Ross
2016-10-03 16:07 ` Bruce Ashfield
2016-10-03 16:55 ` Bruce Ashfield
2016-10-03 22:09 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox