* [OE-core][dunfell 01/25] libdrm: upgrade 2.4.100 -> 2.4.101
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 02/25] u-boot: support merging .cfg files for UBOOT_CONFIG Steve Sakoman
` (23 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Version update to fix autobuilder oe_selftest failures on Ubuntu 18.04 and 20.04
2020-06-29 20:57:58,686 - oe-selftest - INFO - runtime_test.TestImage.test_testimage_virgl_gtk_sdl (subunit.RemotedTestCase)
2020-06-29 20:57:58,687 - oe-selftest - INFO - ... FAIL
musl-ioctl.patch
removed since it is included in 2.4.101
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 015e631cd18d982df03d4c829c0f8229a2face38)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../drm/libdrm/musl-ioctl.patch | 35 -------------------
.../{libdrm_2.4.100.bb => libdrm_2.4.101.bb} | 7 ++--
2 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 meta/recipes-graphics/drm/libdrm/musl-ioctl.patch
rename meta/recipes-graphics/drm/{libdrm_2.4.100.bb => libdrm_2.4.101.bb} (92%)
diff --git a/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch b/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch
deleted file mode 100644
index e3d6c5b853..0000000000
--- a/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Mon, 18 Jun 2018 15:07:03 +0100
-Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
-
-POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
-use (int, unsigned long int, ...) instead.
-
-Use a #ifdef to adapt the replacement function as appropriate.
----
- tests/nouveau/threaded.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
-index 3669bcd3..e1c27c01 100644
---- a/tests/nouveau/threaded.c
-+++ b/tests/nouveau/threaded.c
-@@ -36,7 +36,11 @@ static int failed;
-
- static int import_fd;
-
-+#ifdef __GLIBC__
- int ioctl(int fd, unsigned long request, ...)
-+#else
-+int ioctl(int fd, int request, ...)
-+#endif
- {
- va_list va;
- int ret;
---
-2.11.0
-
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.100.bb b/meta/recipes-graphics/drm/libdrm_2.4.101.bb
similarity index 92%
rename from meta/recipes-graphics/drm/libdrm_2.4.100.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.101.bb
index 4859425672..8ec566faa9 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.100.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.101.bb
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5
PROVIDES = "drm"
DEPENDS = "libpthread-stubs"
-SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
- file://musl-ioctl.patch"
-SRC_URI[md5sum] = "f47bc87e28198ba527e6b44ffdd62f65"
-SRC_URI[sha256sum] = "c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d"
+SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz"
+SRC_URI[md5sum] = "e6a6f1b88963210b3d62acd7310a1cc7"
+SRC_URI[sha256sum] = "ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7"
inherit meson pkgconfig manpages
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 02/25] u-boot: support merging .cfg files for UBOOT_CONFIG
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 01/25] libdrm: upgrade 2.4.100 -> 2.4.101 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 03/25] u-boot: avoid blind merging all *.cfg Steve Sakoman
` (22 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Ming Liu <ming.liu@toradex.com>
U-boot recipe supports .cfg files in SRC_URI, but they would be merged
to .config during do_configure only when UBOOT_MACHINE is set, we
should also support merging .cfg files for UBOOT_CONFIG.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ce3de00d41791fa5e9557c5e93a99fbe368311f5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-bsp/u-boot/u-boot.inc | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index cbe15cb3c8..f905dfed4e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -81,7 +81,23 @@ def find_cfgs(d):
return sources_list
do_configure () {
- if [ -z "${UBOOT_CONFIG}" ]; then
+ if [ -n "${UBOOT_CONFIG}" ]; then
+ unset i j
+ for config in ${UBOOT_MACHINE}; do
+ i=$(expr $i + 1);
+ for type in ${UBOOT_CONFIG}; do
+ j=$(expr $j + 1);
+ if [ $j -eq $i ]; then
+ oe_runmake -C ${S} O=${B}/${config} ${config}
+ merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
+ oe_runmake -C ${S} O=${B}/${config} oldconfig
+ fi
+ done
+ unset j
+ done
+ unset i
+ DEVTOOL_DISABLE_MENUCONFIG=true
+ else
if [ -n "${UBOOT_MACHINE}" ]; then
oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
else
@@ -89,8 +105,6 @@ do_configure () {
fi
merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
cml1_do_configure
- else
- DEVTOOL_DISABLE_MENUCONFIG=true
fi
}
@@ -118,7 +132,6 @@ do_compile () {
j=$(expr $j + 1);
if [ $j -eq $i ]
then
- oe_runmake -C ${S} O=${B}/${config} ${config}
oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET}
for binary in ${UBOOT_BINARIES}; do
k=$(expr $k + 1);
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 03/25] u-boot: avoid blind merging all *.cfg
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 01/25] libdrm: upgrade 2.4.100 -> 2.4.101 Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 02/25] u-boot: support merging .cfg files for UBOOT_CONFIG Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first Steve Sakoman
` (21 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Jens Rehsack <rehsack@gmail.com>
This fixes u-boot-qoriq breakage of:
commit 4fde8c8f479f5acd24fb6e0d0b9b4dc94d6f560b
Author: Ming Liu <ming.liu@toradex.com>
Date: Wed Jun 3 13:56:01 2020 +0200
u-boot: support merging .cfg files for UBOOT_CONFIG
U-boot recipe supports .cfg files in SRC_URI, but they would be merged
to .config during do_configure only when UBOOT_MACHINE is set, we
should also support merging .cfg files for UBOOT_CONFIG.
The intension of 4fde8c8 looks more than append delta-config snippets to
u-boot config and should probably be rewritten to express that much better
than implicitely assume all "*.cfg" are for merging into .config.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b4644f231a1463123d4100fcaf1448b3d174ef1a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-bsp/u-boot/u-boot.inc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index f905dfed4e..bed759c7c5 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -89,8 +89,10 @@ do_configure () {
j=$(expr $j + 1);
if [ $j -eq $i ]; then
oe_runmake -C ${S} O=${B}/${config} ${config}
- merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
- oe_runmake -C ${S} O=${B}/${config} oldconfig
+ if [ test -n "${@' '.join(find_cfgs(d))}" ]; then
+ merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
+ oe_runmake -C ${S} O=${B}/${config} oldconfig
+ fi
fi
done
unset j
@@ -123,7 +125,7 @@ do_compile () {
echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
fi
- if [ -n "${UBOOT_CONFIG}" ]
+ if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ]
then
unset i j k
for config in ${UBOOT_MACHINE}; do
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (2 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 03/25] u-boot: avoid blind merging all *.cfg Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:29 ` Bruce Ashfield
2020-07-06 16:10 ` [OE-core][dunfell 05/25] linux-yocto/5.4: update to v5.4.45 Steve Sakoman
` (20 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
It is uncommon that a BSP definition and a defconfig are used in
a single configuration. That being said, it is a valid way to
organize kernel configuration meta data.
When a defconfig is used, either on the src_uri or from in
the kernel tree, it is normally expected that it is the baseline,
with all options applied on top of it.
With this commit, we detect either type of defconfig and ensure
that it is used first, followed by the fragments in their
previous order. This allows existing configuration stacks to
remain the same, while ensuring that a defconfig combined stack
works as expected.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5bc627066e..41d8620e67 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -131,7 +131,7 @@ do_kernel_metadata() {
else
cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
fi
- sccs="${WORKDIR}/defconfig"
+ in_tree_defconfig="${WORKDIR}/defconfig"
else
bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
fi
@@ -153,14 +153,24 @@ do_kernel_metadata() {
patches="${@" ".join(find_patches(d,''))}"
feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
- # a quick check to make sure we don't have duplicate defconfigs
- # If there's a defconfig in the SRC_URI, did we also have one from
- # the KBUILD_DEFCONFIG processing above ?
- if [ -n "$sccs" ]; then
- # we did have a defconfig from above. remove any that might be in the src_uri
- sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
+ # a quick check to make sure we don't have duplicate defconfigs If
+ # there's a defconfig in the SRC_URI, did we also have one from the
+ # KBUILD_DEFCONFIG processing above ?
+ src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
+ # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
+ sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
+ if [ -n "$in_tree_defconfig" ]; then
+ sccs_defconfig=$in_tree_defconfig
+ if [ -n "$src_uri_defconfig" ]; then
+ bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
+ fi
+ else
+ # if we didn't have an in-tree one, make our defconfig the one
+ # from the src_uri. Note: there may not have been one from the
+ # src_uri, so this can be an empty variable.
+ sccs_defconfig=$src_uri_defconfig
fi
- sccs="$sccs $sccs_from_src_uri"
+ sccs="$sccs_from_src_uri"
# check for feature directories/repos/branches that were part of the
# SRC_URI. If they were supplied, we convert them into include directives
@@ -187,11 +197,10 @@ do_kernel_metadata() {
# expand kernel features into their full path equivalents
bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
if [ -z "$bsp_definition" ]; then
- echo "$sccs" | grep -q defconfig
- if [ $? -ne 0 ]; then
+ if [ -z "$sccs_defconfig" ]; then
bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
fi
-
+ else
# if the bsp definition has "define KMETA_EXTERNAL_BSP t",
# then we need to set a flag that will instruct the next
# steps to use the BSP as both configuration and patches.
@@ -206,7 +215,7 @@ do_kernel_metadata() {
elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
if [ -n "${elements}" ]; then
echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
- scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+ scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
if [ $? -ne 0 ]; then
bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
fi
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-06 16:10 ` [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first Steve Sakoman
@ 2020-07-06 16:29 ` Bruce Ashfield
2020-07-06 16:38 ` Steve Sakoman
0 siblings, 1 reply; 40+ messages in thread
From: Bruce Ashfield @ 2020-07-06 16:29 UTC (permalink / raw)
To: Steve Sakoman; +Cc: Patches and discussions about the oe-core layer
We have a fixup patch for this one in test right now, so we don't want
this patch, without the follow up.
But this is useful for dunfell, since it was an unexpected behaviour
that needed to be fixed.
Cheers,
Bruce
On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> It is uncommon that a BSP definition and a defconfig are used in
> a single configuration. That being said, it is a valid way to
> organize kernel configuration meta data.
>
> When a defconfig is used, either on the src_uri or from in
> the kernel tree, it is normally expected that it is the baseline,
> with all options applied on top of it.
>
> With this commit, we detect either type of defconfig and ensure
> that it is used first, followed by the fragments in their
> previous order. This allows existing configuration stacks to
> remain the same, while ensuring that a defconfig combined stack
> works as expected.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
> 1 file changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> index 5bc627066e..41d8620e67 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -131,7 +131,7 @@ do_kernel_metadata() {
> else
> cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> fi
> - sccs="${WORKDIR}/defconfig"
> + in_tree_defconfig="${WORKDIR}/defconfig"
> else
> bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> fi
> @@ -153,14 +153,24 @@ do_kernel_metadata() {
> patches="${@" ".join(find_patches(d,''))}"
> feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
>
> - # a quick check to make sure we don't have duplicate defconfigs
> - # If there's a defconfig in the SRC_URI, did we also have one from
> - # the KBUILD_DEFCONFIG processing above ?
> - if [ -n "$sccs" ]; then
> - # we did have a defconfig from above. remove any that might be in the src_uri
> - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> + # a quick check to make sure we don't have duplicate defconfigs If
> + # there's a defconfig in the SRC_URI, did we also have one from the
> + # KBUILD_DEFCONFIG processing above ?
> + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
> + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
> + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> + if [ -n "$in_tree_defconfig" ]; then
> + sccs_defconfig=$in_tree_defconfig
> + if [ -n "$src_uri_defconfig" ]; then
> + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> + fi
> + else
> + # if we didn't have an in-tree one, make our defconfig the one
> + # from the src_uri. Note: there may not have been one from the
> + # src_uri, so this can be an empty variable.
> + sccs_defconfig=$src_uri_defconfig
> fi
> - sccs="$sccs $sccs_from_src_uri"
> + sccs="$sccs_from_src_uri"
>
> # check for feature directories/repos/branches that were part of the
> # SRC_URI. If they were supplied, we convert them into include directives
> @@ -187,11 +197,10 @@ do_kernel_metadata() {
> # expand kernel features into their full path equivalents
> bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> if [ -z "$bsp_definition" ]; then
> - echo "$sccs" | grep -q defconfig
> - if [ $? -ne 0 ]; then
> + if [ -z "$sccs_defconfig" ]; then
> bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
> fi
> -
> + else
> # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
> # then we need to set a flag that will instruct the next
> # steps to use the BSP as both configuration and patches.
> @@ -206,7 +215,7 @@ do_kernel_metadata() {
> elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
> if [ -n "${elements}" ]; then
> echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
> - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
> if [ $? -ne 0 ]; then
> bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
> fi
> --
> 2.17.1
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-06 16:29 ` Bruce Ashfield
@ 2020-07-06 16:38 ` Steve Sakoman
2020-07-22 21:27 ` Ryan Harkin
0 siblings, 1 reply; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:38 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> We have a fixup patch for this one in test right now, so we don't want
> this patch, without the follow up.
>
> But this is useful for dunfell, since it was an unexpected behaviour
> that needed to be fixed.
Thanks, I'll drop this patch from the pull request and include it
along with the fixup patch in next week's patch set.
Steve
> On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
> >
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > It is uncommon that a BSP definition and a defconfig are used in
> > a single configuration. That being said, it is a valid way to
> > organize kernel configuration meta data.
> >
> > When a defconfig is used, either on the src_uri or from in
> > the kernel tree, it is normally expected that it is the baseline,
> > with all options applied on top of it.
> >
> > With this commit, we detect either type of defconfig and ensure
> > that it is used first, followed by the fragments in their
> > previous order. This allows existing configuration stacks to
> > remain the same, while ensuring that a defconfig combined stack
> > works as expected.
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
> > 1 file changed, 21 insertions(+), 12 deletions(-)
> >
> > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> > index 5bc627066e..41d8620e67 100644
> > --- a/meta/classes/kernel-yocto.bbclass
> > +++ b/meta/classes/kernel-yocto.bbclass
> > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> > else
> > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> > fi
> > - sccs="${WORKDIR}/defconfig"
> > + in_tree_defconfig="${WORKDIR}/defconfig"
> > else
> > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> > fi
> > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> > patches="${@" ".join(find_patches(d,''))}"
> > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
> >
> > - # a quick check to make sure we don't have duplicate defconfigs
> > - # If there's a defconfig in the SRC_URI, did we also have one from
> > - # the KBUILD_DEFCONFIG processing above ?
> > - if [ -n "$sccs" ]; then
> > - # we did have a defconfig from above. remove any that might be in the src_uri
> > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> > + # a quick check to make sure we don't have duplicate defconfigs If
> > + # there's a defconfig in the SRC_URI, did we also have one from the
> > + # KBUILD_DEFCONFIG processing above ?
> > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
> > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
> > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> > + if [ -n "$in_tree_defconfig" ]; then
> > + sccs_defconfig=$in_tree_defconfig
> > + if [ -n "$src_uri_defconfig" ]; then
> > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> > + fi
> > + else
> > + # if we didn't have an in-tree one, make our defconfig the one
> > + # from the src_uri. Note: there may not have been one from the
> > + # src_uri, so this can be an empty variable.
> > + sccs_defconfig=$src_uri_defconfig
> > fi
> > - sccs="$sccs $sccs_from_src_uri"
> > + sccs="$sccs_from_src_uri"
> >
> > # check for feature directories/repos/branches that were part of the
> > # SRC_URI. If they were supplied, we convert them into include directives
> > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> > # expand kernel features into their full path equivalents
> > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> > if [ -z "$bsp_definition" ]; then
> > - echo "$sccs" | grep -q defconfig
> > - if [ $? -ne 0 ]; then
> > + if [ -z "$sccs_defconfig" ]; then
> > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
> > fi
> > -
> > + else
> > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
> > # then we need to set a flag that will instruct the next
> > # steps to use the BSP as both configuration and patches.
> > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
> > if [ -n "${elements}" ]; then
> > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
> > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
> > if [ $? -ne 0 ]; then
> > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
> > fi
> > --
> > 2.17.1
> >
> >
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-06 16:38 ` Steve Sakoman
@ 2020-07-22 21:27 ` Ryan Harkin
2020-07-23 1:58 ` Bruce Ashfield
0 siblings, 1 reply; 40+ messages in thread
From: Ryan Harkin @ 2020-07-22 21:27 UTC (permalink / raw)
To: Steve Sakoman
Cc: Bruce Ashfield, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 9788 bytes --]
Just an FYI, but when this was submitted, my imx7s-warp builds began to
fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
I'm not sure why yet, I've only discovered the problem, but I thought I'd
report it in case anyone else sees the problem.
Here's a link to my failing build for reference:
https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
And a snippet from the failure:
ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme:
Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
failed with exit code 1:
WARNING: exit code 1 from a shell command.
ERROR: Logfile of failure stored in:
/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
Log data follows:
| DEBUG: Executing python function extend_recipe_sysroot
| NOTE: Direct dependencies are
['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
'/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
'/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
'/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot',
'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
'/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
| NOTE: Installed into sysroot: []
| NOTE: Skipping as already exists in sysroot: ['bison-native',
'kern-tools-native', 'binutils-cross-arm', 'quilt-native',
'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native',
'texinfo-dummy-native', 'gnu-config-native', 'readline-native',
'libtool-native', 'automake-native', 'autoconf-native', 'xz-native',
'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native',
'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native',
'ncurses-native', 'pkgconfig-native']
| DEBUG: Python function extend_recipe_sysroot finished
| DEBUG: Executing shell function do_kernel_configme
| WARNING: exit code 1 from a shell command.
| ERROR: Execution of
'/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
failed with exit code 1:
| WARNING: exit code 1 from a shell command.
|
NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task
do_kernel_configme: Failed
ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme)
failed with exit code '1'
On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
> >
> > We have a fixup patch for this one in test right now, so we don't want
> > this patch, without the follow up.
> >
> > But this is useful for dunfell, since it was an unexpected behaviour
> > that needed to be fixed.
>
> Thanks, I'll drop this patch from the pull request and include it
> along with the fixup patch in next week's patch set.
>
> Steve
>
> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
> > >
> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >
> > > It is uncommon that a BSP definition and a defconfig are used in
> > > a single configuration. That being said, it is a valid way to
> > > organize kernel configuration meta data.
> > >
> > > When a defconfig is used, either on the src_uri or from in
> > > the kernel tree, it is normally expected that it is the baseline,
> > > with all options applied on top of it.
> > >
> > > With this commit, we detect either type of defconfig and ensure
> > > that it is used first, followed by the fragments in their
> > > previous order. This allows existing configuration stacks to
> > > remain the same, while ensuring that a defconfig combined stack
> > > works as expected.
> > >
> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > ---
> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
> > > 1 file changed, 21 insertions(+), 12 deletions(-)
> > >
> > > diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> > > index 5bc627066e..41d8620e67 100644
> > > --- a/meta/classes/kernel-yocto.bbclass
> > > +++ b/meta/classes/kernel-yocto.bbclass
> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> > > else
> > > cp -f
> ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> > > fi
> > > - sccs="${WORKDIR}/defconfig"
> > > + in_tree_defconfig="${WORKDIR}/defconfig"
> > > else
> > > bbfatal "A KBUILD_DEFCONFIG
> '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> > > fi
> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> > > patches="${@" ".join(find_patches(d,''))}"
> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
> > >
> > > - # a quick check to make sure we don't have duplicate defconfigs
> > > - # If there's a defconfig in the SRC_URI, did we also have one
> from
> > > - # the KBUILD_DEFCONFIG processing above ?
> > > - if [ -n "$sccs" ]; then
> > > - # we did have a defconfig from above. remove any that
> might be in the src_uri
> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if
> ($0!="defconfig") { print $0 } }' RS=' ')
> > > + # a quick check to make sure we don't have duplicate
> defconfigs If
> > > + # there's a defconfig in the SRC_URI, did we also have one
> from the
> > > + # KBUILD_DEFCONFIG processing above ?
> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if
> ($0=="defconfig") { print $0 } }' RS=' ')
> > > + # drop and defconfig's from the src_uri variable, we captured
> it just above here if it existed
> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if
> ($0!="defconfig") { print $0 } }' RS=' ')
> > > + if [ -n "$in_tree_defconfig" ]; then
> > > + sccs_defconfig=$in_tree_defconfig
> > > + if [ -n "$src_uri_defconfig" ]; then
> > > + bbwarn "[NOTE]: defconfig was supplied both
> via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> > > + fi
> > > + else
> > > + # if we didn't have an in-tree one, make our defconfig
> the one
> > > + # from the src_uri. Note: there may not have been one
> from the
> > > + # src_uri, so this can be an empty variable.
> > > + sccs_defconfig=$src_uri_defconfig
> > > fi
> > > - sccs="$sccs $sccs_from_src_uri"
> > > + sccs="$sccs_from_src_uri"
> > >
> > > # check for feature directories/repos/branches that were part
> of the
> > > # SRC_URI. If they were supplied, we convert them into include
> directives
> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> > > # expand kernel features into their full path equivalents
> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE}
> -DKTYPE=${LINUX_KERNEL_TYPE})
> > > if [ -z "$bsp_definition" ]; then
> > > - echo "$sccs" | grep -q defconfig
> > > - if [ $? -ne 0 ]; then
> > > + if [ -z "$sccs_defconfig" ]; then
> > > bbfatal_log "Could not locate BSP definition
> for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
> > > fi
> > > -
> > > + else
> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP
> t",
> > > # then we need to set a flag that will instruct the
> next
> > > # steps to use the BSP as both configuration and
> patches.
> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches}
> ${KERNEL_FEATURES}`"
> > > if [ -n "${elements}" ]; then
> > > echo "${bsp_definition}" >
> ${S}/${meta_dir}/bsp_definition
> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta
> ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta
> ${includes} $sccs_defconfig $bsp_definition $sccs $patches
> ${KERNEL_FEATURES}
> > > if [ $? -ne 0 ]; then
> > > bbfatal_log "Could not generate configuration
> queue for ${KMACHINE}."
> > > fi
> > > --
> > > 2.17.1
> > >
> > >
> >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> > thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
>
>
[-- Attachment #2: Type: text/html, Size: 12665 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-22 21:27 ` Ryan Harkin
@ 2020-07-23 1:58 ` Bruce Ashfield
2020-07-23 3:33 ` Steve Sakoman
0 siblings, 1 reply; 40+ messages in thread
From: Bruce Ashfield @ 2020-07-23 1:58 UTC (permalink / raw)
To: Ryan Harkin
Cc: Steve Sakoman, Patches and discussions about the oe-core layer
On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>
> Just an FYI, but when this was submitted, my imx7s-warp builds began to fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
>
> I'm not sure why yet, I've only discovered the problem, but I thought I'd report it in case anyone else sees the problem.
>
Someone already sent a dunfell backport request for a follow up patch to this.
It went to the poky list, but I just replied to it and copied oe-core.
Bruce
Bruce
> Here's a link to my failing build for reference:
> https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
>
> And a snippet from the failure:
>
> ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
> WARNING: exit code 1 from a shell command.
>
> ERROR: Logfile of failure stored in: /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
> Log data follows:
> | DEBUG: Executing python function extend_recipe_sysroot
> | NOTE: Direct dependencies are ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
> | NOTE: Installed into sysroot: []
> | NOTE: Skipping as already exists in sysroot: ['bison-native', 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native', 'gnu-config-native', 'readline-native', 'libtool-native', 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native', 'pkgconfig-native']
> | DEBUG: Python function extend_recipe_sysroot finished
> | DEBUG: Executing shell function do_kernel_configme
> | WARNING: exit code 1 from a shell command.
> | ERROR: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
> | WARNING: exit code 1 from a shell command.
> |
> NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task do_kernel_configme: Failed
> ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme) failed with exit code '1'
>
>
>
> On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
>>
>> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >
>> > We have a fixup patch for this one in test right now, so we don't want
>> > this patch, without the follow up.
>> >
>> > But this is useful for dunfell, since it was an unexpected behaviour
>> > that needed to be fixed.
>>
>> Thanks, I'll drop this patch from the pull request and include it
>> along with the fixup patch in next week's patch set.
>>
>> Steve
>>
>> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
>> > >
>> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
>> > >
>> > > It is uncommon that a BSP definition and a defconfig are used in
>> > > a single configuration. That being said, it is a valid way to
>> > > organize kernel configuration meta data.
>> > >
>> > > When a defconfig is used, either on the src_uri or from in
>> > > the kernel tree, it is normally expected that it is the baseline,
>> > > with all options applied on top of it.
>> > >
>> > > With this commit, we detect either type of defconfig and ensure
>> > > that it is used first, followed by the fragments in their
>> > > previous order. This allows existing configuration stacks to
>> > > remain the same, while ensuring that a defconfig combined stack
>> > > works as expected.
>> > >
>> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
>> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
>> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
>> > > ---
>> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
>> > > 1 file changed, 21 insertions(+), 12 deletions(-)
>> > >
>> > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> > > index 5bc627066e..41d8620e67 100644
>> > > --- a/meta/classes/kernel-yocto.bbclass
>> > > +++ b/meta/classes/kernel-yocto.bbclass
>> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
>> > > else
>> > > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
>> > > fi
>> > > - sccs="${WORKDIR}/defconfig"
>> > > + in_tree_defconfig="${WORKDIR}/defconfig"
>> > > else
>> > > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
>> > > fi
>> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
>> > > patches="${@" ".join(find_patches(d,''))}"
>> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
>> > >
>> > > - # a quick check to make sure we don't have duplicate defconfigs
>> > > - # If there's a defconfig in the SRC_URI, did we also have one from
>> > > - # the KBUILD_DEFCONFIG processing above ?
>> > > - if [ -n "$sccs" ]; then
>> > > - # we did have a defconfig from above. remove any that might be in the src_uri
>> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> > > + # a quick check to make sure we don't have duplicate defconfigs If
>> > > + # there's a defconfig in the SRC_URI, did we also have one from the
>> > > + # KBUILD_DEFCONFIG processing above ?
>> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
>> > > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
>> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> > > + if [ -n "$in_tree_defconfig" ]; then
>> > > + sccs_defconfig=$in_tree_defconfig
>> > > + if [ -n "$src_uri_defconfig" ]; then
>> > > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
>> > > + fi
>> > > + else
>> > > + # if we didn't have an in-tree one, make our defconfig the one
>> > > + # from the src_uri. Note: there may not have been one from the
>> > > + # src_uri, so this can be an empty variable.
>> > > + sccs_defconfig=$src_uri_defconfig
>> > > fi
>> > > - sccs="$sccs $sccs_from_src_uri"
>> > > + sccs="$sccs_from_src_uri"
>> > >
>> > > # check for feature directories/repos/branches that were part of the
>> > > # SRC_URI. If they were supplied, we convert them into include directives
>> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
>> > > # expand kernel features into their full path equivalents
>> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
>> > > if [ -z "$bsp_definition" ]; then
>> > > - echo "$sccs" | grep -q defconfig
>> > > - if [ $? -ne 0 ]; then
>> > > + if [ -z "$sccs_defconfig" ]; then
>> > > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
>> > > fi
>> > > -
>> > > + else
>> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
>> > > # then we need to set a flag that will instruct the next
>> > > # steps to use the BSP as both configuration and patches.
>> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
>> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
>> > > if [ -n "${elements}" ]; then
>> > > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
>> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
>> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
>> > > if [ $? -ne 0 ]; then
>> > > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
>> > > fi
>> > > --
>> > > 2.17.1
>> > >
>> > >
>> >
>> >
>> >
>> > --
>> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> > thee at its end
>> > - "Use the force Harry" - Gandalf, Star Trek II
>>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 1:58 ` Bruce Ashfield
@ 2020-07-23 3:33 ` Steve Sakoman
2020-07-23 9:34 ` Ryan Harkin
0 siblings, 1 reply; 40+ messages in thread
From: Steve Sakoman @ 2020-07-23 3:33 UTC (permalink / raw)
To: Bruce Ashfield
Cc: Ryan Harkin, Patches and discussions about the oe-core layer
On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
> >
> > Just an FYI, but when this was submitted, my imx7s-warp builds began to fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
> >
> > I'm not sure why yet, I've only discovered the problem, but I thought I'd report it in case anyone else sees the problem.
> >
>
> Someone already sent a dunfell backport request for a follow up patch to this.
>
> It went to the poky list, but I just replied to it and copied oe-core.
Both patches are already in dunfell!
https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
Steve
> > Here's a link to my failing build for reference:
> > https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
> >
> > And a snippet from the failure:
> >
> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
> > WARNING: exit code 1 from a shell command.
> >
> > ERROR: Logfile of failure stored in: /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
> > Log data follows:
> > | DEBUG: Executing python function extend_recipe_sysroot
> > | NOTE: Direct dependencies are ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
> > | NOTE: Installed into sysroot: []
> > | NOTE: Skipping as already exists in sysroot: ['bison-native', 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native', 'gnu-config-native', 'readline-native', 'libtool-native', 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native', 'pkgconfig-native']
> > | DEBUG: Python function extend_recipe_sysroot finished
> > | DEBUG: Executing shell function do_kernel_configme
> > | WARNING: exit code 1 from a shell command.
> > | ERROR: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
> > | WARNING: exit code 1 from a shell command.
> > |
> > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task do_kernel_configme: Failed
> > ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme) failed with exit code '1'
> >
> >
> >
> > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
> >>
> >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >> >
> >> > We have a fixup patch for this one in test right now, so we don't want
> >> > this patch, without the follow up.
> >> >
> >> > But this is useful for dunfell, since it was an unexpected behaviour
> >> > that needed to be fixed.
> >>
> >> Thanks, I'll drop this patch from the pull request and include it
> >> along with the fixup patch in next week's patch set.
> >>
> >> Steve
> >>
> >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
> >> > >
> >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> > >
> >> > > It is uncommon that a BSP definition and a defconfig are used in
> >> > > a single configuration. That being said, it is a valid way to
> >> > > organize kernel configuration meta data.
> >> > >
> >> > > When a defconfig is used, either on the src_uri or from in
> >> > > the kernel tree, it is normally expected that it is the baseline,
> >> > > with all options applied on top of it.
> >> > >
> >> > > With this commit, we detect either type of defconfig and ensure
> >> > > that it is used first, followed by the fragments in their
> >> > > previous order. This allows existing configuration stacks to
> >> > > remain the same, while ensuring that a defconfig combined stack
> >> > > works as expected.
> >> > >
> >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> >> > > ---
> >> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
> >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
> >> > >
> >> > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> >> > > index 5bc627066e..41d8620e67 100644
> >> > > --- a/meta/classes/kernel-yocto.bbclass
> >> > > +++ b/meta/classes/kernel-yocto.bbclass
> >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> >> > > else
> >> > > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> >> > > fi
> >> > > - sccs="${WORKDIR}/defconfig"
> >> > > + in_tree_defconfig="${WORKDIR}/defconfig"
> >> > > else
> >> > > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> >> > > fi
> >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> >> > > patches="${@" ".join(find_patches(d,''))}"
> >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
> >> > >
> >> > > - # a quick check to make sure we don't have duplicate defconfigs
> >> > > - # If there's a defconfig in the SRC_URI, did we also have one from
> >> > > - # the KBUILD_DEFCONFIG processing above ?
> >> > > - if [ -n "$sccs" ]; then
> >> > > - # we did have a defconfig from above. remove any that might be in the src_uri
> >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> > > + # a quick check to make sure we don't have duplicate defconfigs If
> >> > > + # there's a defconfig in the SRC_URI, did we also have one from the
> >> > > + # KBUILD_DEFCONFIG processing above ?
> >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
> >> > > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
> >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> > > + if [ -n "$in_tree_defconfig" ]; then
> >> > > + sccs_defconfig=$in_tree_defconfig
> >> > > + if [ -n "$src_uri_defconfig" ]; then
> >> > > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> >> > > + fi
> >> > > + else
> >> > > + # if we didn't have an in-tree one, make our defconfig the one
> >> > > + # from the src_uri. Note: there may not have been one from the
> >> > > + # src_uri, so this can be an empty variable.
> >> > > + sccs_defconfig=$src_uri_defconfig
> >> > > fi
> >> > > - sccs="$sccs $sccs_from_src_uri"
> >> > > + sccs="$sccs_from_src_uri"
> >> > >
> >> > > # check for feature directories/repos/branches that were part of the
> >> > > # SRC_URI. If they were supplied, we convert them into include directives
> >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> >> > > # expand kernel features into their full path equivalents
> >> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> >> > > if [ -z "$bsp_definition" ]; then
> >> > > - echo "$sccs" | grep -q defconfig
> >> > > - if [ $? -ne 0 ]; then
> >> > > + if [ -z "$sccs_defconfig" ]; then
> >> > > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
> >> > > fi
> >> > > -
> >> > > + else
> >> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
> >> > > # then we need to set a flag that will instruct the next
> >> > > # steps to use the BSP as both configuration and patches.
> >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> >> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
> >> > > if [ -n "${elements}" ]; then
> >> > > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
> >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
> >> > > if [ $? -ne 0 ]; then
> >> > > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
> >> > > fi
> >> > > --
> >> > > 2.17.1
> >> > >
> >> > >
> >> >
> >> >
> >> >
> >> > --
> >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> > thee at its end
> >> > - "Use the force Harry" - Gandalf, Star Trek II
> >>
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 3:33 ` Steve Sakoman
@ 2020-07-23 9:34 ` Ryan Harkin
2020-07-23 12:27 ` Bruce Ashfield
0 siblings, 1 reply; 40+ messages in thread
From: Ryan Harkin @ 2020-07-23 9:34 UTC (permalink / raw)
To: Steve Sakoman
Cc: Bruce Ashfield, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 15001 bytes --]
Hi Bruce, Steve,
Thanks for your replies and the help.
On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com> wrote:
> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
> >
> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org>
> wrote:
> > >
> > > Just an FYI, but when this was submitted, my imx7s-warp builds began
> to fail when building linux-fslc from meta-freescale /
> meta-freescale-3rdparty.
> > >
> > > I'm not sure why yet, I've only discovered the problem, but I thought
> I'd report it in case anyone else sees the problem.
> > >
> >
> > Someone already sent a dunfell backport request for a follow up patch to
> this.
> >
> > It went to the poky list, but I just replied to it and copied oe-core.
>
> Both patches are already in dunfell!
>
>
> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
>
> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
Yes, they are present. I guess I should have checked the error messages
more closely during git bisect rather than stopping as soon as the build
failed.
After Bruce's 7ecc81baea patch, I see this error:
ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata: Could
not locate BSP definition for imx7s-warp/standard and no defconfig was
provided
Then, after 11089e06bf, I see the error I originally posted from my CI job,
but reproduced here from a local build:
ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme:
Execution of
'/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899'
failed with exit code 1:
WARNING: exit code 1 from a shell command.
ERROR: Logfile of failure stored in:
/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
Log data follows:
| DEBUG: Executing python function extend_recipe_sysroot
| NOTE: Direct dependencies are
['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot',
'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
'/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
'/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
'/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:
do_populate_sysroot']
| NOTE: Installed into sysroot: []
| NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm',
'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native',
'kern-tools-native', 'patch-native', 'readline-native', 'flex-native',
'automake-native', 'texinfo-dummy-native', 'autoconf-native',
'libtool-native', 'gnu-config-native', 'xz-native',
'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native',
'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native',
'm4-native', 'pkgconfig-native']
| DEBUG: Python function extend_recipe_sysroot finished
| DEBUG: Executing shell function do_kernel_configme
| WARNING: exit code 1 from a shell command.
| ERROR: Execution of
'/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899'
failed with exit code 1:
| WARNING: exit code 1 from a shell command.
I haven't yet looked at what these patches do, but I'm expecting there's
something to update in the linux-fslc recipe, unless there's another issue
in the defconfig patches.
Regards,
Ryan.
>
>
> Steve
>
> > > Here's a link to my failing build for reference:
> > >
> https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
> > >
> > > And a snippet from the failure:
> > >
> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme:
> Execution of
> '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
> failed with exit code 1:
> > > WARNING: exit code 1 from a shell command.
> > >
> > > ERROR: Logfile of failure stored in:
> /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
> > > Log data follows:
> > > | DEBUG: Executing python function extend_recipe_sysroot
> > > | NOTE: Direct dependencies are
> ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
> 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot',
> 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:
> do_populate_sysroot']
> > > | NOTE: Installed into sysroot: []
> > > | NOTE: Skipping as already exists in sysroot: ['bison-native',
> 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native',
> 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native',
> 'gnu-config-native', 'readline-native', 'libtool-native',
> 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers',
> 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native',
> 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native',
> 'pkgconfig-native']
> > > | DEBUG: Python function extend_recipe_sysroot finished
> > > | DEBUG: Executing shell function do_kernel_configme
> > > | WARNING: exit code 1 from a shell command.
> > > | ERROR: Execution of
> '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
> failed with exit code 1:
> > > | WARNING: exit code 1 from a shell command.
> > > |
> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task
> do_kernel_configme: Failed
> > > ERROR: Task
> (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme)
> failed with exit code '1'
> > >
> > >
> > >
> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
> > >>
> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <
> bruce.ashfield@gmail.com> wrote:
> > >> >
> > >> > We have a fixup patch for this one in test right now, so we don't
> want
> > >> > this patch, without the follow up.
> > >> >
> > >> > But this is useful for dunfell, since it was an unexpected behaviour
> > >> > that needed to be fixed.
> > >>
> > >> Thanks, I'll drop this patch from the pull request and include it
> > >> along with the fixup patch in next week's patch set.
> > >>
> > >> Steve
> > >>
> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com>
> wrote:
> > >> > >
> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >> > >
> > >> > > It is uncommon that a BSP definition and a defconfig are used in
> > >> > > a single configuration. That being said, it is a valid way to
> > >> > > organize kernel configuration meta data.
> > >> > >
> > >> > > When a defconfig is used, either on the src_uri or from in
> > >> > > the kernel tree, it is normally expected that it is the baseline,
> > >> > > with all options applied on top of it.
> > >> > >
> > >> > > With this commit, we detect either type of defconfig and ensure
> > >> > > that it is used first, followed by the fragments in their
> > >> > > previous order. This allows existing configuration stacks to
> > >> > > remain the same, while ensuring that a defconfig combined stack
> > >> > > works as expected.
> > >> > >
> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
> >
> > >> > > (cherry picked from commit
> e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > >> > > ---
> > >> > > meta/classes/kernel-yocto.bbclass | 33
> ++++++++++++++++++++-----------
> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
> > >> > >
> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> > >> > > index 5bc627066e..41d8620e67 100644
> > >> > > --- a/meta/classes/kernel-yocto.bbclass
> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> > >> > > else
> > >> > > cp -f
> ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> > >> > > fi
> > >> > > - sccs="${WORKDIR}/defconfig"
> > >> > > + in_tree_defconfig="${WORKDIR}/defconfig"
> > >> > > else
> > >> > > bbfatal "A KBUILD_DEFCONFIG
> '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> > >> > > fi
> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> > >> > > patches="${@" ".join(find_patches(d,''))}"
> > >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
> > >> > >
> > >> > > - # a quick check to make sure we don't have duplicate
> defconfigs
> > >> > > - # If there's a defconfig in the SRC_URI, did we also have
> one from
> > >> > > - # the KBUILD_DEFCONFIG processing above ?
> > >> > > - if [ -n "$sccs" ]; then
> > >> > > - # we did have a defconfig from above. remove any that
> might be in the src_uri
> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{
> if ($0!="defconfig") { print $0 } }' RS=' ')
> > >> > > + # a quick check to make sure we don't have duplicate
> defconfigs If
> > >> > > + # there's a defconfig in the SRC_URI, did we also have
> one from the
> > >> > > + # KBUILD_DEFCONFIG processing above ?
> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if
> ($0=="defconfig") { print $0 } }' RS=' ')
> > >> > > + # drop and defconfig's from the src_uri variable, we
> captured it just above here if it existed
> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if
> ($0!="defconfig") { print $0 } }' RS=' ')
> > >> > > + if [ -n "$in_tree_defconfig" ]; then
> > >> > > + sccs_defconfig=$in_tree_defconfig
> > >> > > + if [ -n "$src_uri_defconfig" ]; then
> > >> > > + bbwarn "[NOTE]: defconfig was supplied
> both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> > >> > > + fi
> > >> > > + else
> > >> > > + # if we didn't have an in-tree one, make our
> defconfig the one
> > >> > > + # from the src_uri. Note: there may not have been
> one from the
> > >> > > + # src_uri, so this can be an empty variable.
> > >> > > + sccs_defconfig=$src_uri_defconfig
> > >> > > fi
> > >> > > - sccs="$sccs $sccs_from_src_uri"
> > >> > > + sccs="$sccs_from_src_uri"
> > >> > >
> > >> > > # check for feature directories/repos/branches that were
> part of the
> > >> > > # SRC_URI. If they were supplied, we convert them into
> include directives
> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> > >> > > # expand kernel features into their full path equivalents
> > >> > > bsp_definition=$(spp ${includes} --find
> -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> > >> > > if [ -z "$bsp_definition" ]; then
> > >> > > - echo "$sccs" | grep -q defconfig
> > >> > > - if [ $? -ne 0 ]; then
> > >> > > + if [ -z "$sccs_defconfig" ]; then
> > >> > > bbfatal_log "Could not locate BSP
> definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was
> provided"
> > >> > > fi
> > >> > > -
> > >> > > + else
> > >> > > # if the bsp definition has "define
> KMETA_EXTERNAL_BSP t",
> > >> > > # then we need to set a flag that will instruct
> the next
> > >> > > # steps to use the BSP as both configuration and
> patches.
> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> > >> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches}
> ${KERNEL_FEATURES}`"
> > >> > > if [ -n "${elements}" ]; then
> > >> > > echo "${bsp_definition}" >
> ${S}/${meta_dir}/bsp_definition
> > >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta
> ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> > >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta
> ${includes} $sccs_defconfig $bsp_definition $sccs $patches
> ${KERNEL_FEATURES}
> > >> > > if [ $? -ne 0 ]; then
> > >> > > bbfatal_log "Could not generate
> configuration queue for ${KMACHINE}."
> > >> > > fi
> > >> > > --
> > >> > > 2.17.1
> > >> > >
> > >> > >
> > >> >
> > >> >
> > >> >
> > >> > --
> > >> > - Thou shalt not follow the NULL pointer, for chaos and madness
> await
> > >> > thee at its end
> > >> > - "Use the force Harry" - Gandalf, Star Trek II
> > >>
> >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> > thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
>
[-- Attachment #2: Type: text/html, Size: 20213 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 9:34 ` Ryan Harkin
@ 2020-07-23 12:27 ` Bruce Ashfield
2020-07-23 13:38 ` Ryan Harkin
0 siblings, 1 reply; 40+ messages in thread
From: Bruce Ashfield @ 2020-07-23 12:27 UTC (permalink / raw)
To: Ryan Harkin
Cc: Steve Sakoman, Patches and discussions about the oe-core layer
On Thu, Jul 23, 2020 at 5:34 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>
> Hi Bruce, Steve,
>
> Thanks for your replies and the help.
>
> On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com> wrote:
>>
>> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >
>> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>> > >
>> > > Just an FYI, but when this was submitted, my imx7s-warp builds began to fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
>> > >
>> > > I'm not sure why yet, I've only discovered the problem, but I thought I'd report it in case anyone else sees the problem.
>> > >
>> >
>> > Someone already sent a dunfell backport request for a follow up patch to this.
>> >
>> > It went to the poky list, but I just replied to it and copied oe-core.
>>
>> Both patches are already in dunfell!
>>
>> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
>> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
>
>
> Yes, they are present. I guess I should have checked the error messages more closely during git bisect rather than stopping as soon as the build failed.
>
> After Bruce's 7ecc81baea patch, I see this error:
>
> ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata: Could not locate BSP definition for imx7s-warp/standard and no defconfig was provided
>
> Then, after 11089e06bf, I see the error I originally posted from my CI job, but reproduced here from a local build:
>
> ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
> WARNING: exit code 1 from a shell command.
>
> ERROR: Logfile of failure stored in: /data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
> Log data follows:
> | DEBUG: Executing python function extend_recipe_sysroot
> | NOTE: Direct dependencies are ['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot']
> | NOTE: Installed into sysroot: []
> | NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm', 'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native', 'kern-tools-native', 'patch-native', 'readline-native', 'flex-native', 'automake-native', 'texinfo-dummy-native', 'autoconf-native', 'libtool-native', 'gnu-config-native', 'xz-native', 'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native', 'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native', 'm4-native', 'pkgconfig-native']
> | DEBUG: Python function extend_recipe_sysroot finished
> | DEBUG: Executing shell function do_kernel_configme
> | WARNING: exit code 1 from a shell command.
> | ERROR: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
> | WARNING: exit code 1 from a shell command.
>
> I haven't yet looked at what these patches do, but I'm expecting there's something to update in the linux-fslc recipe, unless there's another issue in the defconfig patches.
>
We've had multiple reports that with those patches the linux-fslc
recipe is building. So something else may be going on in your setup.
If you have a set of layers and build steps, can you send them to me ?
I can spin up a local build and see if I get the same behaviour.
Bruce
> Regards,
> Ryan.
>
>
>
>
>
>
>>
>>
>>
>> Steve
>>
>> > > Here's a link to my failing build for reference:
>> > > https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
>> > >
>> > > And a snippet from the failure:
>> > >
>> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
>> > > WARNING: exit code 1 from a shell command.
>> > >
>> > > ERROR: Logfile of failure stored in: /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
>> > > Log data follows:
>> > > | DEBUG: Executing python function extend_recipe_sysroot
>> > > | NOTE: Direct dependencies are ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
>> > > | NOTE: Installed into sysroot: []
>> > > | NOTE: Skipping as already exists in sysroot: ['bison-native', 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native', 'gnu-config-native', 'readline-native', 'libtool-native', 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native', 'pkgconfig-native']
>> > > | DEBUG: Python function extend_recipe_sysroot finished
>> > > | DEBUG: Executing shell function do_kernel_configme
>> > > | WARNING: exit code 1 from a shell command.
>> > > | ERROR: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
>> > > | WARNING: exit code 1 from a shell command.
>> > > |
>> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task do_kernel_configme: Failed
>> > > ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme) failed with exit code '1'
>> > >
>> > >
>> > >
>> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
>> > >>
>> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> > >> >
>> > >> > We have a fixup patch for this one in test right now, so we don't want
>> > >> > this patch, without the follow up.
>> > >> >
>> > >> > But this is useful for dunfell, since it was an unexpected behaviour
>> > >> > that needed to be fixed.
>> > >>
>> > >> Thanks, I'll drop this patch from the pull request and include it
>> > >> along with the fixup patch in next week's patch set.
>> > >>
>> > >> Steve
>> > >>
>> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
>> > >> > >
>> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
>> > >> > >
>> > >> > > It is uncommon that a BSP definition and a defconfig are used in
>> > >> > > a single configuration. That being said, it is a valid way to
>> > >> > > organize kernel configuration meta data.
>> > >> > >
>> > >> > > When a defconfig is used, either on the src_uri or from in
>> > >> > > the kernel tree, it is normally expected that it is the baseline,
>> > >> > > with all options applied on top of it.
>> > >> > >
>> > >> > > With this commit, we detect either type of defconfig and ensure
>> > >> > > that it is used first, followed by the fragments in their
>> > >> > > previous order. This allows existing configuration stacks to
>> > >> > > remain the same, while ensuring that a defconfig combined stack
>> > >> > > works as expected.
>> > >> > >
>> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
>> > >> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > >> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
>> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
>> > >> > > ---
>> > >> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
>> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
>> > >> > >
>> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> > >> > > index 5bc627066e..41d8620e67 100644
>> > >> > > --- a/meta/classes/kernel-yocto.bbclass
>> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
>> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
>> > >> > > else
>> > >> > > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
>> > >> > > fi
>> > >> > > - sccs="${WORKDIR}/defconfig"
>> > >> > > + in_tree_defconfig="${WORKDIR}/defconfig"
>> > >> > > else
>> > >> > > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
>> > >> > > fi
>> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
>> > >> > > patches="${@" ".join(find_patches(d,''))}"
>> > >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
>> > >> > >
>> > >> > > - # a quick check to make sure we don't have duplicate defconfigs
>> > >> > > - # If there's a defconfig in the SRC_URI, did we also have one from
>> > >> > > - # the KBUILD_DEFCONFIG processing above ?
>> > >> > > - if [ -n "$sccs" ]; then
>> > >> > > - # we did have a defconfig from above. remove any that might be in the src_uri
>> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> > >> > > + # a quick check to make sure we don't have duplicate defconfigs If
>> > >> > > + # there's a defconfig in the SRC_URI, did we also have one from the
>> > >> > > + # KBUILD_DEFCONFIG processing above ?
>> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
>> > >> > > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
>> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> > >> > > + if [ -n "$in_tree_defconfig" ]; then
>> > >> > > + sccs_defconfig=$in_tree_defconfig
>> > >> > > + if [ -n "$src_uri_defconfig" ]; then
>> > >> > > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
>> > >> > > + fi
>> > >> > > + else
>> > >> > > + # if we didn't have an in-tree one, make our defconfig the one
>> > >> > > + # from the src_uri. Note: there may not have been one from the
>> > >> > > + # src_uri, so this can be an empty variable.
>> > >> > > + sccs_defconfig=$src_uri_defconfig
>> > >> > > fi
>> > >> > > - sccs="$sccs $sccs_from_src_uri"
>> > >> > > + sccs="$sccs_from_src_uri"
>> > >> > >
>> > >> > > # check for feature directories/repos/branches that were part of the
>> > >> > > # SRC_URI. If they were supplied, we convert them into include directives
>> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
>> > >> > > # expand kernel features into their full path equivalents
>> > >> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
>> > >> > > if [ -z "$bsp_definition" ]; then
>> > >> > > - echo "$sccs" | grep -q defconfig
>> > >> > > - if [ $? -ne 0 ]; then
>> > >> > > + if [ -z "$sccs_defconfig" ]; then
>> > >> > > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
>> > >> > > fi
>> > >> > > -
>> > >> > > + else
>> > >> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
>> > >> > > # then we need to set a flag that will instruct the next
>> > >> > > # steps to use the BSP as both configuration and patches.
>> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
>> > >> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
>> > >> > > if [ -n "${elements}" ]; then
>> > >> > > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
>> > >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
>> > >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
>> > >> > > if [ $? -ne 0 ]; then
>> > >> > > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
>> > >> > > fi
>> > >> > > --
>> > >> > > 2.17.1
>> > >> > >
>> > >> > >
>> > >> >
>> > >> >
>> > >> >
>> > >> > --
>> > >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> > >> > thee at its end
>> > >> > - "Use the force Harry" - Gandalf, Star Trek II
>> > >>
>> >
>> >
>> >
>> > --
>> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> > thee at its end
>> > - "Use the force Harry" - Gandalf, Star Trek II
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 12:27 ` Bruce Ashfield
@ 2020-07-23 13:38 ` Ryan Harkin
2020-07-23 15:04 ` Bruce Ashfield
0 siblings, 1 reply; 40+ messages in thread
From: Ryan Harkin @ 2020-07-23 13:38 UTC (permalink / raw)
To: Bruce Ashfield
Cc: Steve Sakoman, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 17856 bytes --]
Hi Bruce,
On Thu, 23 Jul 2020 at 13:27, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
> On Thu, Jul 23, 2020 at 5:34 AM Ryan Harkin <ryan.harkin@linaro.org>
> wrote:
> >
> > Hi Bruce, Steve,
> >
> > Thanks for your replies and the help.
> >
> > On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com> wrote:
> >>
> >> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <
> bruce.ashfield@gmail.com> wrote:
> >> >
> >> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org>
> wrote:
> >> > >
> >> > > Just an FYI, but when this was submitted, my imx7s-warp builds
> began to fail when building linux-fslc from meta-freescale /
> meta-freescale-3rdparty.
> >> > >
> >> > > I'm not sure why yet, I've only discovered the problem, but I
> thought I'd report it in case anyone else sees the problem.
> >> > >
> >> >
> >> > Someone already sent a dunfell backport request for a follow up patch
> to this.
> >> >
> >> > It went to the poky list, but I just replied to it and copied oe-core.
> >>
> >> Both patches are already in dunfell!
> >>
> >>
> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
> >>
> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
> >
> >
> > Yes, they are present. I guess I should have checked the error messages
> more closely during git bisect rather than stopping as soon as the build
> failed.
> >
> > After Bruce's 7ecc81baea patch, I see this error:
> >
> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata:
> Could not locate BSP definition for imx7s-warp/standard and no defconfig
> was provided
> >
> > Then, after 11089e06bf, I see the error I originally posted from my CI
> job, but reproduced here from a local build:
> >
> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme:
> Execution of
> '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899'
> failed with exit code 1:
> > WARNING: exit code 1 from a shell command.
> >
> > ERROR: Logfile of failure stored in:
> /data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
> > Log data follows:
> > | DEBUG: Executing python function extend_recipe_sysroot
> > | NOTE: Direct dependencies are
> ['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot',
> 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
> '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
> 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
> '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
> '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
> 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:
> do_populate_sysroot']
> > | NOTE: Installed into sysroot: []
> > | NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm',
> 'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native',
> 'kern-tools-native', 'patch-native', 'readline-native', 'flex-native',
> 'automake-native', 'texinfo-dummy-native', 'autoconf-native',
> 'libtool-native', 'gnu-config-native', 'xz-native',
> 'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native',
> 'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native',
> 'm4-native', 'pkgconfig-native']
> > | DEBUG: Python function extend_recipe_sysroot finished
> > | DEBUG: Executing shell function do_kernel_configme
> > | WARNING: exit code 1 from a shell command.
> > | ERROR: Execution of
> '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899'
> failed with exit code 1:
> > | WARNING: exit code 1 from a shell command.
> >
> > I haven't yet looked at what these patches do, but I'm expecting there's
> something to update in the linux-fslc recipe, unless there's another issue
> in the defconfig patches.
> >
>
> We've had multiple reports that with those patches the linux-fslc
> recipe is building. So something else may be going on in your setup.
>
That's reassuring.
> If you have a set of layers and build steps, can you send them to me ?
> I can spin up a local build and see if I get the same behaviour.
>
Thanks for the offer. I'm based on Linaro's "OE-RPB" setup.
My own layer is quite simple:
https://git.linaro.org/people/ryan.harkin/meta-warp7.git/log/?h=dunfell
I mostly provide a new image definition and a simple u-boot patch to change
the console UART for our CI system. I don't have a kernel recipe overlaying
linux-fslc.
My basic steps to clone and build are:
--------------------------
mkdir /data/warp7/workspace-dunfell
cd /data/warp7/workspace-dunfell
repo init -u \
https://git.linaro.org/people/ryan.harkin/oe-rpb-manifest.git \
-b dunfell
repo sync
# link in shared downloads and sstate-cache
ln -s /linaro/oe-rpb/downloads . && ln -s /linaro/oe-rpb/sstate-cache .
export MACHINE=imx7s-warp ; export DISTRO=rpb ; . setup-environment
bitbake warp7-console-image
--------------------------
Right now, I've pinned oo-core to my last known working build from before
your recent defconfig patch, so you'll want to go into
layer/openembedded-core and checkout the latest commits.
For reference, my pinned commit:
cabaf5654d 2020-07-06 iso-codes: switch upstream branch master -> main
[Hongxu Jia]
Local testing tells me that the repo works fine for me all the way up to
just before your commit, at this point:
2399fdf98a 2020-07-03 classes/archive: do_configure should not depend on
do_ar_p.. [Joshua Watt]
I'm building on an Ubuntu 18.04 host locally.
Regards,
Ryan.
>
> Bruce
>
> > Regards,
> > Ryan.
> >
> >
> >
> >
> >
> >
> >>
> >>
> >>
> >> Steve
> >>
> >> > > Here's a link to my failing build for reference:
> >> > >
> https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
> >> > >
> >> > > And a snippet from the failure:
> >> > >
> >> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0
> do_kernel_configme: Execution of
> '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
> failed with exit code 1:
> >> > > WARNING: exit code 1 from a shell command.
> >> > >
> >> > > ERROR: Logfile of failure stored in:
> /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
> >> > > Log data follows:
> >> > > | DEBUG: Executing python function extend_recipe_sysroot
> >> > > | NOTE: Direct dependencies are
> ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
> 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot',
> 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:
> do_populate_sysroot']
> >> > > | NOTE: Installed into sysroot: []
> >> > > | NOTE: Skipping as already exists in sysroot: ['bison-native',
> 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native',
> 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native',
> 'gnu-config-native', 'readline-native', 'libtool-native',
> 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers',
> 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native',
> 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native',
> 'pkgconfig-native']
> >> > > | DEBUG: Python function extend_recipe_sysroot finished
> >> > > | DEBUG: Executing shell function do_kernel_configme
> >> > > | WARNING: exit code 1 from a shell command.
> >> > > | ERROR: Execution of
> '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
> failed with exit code 1:
> >> > > | WARNING: exit code 1 from a shell command.
> >> > > |
> >> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task
> do_kernel_configme: Failed
> >> > > ERROR: Task
> (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme)
> failed with exit code '1'
> >> > >
> >> > >
> >> > >
> >> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com>
> wrote:
> >> > >>
> >> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <
> bruce.ashfield@gmail.com> wrote:
> >> > >> >
> >> > >> > We have a fixup patch for this one in test right now, so we
> don't want
> >> > >> > this patch, without the follow up.
> >> > >> >
> >> > >> > But this is useful for dunfell, since it was an unexpected
> behaviour
> >> > >> > that needed to be fixed.
> >> > >>
> >> > >> Thanks, I'll drop this patch from the pull request and include it
> >> > >> along with the fixup patch in next week's patch set.
> >> > >>
> >> > >> Steve
> >> > >>
> >> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com>
> wrote:
> >> > >> > >
> >> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> > >> > >
> >> > >> > > It is uncommon that a BSP definition and a defconfig are used
> in
> >> > >> > > a single configuration. That being said, it is a valid way to
> >> > >> > > organize kernel configuration meta data.
> >> > >> > >
> >> > >> > > When a defconfig is used, either on the src_uri or from in
> >> > >> > > the kernel tree, it is normally expected that it is the
> baseline,
> >> > >> > > with all options applied on top of it.
> >> > >> > >
> >> > >> > > With this commit, we detect either type of defconfig and ensure
> >> > >> > > that it is used first, followed by the fragments in their
> >> > >> > > previous order. This allows existing configuration stacks to
> >> > >> > > remain the same, while ensuring that a defconfig combined stack
> >> > >> > > works as expected.
> >> > >> > >
> >> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> > >> > > Signed-off-by: Richard Purdie <
> richard.purdie@linuxfoundation.org>
> >> > >> > > (cherry picked from commit
> e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> >> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> >> > >> > > ---
> >> > >> > > meta/classes/kernel-yocto.bbclass | 33
> ++++++++++++++++++++-----------
> >> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
> >> > >> > >
> >> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> >> > >> > > index 5bc627066e..41d8620e67 100644
> >> > >> > > --- a/meta/classes/kernel-yocto.bbclass
> >> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
> >> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> >> > >> > > else
> >> > >> > > cp -f
> ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> >> > >> > > fi
> >> > >> > > - sccs="${WORKDIR}/defconfig"
> >> > >> > > +
> in_tree_defconfig="${WORKDIR}/defconfig"
> >> > >> > > else
> >> > >> > > bbfatal "A KBUILD_DEFCONFIG
> '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> >> > >> > > fi
> >> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> >> > >> > > patches="${@" ".join(find_patches(d,''))}"
> >> > >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
> >> > >> > >
> >> > >> > > - # a quick check to make sure we don't have duplicate
> defconfigs
> >> > >> > > - # If there's a defconfig in the SRC_URI, did we also
> have one from
> >> > >> > > - # the KBUILD_DEFCONFIG processing above ?
> >> > >> > > - if [ -n "$sccs" ]; then
> >> > >> > > - # we did have a defconfig from above. remove any
> that might be in the src_uri
> >> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk
> '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> > >> > > + # a quick check to make sure we don't have duplicate
> defconfigs If
> >> > >> > > + # there's a defconfig in the SRC_URI, did we also have
> one from the
> >> > >> > > + # KBUILD_DEFCONFIG processing above ?
> >> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{
> if ($0=="defconfig") { print $0 } }' RS=' ')
> >> > >> > > + # drop and defconfig's from the src_uri variable, we
> captured it just above here if it existed
> >> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{
> if ($0!="defconfig") { print $0 } }' RS=' ')
> >> > >> > > + if [ -n "$in_tree_defconfig" ]; then
> >> > >> > > + sccs_defconfig=$in_tree_defconfig
> >> > >> > > + if [ -n "$src_uri_defconfig" ]; then
> >> > >> > > + bbwarn "[NOTE]: defconfig was supplied
> both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> >> > >> > > + fi
> >> > >> > > + else
> >> > >> > > + # if we didn't have an in-tree one, make our
> defconfig the one
> >> > >> > > + # from the src_uri. Note: there may not have
> been one from the
> >> > >> > > + # src_uri, so this can be an empty variable.
> >> > >> > > + sccs_defconfig=$src_uri_defconfig
> >> > >> > > fi
> >> > >> > > - sccs="$sccs $sccs_from_src_uri"
> >> > >> > > + sccs="$sccs_from_src_uri"
> >> > >> > >
> >> > >> > > # check for feature directories/repos/branches that
> were part of the
> >> > >> > > # SRC_URI. If they were supplied, we convert them into
> include directives
> >> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> >> > >> > > # expand kernel features into their full path
> equivalents
> >> > >> > > bsp_definition=$(spp ${includes} --find
> -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> >> > >> > > if [ -z "$bsp_definition" ]; then
> >> > >> > > - echo "$sccs" | grep -q defconfig
> >> > >> > > - if [ $? -ne 0 ]; then
> >> > >> > > + if [ -z "$sccs_defconfig" ]; then
> >> > >> > > bbfatal_log "Could not locate BSP
> definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was
> provided"
> >> > >> > > fi
> >> > >> > > -
> >> > >> > > + else
> >> > >> > > # if the bsp definition has "define
> KMETA_EXTERNAL_BSP t",
> >> > >> > > # then we need to set a flag that will
> instruct the next
> >> > >> > > # steps to use the BSP as both configuration
> and patches.
> >> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> >> > >> > > elements="`echo -n ${bsp_definition} ${sccs}
> ${patches} ${KERNEL_FEATURES}`"
> >> > >> > > if [ -n "${elements}" ]; then
> >> > >> > > echo "${bsp_definition}" >
> ${S}/${meta_dir}/bsp_definition
> >> > >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta
> ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> >> > >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta
> ${includes} $sccs_defconfig $bsp_definition $sccs $patches
> ${KERNEL_FEATURES}
> >> > >> > > if [ $? -ne 0 ]; then
> >> > >> > > bbfatal_log "Could not generate
> configuration queue for ${KMACHINE}."
> >> > >> > > fi
> >> > >> > > --
> >> > >> > > 2.17.1
> >> > >> > >
> >> > >> > >
> >> > >> >
> >> > >> >
> >> > >> >
> >> > >> > --
> >> > >> > - Thou shalt not follow the NULL pointer, for chaos and madness
> await
> >> > >> > thee at its end
> >> > >> > - "Use the force Harry" - Gandalf, Star Trek II
> >> > >>
> >> >
> >> >
> >> >
> >> > --
> >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> > thee at its end
> >> > - "Use the force Harry" - Gandalf, Star Trek II
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
[-- Attachment #2: Type: text/html, Size: 24912 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 13:38 ` Ryan Harkin
@ 2020-07-23 15:04 ` Bruce Ashfield
2020-07-23 16:06 ` Ryan Harkin
0 siblings, 1 reply; 40+ messages in thread
From: Bruce Ashfield @ 2020-07-23 15:04 UTC (permalink / raw)
To: Ryan Harkin
Cc: Steve Sakoman, Patches and discussions about the oe-core layer
On Thu, Jul 23, 2020 at 9:38 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>
> Hi Bruce,
>
> On Thu, 23 Jul 2020 at 13:27, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>>
>> On Thu, Jul 23, 2020 at 5:34 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>> >
>> > Hi Bruce, Steve,
>> >
>> > Thanks for your replies and the help.
>> >
>> > On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com> wrote:
>> >>
>> >> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >> >
>> >> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>> >> > >
>> >> > > Just an FYI, but when this was submitted, my imx7s-warp builds began to fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
>> >> > >
>> >> > > I'm not sure why yet, I've only discovered the problem, but I thought I'd report it in case anyone else sees the problem.
>> >> > >
>> >> >
>> >> > Someone already sent a dunfell backport request for a follow up patch to this.
>> >> >
>> >> > It went to the poky list, but I just replied to it and copied oe-core.
>> >>
>> >> Both patches are already in dunfell!
>> >>
>> >> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
>> >> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
>> >
>> >
>> > Yes, they are present. I guess I should have checked the error messages more closely during git bisect rather than stopping as soon as the build failed.
>> >
>> > After Bruce's 7ecc81baea patch, I see this error:
>> >
>> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata: Could not locate BSP definition for imx7s-warp/standard and no defconfig was provided
>> >
>> > Then, after 11089e06bf, I see the error I originally posted from my CI job, but reproduced here from a local build:
>> >
>> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
>> > WARNING: exit code 1 from a shell command.
>> >
>> > ERROR: Logfile of failure stored in: /data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
>> > Log data follows:
>> > | DEBUG: Executing python function extend_recipe_sysroot
>> > | NOTE: Direct dependencies are ['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot']
>> > | NOTE: Installed into sysroot: []
>> > | NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm', 'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native', 'kern-tools-native', 'patch-native', 'readline-native', 'flex-native', 'automake-native', 'texinfo-dummy-native', 'autoconf-native', 'libtool-native', 'gnu-config-native', 'xz-native', 'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native', 'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native', 'm4-native', 'pkgconfig-native']
>> > | DEBUG: Python function extend_recipe_sysroot finished
>> > | DEBUG: Executing shell function do_kernel_configme
>> > | WARNING: exit code 1 from a shell command.
>> > | ERROR: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
>> > | WARNING: exit code 1 from a shell command.
>> >
>> > I haven't yet looked at what these patches do, but I'm expecting there's something to update in the linux-fslc recipe, unless there's another issue in the defconfig patches.
>> >
>>
>> We've had multiple reports that with those patches the linux-fslc
>> recipe is building. So something else may be going on in your setup.
>
>
> That's reassuring.
>
>>
>> If you have a set of layers and build steps, can you send them to me ?
>> I can spin up a local build and see if I get the same behaviour.
>
>
> Thanks for the offer. I'm based on Linaro's "OE-RPB" setup.
>
> My own layer is quite simple:
> https://git.linaro.org/people/ryan.harkin/meta-warp7.git/log/?h=dunfell
>
> I mostly provide a new image definition and a simple u-boot patch to change the console UART for our CI system. I don't have a kernel recipe overlaying linux-fslc.
>
> My basic steps to clone and build are:
> --------------------------
> mkdir /data/warp7/workspace-dunfell
> cd /data/warp7/workspace-dunfell
> repo init -u \
> https://git.linaro.org/people/ryan.harkin/oe-rpb-manifest.git \
> -b dunfell
> repo sync
>
> # link in shared downloads and sstate-cache
> ln -s /linaro/oe-rpb/downloads . && ln -s /linaro/oe-rpb/sstate-cache .
>
> export MACHINE=imx7s-warp ; export DISTRO=rpb ; . setup-environment
> bitbake warp7-console-image
> --------------------------
>
I'm spinning up a build now (but as usual, I'm fighting some
infrastructure issues and can't get repo to install).
Steve mentioned two patches ... but can you also confirm that:
[kernel-yocto: account for extracted defconfig in elements check] is
in the branch you are building ?
Bruce
> Right now, I've pinned oo-core to my last known working build from before your recent defconfig patch, so you'll want to go into layer/openembedded-core and checkout the latest commits.
>
> For reference, my pinned commit:
> cabaf5654d 2020-07-06 iso-codes: switch upstream branch master -> main [Hongxu Jia]
>
> Local testing tells me that the repo works fine for me all the way up to just before your commit, at this point:
> 2399fdf98a 2020-07-03 classes/archive: do_configure should not depend on do_ar_p.. [Joshua Watt]
>
> I'm building on an Ubuntu 18.04 host locally.
>
> Regards,
> Ryan.
>
>
>>
>>
>> Bruce
>>
>> > Regards,
>> > Ryan.
>> >
>> >
>> >
>> >
>> >
>> >
>> >>
>> >>
>> >>
>> >> Steve
>> >>
>> >> > > Here's a link to my failing build for reference:
>> >> > > https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
>> >> > >
>> >> > > And a snippet from the failure:
>> >> > >
>> >> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
>> >> > > WARNING: exit code 1 from a shell command.
>> >> > >
>> >> > > ERROR: Logfile of failure stored in: /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
>> >> > > Log data follows:
>> >> > > | DEBUG: Executing python function extend_recipe_sysroot
>> >> > > | NOTE: Direct dependencies are ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
>> >> > > | NOTE: Installed into sysroot: []
>> >> > > | NOTE: Skipping as already exists in sysroot: ['bison-native', 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native', 'gnu-config-native', 'readline-native', 'libtool-native', 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native', 'pkgconfig-native']
>> >> > > | DEBUG: Python function extend_recipe_sysroot finished
>> >> > > | DEBUG: Executing shell function do_kernel_configme
>> >> > > | WARNING: exit code 1 from a shell command.
>> >> > > | ERROR: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
>> >> > > | WARNING: exit code 1 from a shell command.
>> >> > > |
>> >> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task do_kernel_configme: Failed
>> >> > > ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme) failed with exit code '1'
>> >> > >
>> >> > >
>> >> > >
>> >> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
>> >> > >>
>> >> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >> > >> >
>> >> > >> > We have a fixup patch for this one in test right now, so we don't want
>> >> > >> > this patch, without the follow up.
>> >> > >> >
>> >> > >> > But this is useful for dunfell, since it was an unexpected behaviour
>> >> > >> > that needed to be fixed.
>> >> > >>
>> >> > >> Thanks, I'll drop this patch from the pull request and include it
>> >> > >> along with the fixup patch in next week's patch set.
>> >> > >>
>> >> > >> Steve
>> >> > >>
>> >> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
>> >> > >> > >
>> >> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
>> >> > >> > >
>> >> > >> > > It is uncommon that a BSP definition and a defconfig are used in
>> >> > >> > > a single configuration. That being said, it is a valid way to
>> >> > >> > > organize kernel configuration meta data.
>> >> > >> > >
>> >> > >> > > When a defconfig is used, either on the src_uri or from in
>> >> > >> > > the kernel tree, it is normally expected that it is the baseline,
>> >> > >> > > with all options applied on top of it.
>> >> > >> > >
>> >> > >> > > With this commit, we detect either type of defconfig and ensure
>> >> > >> > > that it is used first, followed by the fragments in their
>> >> > >> > > previous order. This allows existing configuration stacks to
>> >> > >> > > remain the same, while ensuring that a defconfig combined stack
>> >> > >> > > works as expected.
>> >> > >> > >
>> >> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
>> >> > >> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> >> > >> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
>> >> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
>> >> > >> > > ---
>> >> > >> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
>> >> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
>> >> > >> > >
>> >> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> >> > >> > > index 5bc627066e..41d8620e67 100644
>> >> > >> > > --- a/meta/classes/kernel-yocto.bbclass
>> >> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
>> >> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
>> >> > >> > > else
>> >> > >> > > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
>> >> > >> > > fi
>> >> > >> > > - sccs="${WORKDIR}/defconfig"
>> >> > >> > > + in_tree_defconfig="${WORKDIR}/defconfig"
>> >> > >> > > else
>> >> > >> > > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
>> >> > >> > > fi
>> >> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
>> >> > >> > > patches="${@" ".join(find_patches(d,''))}"
>> >> > >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
>> >> > >> > >
>> >> > >> > > - # a quick check to make sure we don't have duplicate defconfigs
>> >> > >> > > - # If there's a defconfig in the SRC_URI, did we also have one from
>> >> > >> > > - # the KBUILD_DEFCONFIG processing above ?
>> >> > >> > > - if [ -n "$sccs" ]; then
>> >> > >> > > - # we did have a defconfig from above. remove any that might be in the src_uri
>> >> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> >> > >> > > + # a quick check to make sure we don't have duplicate defconfigs If
>> >> > >> > > + # there's a defconfig in the SRC_URI, did we also have one from the
>> >> > >> > > + # KBUILD_DEFCONFIG processing above ?
>> >> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
>> >> > >> > > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
>> >> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> >> > >> > > + if [ -n "$in_tree_defconfig" ]; then
>> >> > >> > > + sccs_defconfig=$in_tree_defconfig
>> >> > >> > > + if [ -n "$src_uri_defconfig" ]; then
>> >> > >> > > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
>> >> > >> > > + fi
>> >> > >> > > + else
>> >> > >> > > + # if we didn't have an in-tree one, make our defconfig the one
>> >> > >> > > + # from the src_uri. Note: there may not have been one from the
>> >> > >> > > + # src_uri, so this can be an empty variable.
>> >> > >> > > + sccs_defconfig=$src_uri_defconfig
>> >> > >> > > fi
>> >> > >> > > - sccs="$sccs $sccs_from_src_uri"
>> >> > >> > > + sccs="$sccs_from_src_uri"
>> >> > >> > >
>> >> > >> > > # check for feature directories/repos/branches that were part of the
>> >> > >> > > # SRC_URI. If they were supplied, we convert them into include directives
>> >> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
>> >> > >> > > # expand kernel features into their full path equivalents
>> >> > >> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
>> >> > >> > > if [ -z "$bsp_definition" ]; then
>> >> > >> > > - echo "$sccs" | grep -q defconfig
>> >> > >> > > - if [ $? -ne 0 ]; then
>> >> > >> > > + if [ -z "$sccs_defconfig" ]; then
>> >> > >> > > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
>> >> > >> > > fi
>> >> > >> > > -
>> >> > >> > > + else
>> >> > >> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
>> >> > >> > > # then we need to set a flag that will instruct the next
>> >> > >> > > # steps to use the BSP as both configuration and patches.
>> >> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
>> >> > >> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
>> >> > >> > > if [ -n "${elements}" ]; then
>> >> > >> > > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
>> >> > >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
>> >> > >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
>> >> > >> > > if [ $? -ne 0 ]; then
>> >> > >> > > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
>> >> > >> > > fi
>> >> > >> > > --
>> >> > >> > > 2.17.1
>> >> > >> > >
>> >> > >> > >
>> >> > >> >
>> >> > >> >
>> >> > >> >
>> >> > >> > --
>> >> > >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> > >> > thee at its end
>> >> > >> > - "Use the force Harry" - Gandalf, Star Trek II
>> >> > >>
>> >> >
>> >> >
>> >> >
>> >> > --
>> >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> > thee at its end
>> >> > - "Use the force Harry" - Gandalf, Star Trek II
>>
>>
>>
>> --
>> - Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end
>> - "Use the force Harry" - Gandalf, Star Trek II
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 15:04 ` Bruce Ashfield
@ 2020-07-23 16:06 ` Ryan Harkin
2020-07-23 18:33 ` Andrey Zhizhikin
0 siblings, 1 reply; 40+ messages in thread
From: Ryan Harkin @ 2020-07-23 16:06 UTC (permalink / raw)
To: Bruce Ashfield
Cc: Steve Sakoman, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 19810 bytes --]
On Thu, 23 Jul 2020 at 16:05, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
> On Thu, Jul 23, 2020 at 9:38 AM Ryan Harkin <ryan.harkin@linaro.org>
> wrote:
> >
> > Hi Bruce,
> >
> > On Thu, 23 Jul 2020 at 13:27, Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
> >>
> >> On Thu, Jul 23, 2020 at 5:34 AM Ryan Harkin <ryan.harkin@linaro.org>
> wrote:
> >> >
> >> > Hi Bruce, Steve,
> >> >
> >> > Thanks for your replies and the help.
> >> >
> >> > On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com>
> wrote:
> >> >>
> >> >> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <
> bruce.ashfield@gmail.com> wrote:
> >> >> >
> >> >> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <
> ryan.harkin@linaro.org> wrote:
> >> >> > >
> >> >> > > Just an FYI, but when this was submitted, my imx7s-warp builds
> began to fail when building linux-fslc from meta-freescale /
> meta-freescale-3rdparty.
> >> >> > >
> >> >> > > I'm not sure why yet, I've only discovered the problem, but I
> thought I'd report it in case anyone else sees the problem.
> >> >> > >
> >> >> >
> >> >> > Someone already sent a dunfell backport request for a follow up
> patch to this.
> >> >> >
> >> >> > It went to the poky list, but I just replied to it and copied
> oe-core.
> >> >>
> >> >> Both patches are already in dunfell!
> >> >>
> >> >>
> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
> >> >>
> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
> >> >
> >> >
> >> > Yes, they are present. I guess I should have checked the error
> messages more closely during git bisect rather than stopping as soon as the
> build failed.
> >> >
> >> > After Bruce's 7ecc81baea patch, I see this error:
> >> >
> >> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata:
> Could not locate BSP definition for imx7s-warp/standard and no defconfig
> was provided
> >> >
> >> > Then, after 11089e06bf, I see the error I originally posted from my
> CI job, but reproduced here from a local build:
> >> >
> >> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme:
> Execution of
> '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899'
> failed with exit code 1:
> >> > WARNING: exit code 1 from a shell command.
> >> >
> >> > ERROR: Logfile of failure stored in:
> /data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
> >> > Log data follows:
> >> > | DEBUG: Executing python function extend_recipe_sysroot
> >> > | NOTE: Direct dependencies are
> ['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot',
> 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
> '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
> 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
> '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
> '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
> 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:
> do_populate_sysroot']
> >> > | NOTE: Installed into sysroot: []
> >> > | NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm',
> 'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native',
> 'kern-tools-native', 'patch-native', 'readline-native', 'flex-native',
> 'automake-native', 'texinfo-dummy-native', 'autoconf-native',
> 'libtool-native', 'gnu-config-native', 'xz-native',
> 'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native',
> 'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native',
> 'm4-native', 'pkgconfig-native']
> >> > | DEBUG: Python function extend_recipe_sysroot finished
> >> > | DEBUG: Executing shell function do_kernel_configme
> >> > | WARNING: exit code 1 from a shell command.
> >> > | ERROR: Execution of
> '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899'
> failed with exit code 1:
> >> > | WARNING: exit code 1 from a shell command.
> >> >
> >> > I haven't yet looked at what these patches do, but I'm expecting
> there's something to update in the linux-fslc recipe, unless there's
> another issue in the defconfig patches.
> >> >
> >>
> >> We've had multiple reports that with those patches the linux-fslc
> >> recipe is building. So something else may be going on in your setup.
> >
> >
> > That's reassuring.
> >
> >>
> >> If you have a set of layers and build steps, can you send them to me ?
> >> I can spin up a local build and see if I get the same behaviour.
> >
> >
> > Thanks for the offer. I'm based on Linaro's "OE-RPB" setup.
> >
> > My own layer is quite simple:
> > https://git.linaro.org/people/ryan.harkin/meta-warp7.git/log/?h=dunfell
> >
> > I mostly provide a new image definition and a simple u-boot patch to
> change the console UART for our CI system. I don't have a kernel recipe
> overlaying linux-fslc.
> >
> > My basic steps to clone and build are:
> > --------------------------
> > mkdir /data/warp7/workspace-dunfell
> > cd /data/warp7/workspace-dunfell
> > repo init -u \
> > https://git.linaro.org/people/ryan.harkin/oe-rpb-manifest.git \
> > -b dunfell
> > repo sync
> >
> > # link in shared downloads and sstate-cache
> > ln -s /linaro/oe-rpb/downloads . && ln -s /linaro/oe-rpb/sstate-cache .
> >
> > export MACHINE=imx7s-warp ; export DISTRO=rpb ; . setup-environment
> > bitbake warp7-console-image
> > --------------------------
> >
>
> I'm spinning up a build now (but as usual, I'm fighting some
> infrastructure issues and can't get repo to install).
>
It looks like you can stand down on this...
>
> Steve mentioned two patches ... but can you also confirm that:
> [kernel-yocto: account for extracted defconfig in elements check] is
> in the branch you are building ?
>
That patch wasn't in my dunfell branch, so I cherry-picked it from master
locally and now the build is working again.
Meanwhile, doing a "git remote update" and I see the patch is now on top of
the dunfell branch as of today, and my build is working again.
Great, thanks for your help folks.
Regards,
Ryan.
>
> Bruce
>
>
> > Right now, I've pinned oo-core to my last known working build from
> before your recent defconfig patch, so you'll want to go into
> layer/openembedded-core and checkout the latest commits.
> >
> > For reference, my pinned commit:
> > cabaf5654d 2020-07-06 iso-codes: switch upstream branch master ->
> main [Hongxu Jia]
> >
> > Local testing tells me that the repo works fine for me all the way up to
> just before your commit, at this point:
> > 2399fdf98a 2020-07-03 classes/archive: do_configure should not depend
> on do_ar_p.. [Joshua Watt]
> >
> > I'm building on an Ubuntu 18.04 host locally.
> >
> > Regards,
> > Ryan.
> >
> >
> >>
> >>
> >> Bruce
> >>
> >> > Regards,
> >> > Ryan.
> >> >
> >> >
> >> >
> >> >
> >> >
> >> >
> >> >>
> >> >>
> >> >>
> >> >> Steve
> >> >>
> >> >> > > Here's a link to my failing build for reference:
> >> >> > >
> https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
> >> >> > >
> >> >> > > And a snippet from the failure:
> >> >> > >
> >> >> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0
> do_kernel_configme: Execution of
> '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
> failed with exit code 1:
> >> >> > > WARNING: exit code 1 from a shell command.
> >> >> > >
> >> >> > > ERROR: Logfile of failure stored in:
> /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
> >> >> > > Log data follows:
> >> >> > > | DEBUG: Executing python function extend_recipe_sysroot
> >> >> > > | NOTE: Direct dependencies are
> ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot',
> 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot',
> 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
> '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:
> do_populate_sysroot']
> >> >> > > | NOTE: Installed into sysroot: []
> >> >> > > | NOTE: Skipping as already exists in sysroot: ['bison-native',
> 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native',
> 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native',
> 'gnu-config-native', 'readline-native', 'libtool-native',
> 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers',
> 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native',
> 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native',
> 'pkgconfig-native']
> >> >> > > | DEBUG: Python function extend_recipe_sysroot finished
> >> >> > > | DEBUG: Executing shell function do_kernel_configme
> >> >> > > | WARNING: exit code 1 from a shell command.
> >> >> > > | ERROR: Execution of
> '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123'
> failed with exit code 1:
> >> >> > > | WARNING: exit code 1 from a shell command.
> >> >> > > |
> >> >> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task
> do_kernel_configme: Failed
> >> >> > > ERROR: Task
> (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme)
> failed with exit code '1'
> >> >> > >
> >> >> > >
> >> >> > >
> >> >> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com>
> wrote:
> >> >> > >>
> >> >> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <
> bruce.ashfield@gmail.com> wrote:
> >> >> > >> >
> >> >> > >> > We have a fixup patch for this one in test right now, so we
> don't want
> >> >> > >> > this patch, without the follow up.
> >> >> > >> >
> >> >> > >> > But this is useful for dunfell, since it was an unexpected
> behaviour
> >> >> > >> > that needed to be fixed.
> >> >> > >>
> >> >> > >> Thanks, I'll drop this patch from the pull request and include
> it
> >> >> > >> along with the fixup patch in next week's patch set.
> >> >> > >>
> >> >> > >> Steve
> >> >> > >>
> >> >> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <
> steve@sakoman.com> wrote:
> >> >> > >> > >
> >> >> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> >> > >> > >
> >> >> > >> > > It is uncommon that a BSP definition and a defconfig are
> used in
> >> >> > >> > > a single configuration. That being said, it is a valid way
> to
> >> >> > >> > > organize kernel configuration meta data.
> >> >> > >> > >
> >> >> > >> > > When a defconfig is used, either on the src_uri or from in
> >> >> > >> > > the kernel tree, it is normally expected that it is the
> baseline,
> >> >> > >> > > with all options applied on top of it.
> >> >> > >> > >
> >> >> > >> > > With this commit, we detect either type of defconfig and
> ensure
> >> >> > >> > > that it is used first, followed by the fragments in their
> >> >> > >> > > previous order. This allows existing configuration stacks to
> >> >> > >> > > remain the same, while ensuring that a defconfig combined
> stack
> >> >> > >> > > works as expected.
> >> >> > >> > >
> >> >> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> >> > >> > > Signed-off-by: Richard Purdie <
> richard.purdie@linuxfoundation.org>
> >> >> > >> > > (cherry picked from commit
> e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> >> >> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> >> >> > >> > > ---
> >> >> > >> > > meta/classes/kernel-yocto.bbclass | 33
> ++++++++++++++++++++-----------
> >> >> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
> >> >> > >> > >
> >> >> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> >> >> > >> > > index 5bc627066e..41d8620e67 100644
> >> >> > >> > > --- a/meta/classes/kernel-yocto.bbclass
> >> >> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
> >> >> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> >> >> > >> > > else
> >> >> > >> > > cp -f
> ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> >> >> > >> > > fi
> >> >> > >> > > - sccs="${WORKDIR}/defconfig"
> >> >> > >> > > +
> in_tree_defconfig="${WORKDIR}/defconfig"
> >> >> > >> > > else
> >> >> > >> > > bbfatal "A KBUILD_DEFCONFIG
> '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> >> >> > >> > > fi
> >> >> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> >> >> > >> > > patches="${@" ".join(find_patches(d,''))}"
> >> >> > >> > > feat_dirs="${@"
> ".join(find_kernel_feature_dirs(d))}"
> >> >> > >> > >
> >> >> > >> > > - # a quick check to make sure we don't have
> duplicate defconfigs
> >> >> > >> > > - # If there's a defconfig in the SRC_URI, did we
> also have one from
> >> >> > >> > > - # the KBUILD_DEFCONFIG processing above ?
> >> >> > >> > > - if [ -n "$sccs" ]; then
> >> >> > >> > > - # we did have a defconfig from above. remove
> any that might be in the src_uri
> >> >> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri |
> awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> >> > >> > > + # a quick check to make sure we don't have
> duplicate defconfigs If
> >> >> > >> > > + # there's a defconfig in the SRC_URI, did we also
> have one from the
> >> >> > >> > > + # KBUILD_DEFCONFIG processing above ?
> >> >> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk
> '{ if ($0=="defconfig") { print $0 } }' RS=' ')
> >> >> > >> > > + # drop and defconfig's from the src_uri variable,
> we captured it just above here if it existed
> >> >> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk
> '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> >> > >> > > + if [ -n "$in_tree_defconfig" ]; then
> >> >> > >> > > + sccs_defconfig=$in_tree_defconfig
> >> >> > >> > > + if [ -n "$src_uri_defconfig" ]; then
> >> >> > >> > > + bbwarn "[NOTE]: defconfig was
> supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> >> >> > >> > > + fi
> >> >> > >> > > + else
> >> >> > >> > > + # if we didn't have an in-tree one, make
> our defconfig the one
> >> >> > >> > > + # from the src_uri. Note: there may not
> have been one from the
> >> >> > >> > > + # src_uri, so this can be an empty variable.
> >> >> > >> > > + sccs_defconfig=$src_uri_defconfig
> >> >> > >> > > fi
> >> >> > >> > > - sccs="$sccs $sccs_from_src_uri"
> >> >> > >> > > + sccs="$sccs_from_src_uri"
> >> >> > >> > >
> >> >> > >> > > # check for feature directories/repos/branches that
> were part of the
> >> >> > >> > > # SRC_URI. If they were supplied, we convert them
> into include directives
> >> >> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> >> >> > >> > > # expand kernel features into their full path
> equivalents
> >> >> > >> > > bsp_definition=$(spp ${includes} --find
> -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> >> >> > >> > > if [ -z "$bsp_definition" ]; then
> >> >> > >> > > - echo "$sccs" | grep -q defconfig
> >> >> > >> > > - if [ $? -ne 0 ]; then
> >> >> > >> > > + if [ -z "$sccs_defconfig" ]; then
> >> >> > >> > > bbfatal_log "Could not locate BSP
> definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was
> provided"
> >> >> > >> > > fi
> >> >> > >> > > -
> >> >> > >> > > + else
> >> >> > >> > > # if the bsp definition has "define
> KMETA_EXTERNAL_BSP t",
> >> >> > >> > > # then we need to set a flag that will
> instruct the next
> >> >> > >> > > # steps to use the BSP as both
> configuration and patches.
> >> >> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> >> >> > >> > > elements="`echo -n ${bsp_definition} ${sccs}
> ${patches} ${KERNEL_FEATURES}`"
> >> >> > >> > > if [ -n "${elements}" ]; then
> >> >> > >> > > echo "${bsp_definition}" >
> ${S}/${meta_dir}/bsp_definition
> >> >> > >> > > - scc --force -o
> ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs}
> ${patches} ${KERNEL_FEATURES}
> >> >> > >> > > + scc --force -o
> ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition
> $sccs $patches ${KERNEL_FEATURES}
> >> >> > >> > > if [ $? -ne 0 ]; then
> >> >> > >> > > bbfatal_log "Could not generate
> configuration queue for ${KMACHINE}."
> >> >> > >> > > fi
> >> >> > >> > > --
> >> >> > >> > > 2.17.1
> >> >> > >> > >
> >> >> > >> > >
> >> >> > >> >
> >> >> > >> >
> >> >> > >> >
> >> >> > >> > --
> >> >> > >> > - Thou shalt not follow the NULL pointer, for chaos and
> madness await
> >> >> > >> > thee at its end
> >> >> > >> > - "Use the force Harry" - Gandalf, Star Trek II
> >> >> > >>
> >> >> >
> >> >> >
> >> >> >
> >> >> > --
> >> >> > - Thou shalt not follow the NULL pointer, for chaos and madness
> await
> >> >> > thee at its end
> >> >> > - "Use the force Harry" - Gandalf, Star Trek II
> >>
> >>
> >>
> >> --
> >> - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> thee at its end
> >> - "Use the force Harry" - Gandalf, Star Trek II
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
[-- Attachment #2: Type: text/html, Size: 28532 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 16:06 ` Ryan Harkin
@ 2020-07-23 18:33 ` Andrey Zhizhikin
2020-07-23 20:46 ` Bruce Ashfield
0 siblings, 1 reply; 40+ messages in thread
From: Andrey Zhizhikin @ 2020-07-23 18:33 UTC (permalink / raw)
To: Ryan Harkin
Cc: Bruce Ashfield, Steve Sakoman,
Patches and discussions about the oe-core layer
Hey guys,
Sorry for jumping into this thread a bit later - I saw that it has
been sorted out already.
On Thu, Jul 23, 2020 at 6:06 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>
>
>
> On Thu, 23 Jul 2020 at 16:05, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>>
>> On Thu, Jul 23, 2020 at 9:38 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>> >
>> > Hi Bruce,
>> >
>> > On Thu, 23 Jul 2020 at 13:27, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >>
>> >> On Thu, Jul 23, 2020 at 5:34 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>> >> >
>> >> > Hi Bruce, Steve,
>> >> >
>> >> > Thanks for your replies and the help.
>> >> >
>> >> > On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com> wrote:
>> >> >>
>> >> >> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >> >> >
>> >> >> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>> >> >> > >
>> >> >> > > Just an FYI, but when this was submitted, my imx7s-warp builds began to fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
>> >> >> > >
>> >> >> > > I'm not sure why yet, I've only discovered the problem, but I thought I'd report it in case anyone else sees the problem.
>> >> >> > >
>> >> >> >
>> >> >> > Someone already sent a dunfell backport request for a follow up patch to this.
>> >> >> >
>> >> >> > It went to the poky list, but I just replied to it and copied oe-core.
>> >> >>
>> >> >> Both patches are already in dunfell!
>> >> >>
>> >> >> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
>> >> >> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
>> >> >
>> >> >
>> >> > Yes, they are present. I guess I should have checked the error messages more closely during git bisect rather than stopping as soon as the build failed.
>> >> >
>> >> > After Bruce's 7ecc81baea patch, I see this error:
>> >> >
>> >> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata: Could not locate BSP definition for imx7s-warp/standard and no defconfig was provided
>> >> >
>> >> > Then, after 11089e06bf, I see the error I originally posted from my CI job, but reproduced here from a local build:
This was the patch I've introduced and seeing those errors were quite
a surprise to me. I have also an internal CI that builds
meta-freescale off the dunfell branch - and I never had any issues
with it.
>> >> >
>> >> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
>> >> > WARNING: exit code 1 from a shell command.
>> >> >
>> >> > ERROR: Logfile of failure stored in: /data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
>> >> > Log data follows:
>> >> > | DEBUG: Executing python function extend_recipe_sysroot
>> >> > | NOTE: Direct dependencies are ['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot']
>> >> > | NOTE: Installed into sysroot: []
>> >> > | NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm', 'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native', 'kern-tools-native', 'patch-native', 'readline-native', 'flex-native', 'automake-native', 'texinfo-dummy-native', 'autoconf-native', 'libtool-native', 'gnu-config-native', 'xz-native', 'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native', 'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native', 'm4-native', 'pkgconfig-native']
>> >> > | DEBUG: Python function extend_recipe_sysroot finished
>> >> > | DEBUG: Executing shell function do_kernel_configme
>> >> > | WARNING: exit code 1 from a shell command.
>> >> > | ERROR: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
>> >> > | WARNING: exit code 1 from a shell command.
>> >> >
>> >> > I haven't yet looked at what these patches do, but I'm expecting there's something to update in the linux-fslc recipe, unless there's another issue in the defconfig patches.
>> >> >
>> >>
>> >> We've had multiple reports that with those patches the linux-fslc
>> >> recipe is building. So something else may be going on in your setup.
If there were some reports - I haven't seen them...
Bruce, do you happen to have any reference to them? I'm trying to
merge and maintain linux-fslc[-imx] kernels, and so far I've never
seen any failures. Or maybe they were reported on some mailing lists
I'm not in.
>> >
>> >
>> > That's reassuring.
>> >
>> >>
>> >> If you have a set of layers and build steps, can you send them to me ?
>> >> I can spin up a local build and see if I get the same behaviour.
>> >
>> >
>> > Thanks for the offer. I'm based on Linaro's "OE-RPB" setup.
>> >
>> > My own layer is quite simple:
>> > https://git.linaro.org/people/ryan.harkin/meta-warp7.git/log/?h=dunfell
>> >
>> > I mostly provide a new image definition and a simple u-boot patch to change the console UART for our CI system. I don't have a kernel recipe overlaying linux-fslc.
>> >
>> > My basic steps to clone and build are:
>> > --------------------------
>> > mkdir /data/warp7/workspace-dunfell
>> > cd /data/warp7/workspace-dunfell
>> > repo init -u \
>> > https://git.linaro.org/people/ryan.harkin/oe-rpb-manifest.git \
>> > -b dunfell
>> > repo sync
>> >
>> > # link in shared downloads and sstate-cache
>> > ln -s /linaro/oe-rpb/downloads . && ln -s /linaro/oe-rpb/sstate-cache .
>> >
>> > export MACHINE=imx7s-warp ; export DISTRO=rpb ; . setup-environment
>> > bitbake warp7-console-image
>> > --------------------------
>> >
>>
>> I'm spinning up a build now (but as usual, I'm fighting some
>> infrastructure issues and can't get repo to install).
>
>
> It looks like you can stand down on this...
>
>>
>>
>> Steve mentioned two patches ... but can you also confirm that:
>> [kernel-yocto: account for extracted defconfig in elements check] is
>> in the branch you are building ?
>
>
> That patch wasn't in my dunfell branch, so I cherry-picked it from master locally and now the build is working again.
> Meanwhile, doing a "git remote update" and I see the patch is now on top of the dunfell branch as of today, and my build is working again.
Glad to see that it is solved for you! I've run the build for
meta-freescale linux-fslc yesterday - it went through like a breeze...
I don't think there was a significant update on dunfell, but I can
start the build now anyway...
>
> Great, thanks for your help folks.
>
> Regards,
> Ryan.
>
>
>
>>
>>
>> Bruce
>>
>>
>> > Right now, I've pinned oo-core to my last known working build from before your recent defconfig patch, so you'll want to go into layer/openembedded-core and checkout the latest commits.
>> >
>> > For reference, my pinned commit:
>> > cabaf5654d 2020-07-06 iso-codes: switch upstream branch master -> main [Hongxu Jia]
>> >
>> > Local testing tells me that the repo works fine for me all the way up to just before your commit, at this point:
>> > 2399fdf98a 2020-07-03 classes/archive: do_configure should not depend on do_ar_p.. [Joshua Watt]
>> >
>> > I'm building on an Ubuntu 18.04 host locally.
>> >
>> > Regards,
>> > Ryan.
>> >
>> >
>> >>
>> >>
>> >> Bruce
>> >>
>> >> > Regards,
>> >> > Ryan.
>> >> >
>> >> >
>> >> >
>> >> >
>> >> >
>> >> >
>> >> >>
>> >> >>
>> >> >>
>> >> >> Steve
>> >> >>
>> >> >> > > Here's a link to my failing build for reference:
>> >> >> > > https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
>> >> >> > >
>> >> >> > > And a snippet from the failure:
>> >> >> > >
>> >> >> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
Oh, this is actually a good reminder: I have to bump up the kernel
version! It's been merged into the linux-fslc repo, but I didn't
update recipes so far... Vacation time... :) Latest update would
include v5.4.51 tag.
>> >> >> > > WARNING: exit code 1 from a shell command.
>> >> >> > >
>> >> >> > > ERROR: Logfile of failure stored in: /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
>> >> >> > > Log data follows:
>> >> >> > > | DEBUG: Executing python function extend_recipe_sysroot
>> >> >> > > | NOTE: Direct dependencies are ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
>> >> >> > > | NOTE: Installed into sysroot: []
>> >> >> > > | NOTE: Skipping as already exists in sysroot: ['bison-native', 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native', 'gnu-config-native', 'readline-native', 'libtool-native', 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native', 'pkgconfig-native']
>> >> >> > > | DEBUG: Python function extend_recipe_sysroot finished
>> >> >> > > | DEBUG: Executing shell function do_kernel_configme
>> >> >> > > | WARNING: exit code 1 from a shell command.
>> >> >> > > | ERROR: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
>> >> >> > > | WARNING: exit code 1 from a shell command.
>> >> >> > > |
>> >> >> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task do_kernel_configme: Failed
>> >> >> > > ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme) failed with exit code '1'
>> >> >> > >
>> >> >> > >
>> >> >> > >
>> >> >> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
>> >> >> > >>
>> >> >> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> >> >> > >> >
>> >> >> > >> > We have a fixup patch for this one in test right now, so we don't want
>> >> >> > >> > this patch, without the follow up.
>> >> >> > >> >
>> >> >> > >> > But this is useful for dunfell, since it was an unexpected behaviour
>> >> >> > >> > that needed to be fixed.
>> >> >> > >>
>> >> >> > >> Thanks, I'll drop this patch from the pull request and include it
>> >> >> > >> along with the fixup patch in next week's patch set.
>> >> >> > >>
>> >> >> > >> Steve
>> >> >> > >>
>> >> >> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
>> >> >> > >> > >
>> >> >> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
>> >> >> > >> > >
>> >> >> > >> > > It is uncommon that a BSP definition and a defconfig are used in
>> >> >> > >> > > a single configuration. That being said, it is a valid way to
>> >> >> > >> > > organize kernel configuration meta data.
>> >> >> > >> > >
>> >> >> > >> > > When a defconfig is used, either on the src_uri or from in
>> >> >> > >> > > the kernel tree, it is normally expected that it is the baseline,
>> >> >> > >> > > with all options applied on top of it.
>> >> >> > >> > >
>> >> >> > >> > > With this commit, we detect either type of defconfig and ensure
>> >> >> > >> > > that it is used first, followed by the fragments in their
>> >> >> > >> > > previous order. This allows existing configuration stacks to
>> >> >> > >> > > remain the same, while ensuring that a defconfig combined stack
>> >> >> > >> > > works as expected.
>> >> >> > >> > >
>> >> >> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
>> >> >> > >> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> >> >> > >> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
>> >> >> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
>> >> >> > >> > > ---
>> >> >> > >> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
>> >> >> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
>> >> >> > >> > >
>> >> >> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> >> >> > >> > > index 5bc627066e..41d8620e67 100644
>> >> >> > >> > > --- a/meta/classes/kernel-yocto.bbclass
>> >> >> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
>> >> >> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
>> >> >> > >> > > else
>> >> >> > >> > > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
>> >> >> > >> > > fi
>> >> >> > >> > > - sccs="${WORKDIR}/defconfig"
>> >> >> > >> > > + in_tree_defconfig="${WORKDIR}/defconfig"
>> >> >> > >> > > else
>> >> >> > >> > > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
>> >> >> > >> > > fi
>> >> >> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
>> >> >> > >> > > patches="${@" ".join(find_patches(d,''))}"
>> >> >> > >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
>> >> >> > >> > >
>> >> >> > >> > > - # a quick check to make sure we don't have duplicate defconfigs
>> >> >> > >> > > - # If there's a defconfig in the SRC_URI, did we also have one from
>> >> >> > >> > > - # the KBUILD_DEFCONFIG processing above ?
>> >> >> > >> > > - if [ -n "$sccs" ]; then
>> >> >> > >> > > - # we did have a defconfig from above. remove any that might be in the src_uri
>> >> >> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> >> >> > >> > > + # a quick check to make sure we don't have duplicate defconfigs If
>> >> >> > >> > > + # there's a defconfig in the SRC_URI, did we also have one from the
>> >> >> > >> > > + # KBUILD_DEFCONFIG processing above ?
>> >> >> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
>> >> >> > >> > > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
>> >> >> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
>> >> >> > >> > > + if [ -n "$in_tree_defconfig" ]; then
>> >> >> > >> > > + sccs_defconfig=$in_tree_defconfig
>> >> >> > >> > > + if [ -n "$src_uri_defconfig" ]; then
>> >> >> > >> > > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
>> >> >> > >> > > + fi
>> >> >> > >> > > + else
>> >> >> > >> > > + # if we didn't have an in-tree one, make our defconfig the one
>> >> >> > >> > > + # from the src_uri. Note: there may not have been one from the
>> >> >> > >> > > + # src_uri, so this can be an empty variable.
>> >> >> > >> > > + sccs_defconfig=$src_uri_defconfig
>> >> >> > >> > > fi
>> >> >> > >> > > - sccs="$sccs $sccs_from_src_uri"
>> >> >> > >> > > + sccs="$sccs_from_src_uri"
>> >> >> > >> > >
>> >> >> > >> > > # check for feature directories/repos/branches that were part of the
>> >> >> > >> > > # SRC_URI. If they were supplied, we convert them into include directives
>> >> >> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
>> >> >> > >> > > # expand kernel features into their full path equivalents
>> >> >> > >> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
>> >> >> > >> > > if [ -z "$bsp_definition" ]; then
>> >> >> > >> > > - echo "$sccs" | grep -q defconfig
>> >> >> > >> > > - if [ $? -ne 0 ]; then
>> >> >> > >> > > + if [ -z "$sccs_defconfig" ]; then
>> >> >> > >> > > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
>> >> >> > >> > > fi
>> >> >> > >> > > -
>> >> >> > >> > > + else
>> >> >> > >> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
>> >> >> > >> > > # then we need to set a flag that will instruct the next
>> >> >> > >> > > # steps to use the BSP as both configuration and patches.
>> >> >> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
>> >> >> > >> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
>> >> >> > >> > > if [ -n "${elements}" ]; then
>> >> >> > >> > > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
>> >> >> > >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
>> >> >> > >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
>> >> >> > >> > > if [ $? -ne 0 ]; then
>> >> >> > >> > > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
>> >> >> > >> > > fi
>> >> >> > >> > > --
>> >> >> > >> > > 2.17.1
>> >> >> > >> > >
>> >> >> > >> > >
>> >> >> > >> >
>> >> >> > >> >
>> >> >> > >> >
>> >> >> > >> > --
>> >> >> > >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> >> > >> > thee at its end
>> >> >> > >> > - "Use the force Harry" - Gandalf, Star Trek II
>> >> >> > >>
>> >> >> >
>> >> >> >
>> >> >> >
>> >> >> > --
>> >> >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> >> > thee at its end
>> >> >> > - "Use the force Harry" - Gandalf, Star Trek II
>> >>
>> >>
>> >>
>> >> --
>> >> - Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> thee at its end
>> >> - "Use the force Harry" - Gandalf, Star Trek II
>>
>>
>>
>> --
>> - Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end
>> - "Use the force Harry" - Gandalf, Star Trek II
>
>
--
Regards,
Andrey.
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first
2020-07-23 18:33 ` Andrey Zhizhikin
@ 2020-07-23 20:46 ` Bruce Ashfield
0 siblings, 0 replies; 40+ messages in thread
From: Bruce Ashfield @ 2020-07-23 20:46 UTC (permalink / raw)
To: Andrey Zhizhikin
Cc: Ryan Harkin, Steve Sakoman,
Patches and discussions about the oe-core layer
On Thu, Jul 23, 2020 at 2:34 PM Andrey Zhizhikin <andrey.z@gmail.com> wrote:
>
> Hey guys,
>
> Sorry for jumping into this thread a bit later - I saw that it has
> been sorted out already.
>
> On Thu, Jul 23, 2020 at 6:06 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
> >
> >
> >
> > On Thu, 23 Jul 2020 at 16:05, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >>
> >> On Thu, Jul 23, 2020 at 9:38 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
> >> >
> >> > Hi Bruce,
> >> >
> >> > On Thu, 23 Jul 2020 at 13:27, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >> >>
> >> >> On Thu, Jul 23, 2020 at 5:34 AM Ryan Harkin <ryan.harkin@linaro.org> wrote:
> >> >> >
> >> >> > Hi Bruce, Steve,
> >> >> >
> >> >> > Thanks for your replies and the help.
> >> >> >
> >> >> > On Thu, 23 Jul 2020 at 04:33, Steve Sakoman <steve@sakoman.com> wrote:
> >> >> >>
> >> >> >> On Wed, Jul 22, 2020 at 3:58 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >> >> >> >
> >> >> >> > On Wed, Jul 22, 2020 at 5:27 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
> >> >> >> > >
> >> >> >> > > Just an FYI, but when this was submitted, my imx7s-warp builds began to fail when building linux-fslc from meta-freescale / meta-freescale-3rdparty.
> >> >> >> > >
> >> >> >> > > I'm not sure why yet, I've only discovered the problem, but I thought I'd report it in case anyone else sees the problem.
> >> >> >> > >
> >> >> >> >
> >> >> >> > Someone already sent a dunfell backport request for a follow up patch to this.
> >> >> >> >
> >> >> >> > It went to the poky list, but I just replied to it and copied oe-core.
> >> >> >>
> >> >> >> Both patches are already in dunfell!
> >> >> >>
> >> >> >> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=7ecc81baeacaa1149a4947791200e8819c3df677
> >> >> >> https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=11089e06bfb3d0defb52825ffba978d085385569
> >> >> >
> >> >> >
> >> >> > Yes, they are present. I guess I should have checked the error messages more closely during git bisect rather than stopping as soon as the build failed.
> >> >> >
> >> >> > After Bruce's 7ecc81baea patch, I see this error:
> >> >> >
> >> >> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_metadata: Could not locate BSP definition for imx7s-warp/standard and no defconfig was provided
> >> >> >
> >> >> > Then, after 11089e06bf, I see the error I originally posted from my CI job, but reproduced here from a local build:
>
> This was the patch I've introduced and seeing those errors were quite
> a surprise to me. I have also an internal CI that builds
> meta-freescale off the dunfell branch - and I never had any issues
> with it.
>
> >> >> >
> >> >> > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
> >> >> > WARNING: exit code 1 from a shell command.
> >> >> >
> >> >> > ERROR: Logfile of failure stored in: /data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.31899
> >> >> > Log data follows:
> >> >> > | DEBUG: Executing python function extend_recipe_sysroot
> >> >> > | NOTE: Direct dependencies are ['/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/data/warp7/workspace-dunfell/build-rpb/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot']
> >> >> > | NOTE: Installed into sysroot: []
> >> >> > | NOTE: Skipping as already exists in sysroot: ['gcc-cross-arm', 'bc-native', 'binutils-cross-arm', 'bison-native', 'quilt-native', 'kern-tools-native', 'patch-native', 'readline-native', 'flex-native', 'automake-native', 'texinfo-dummy-native', 'autoconf-native', 'libtool-native', 'gnu-config-native', 'xz-native', 'gettext-minimal-native', 'libmpc-native', 'gmp-native', 'zlib-native', 'mpfr-native', 'linux-libc-headers', 'attr-native', 'ncurses-native', 'm4-native', 'pkgconfig-native']
> >> >> > | DEBUG: Python function extend_recipe_sysroot finished
> >> >> > | DEBUG: Executing shell function do_kernel_configme
> >> >> > | WARNING: exit code 1 from a shell command.
> >> >> > | ERROR: Execution of '/data/warp7/workspace-dunfell/build-rpb/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.31899' failed with exit code 1:
> >> >> > | WARNING: exit code 1 from a shell command.
> >> >> >
> >> >> > I haven't yet looked at what these patches do, but I'm expecting there's something to update in the linux-fslc recipe, unless there's another issue in the defconfig patches.
> >> >> >
> >> >>
> >> >> We've had multiple reports that with those patches the linux-fslc
> >> >> recipe is building. So something else may be going on in your setup.
>
> If there were some reports - I haven't seen them...
>
> Bruce, do you happen to have any reference to them? I'm trying to
> merge and maintain linux-fslc[-imx] kernels, and so far I've never
> seen any failures. Or maybe they were reported on some mailing lists
> I'm not in.
They were deeper follow ups to some of the threads here and on
linux-yocto. Nothing too obvious.
Just in case anyone is reading this and thinking the issue was ever
with the linux-fslc* kernels .. that isn't the case. It just happened
to be the one that people were using that showed the issue introduced
by my defconfig juggling.
>
> >> >
> >> >
> >> > That's reassuring.
> >> >
> >> >>
> >> >> If you have a set of layers and build steps, can you send them to me ?
> >> >> I can spin up a local build and see if I get the same behaviour.
> >> >
> >> >
> >> > Thanks for the offer. I'm based on Linaro's "OE-RPB" setup.
> >> >
> >> > My own layer is quite simple:
> >> > https://git.linaro.org/people/ryan.harkin/meta-warp7.git/log/?h=dunfell
> >> >
> >> > I mostly provide a new image definition and a simple u-boot patch to change the console UART for our CI system. I don't have a kernel recipe overlaying linux-fslc.
> >> >
> >> > My basic steps to clone and build are:
> >> > --------------------------
> >> > mkdir /data/warp7/workspace-dunfell
> >> > cd /data/warp7/workspace-dunfell
> >> > repo init -u \
> >> > https://git.linaro.org/people/ryan.harkin/oe-rpb-manifest.git \
> >> > -b dunfell
> >> > repo sync
> >> >
> >> > # link in shared downloads and sstate-cache
> >> > ln -s /linaro/oe-rpb/downloads . && ln -s /linaro/oe-rpb/sstate-cache .
> >> >
> >> > export MACHINE=imx7s-warp ; export DISTRO=rpb ; . setup-environment
> >> > bitbake warp7-console-image
> >> > --------------------------
> >> >
> >>
> >> I'm spinning up a build now (but as usual, I'm fighting some
> >> infrastructure issues and can't get repo to install).
> >
> >
> > It looks like you can stand down on this...
> >
> >>
> >>
> >> Steve mentioned two patches ... but can you also confirm that:
> >> [kernel-yocto: account for extracted defconfig in elements check] is
> >> in the branch you are building ?
> >
> >
> > That patch wasn't in my dunfell branch, so I cherry-picked it from master locally and now the build is working again.
> > Meanwhile, doing a "git remote update" and I see the patch is now on top of the dunfell branch as of today, and my build is working again.
>
> Glad to see that it is solved for you! I've run the build for
> meta-freescale linux-fslc yesterday - it went through like a breeze...
> I don't think there was a significant update on dunfell, but I can
> start the build now anyway...
It'll be fine once Steve does the next release. We just got unlucky
and picked up 2 of the defconfig correction patches before he bug
report came in. So everything is ok, and with the latest dunfell queue
there aren't any issues.
Bruce
>
> >
> > Great, thanks for your help folks.
> >
> > Regards,
> > Ryan.
> >
> >
> >
> >>
> >>
> >> Bruce
> >>
> >>
> >> > Right now, I've pinned oo-core to my last known working build from before your recent defconfig patch, so you'll want to go into layer/openembedded-core and checkout the latest commits.
> >> >
> >> > For reference, my pinned commit:
> >> > cabaf5654d 2020-07-06 iso-codes: switch upstream branch master -> main [Hongxu Jia]
> >> >
> >> > Local testing tells me that the repo works fine for me all the way up to just before your commit, at this point:
> >> > 2399fdf98a 2020-07-03 classes/archive: do_configure should not depend on do_ar_p.. [Joshua Watt]
> >> >
> >> > I'm building on an Ubuntu 18.04 host locally.
> >> >
> >> > Regards,
> >> > Ryan.
> >> >
> >> >
> >> >>
> >> >>
> >> >> Bruce
> >> >>
> >> >> > Regards,
> >> >> > Ryan.
> >> >> >
> >> >> >
> >> >> >
> >> >> >
> >> >> >
> >> >> >
> >> >> >>
> >> >> >>
> >> >> >>
> >> >> >> Steve
> >> >> >>
> >> >> >> > > Here's a link to my failing build for reference:
> >> >> >> > > https://ci.linaro.org/job/warp7-openembedded-dunfell/67/DISTRO=rpb,MACHINE=imx7s-warp,label=docker-buster-amd64/consoleText
> >> >> >> > >
> >> >> >> > > And a snippet from the failure:
> >> >> >> > >
> >> >> >> > > ERROR: linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0 do_kernel_configme: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
>
> Oh, this is actually a good reminder: I have to bump up the kernel
> version! It's been merged into the linux-fslc repo, but I didn't
> update recipes so far... Vacation time... :) Latest update would
> include v5.4.51 tag.
>
> >> >> >> > > WARNING: exit code 1 from a shell command.
> >> >> >> > >
> >> >> >> > > ERROR: Logfile of failure stored in: /srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/log.do_kernel_configme.7123
> >> >> >> > > Log data follows:
> >> >> >> > > | DEBUG: Executing python function extend_recipe_sysroot
> >> >> >> > > | NOTE: Direct dependencies are ['virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/bison/bison_3.5.3.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.34.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-devtools/patch/patch_2.7.6.bb:do_populate_sysroot', 'virtual:native:/srv/oe/build/conf/../../layers/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/srv/oe/build/conf/../../layers/meta-arm/meta-arm-toolchain/recipes-devtools/gcc/gcc-cross_arm-9.2.bb:do_populate_sysroot']
> >> >> >> > > | NOTE: Installed into sysroot: []
> >> >> >> > > | NOTE: Skipping as already exists in sysroot: ['bison-native', 'kern-tools-native', 'binutils-cross-arm', 'quilt-native', 'patch-native', 'bc-native', 'gcc-cross-arm', 'flex-native', 'texinfo-dummy-native', 'gnu-config-native', 'readline-native', 'libtool-native', 'automake-native', 'autoconf-native', 'xz-native', 'linux-libc-headers', 'gmp-native', 'libmpc-native', 'mpfr-native', 'zlib-native', 'gettext-minimal-native', 'attr-native', 'm4-native', 'ncurses-native', 'pkgconfig-native']
> >> >> >> > > | DEBUG: Python function extend_recipe_sysroot finished
> >> >> >> > > | DEBUG: Executing shell function do_kernel_configme
> >> >> >> > > | WARNING: exit code 1 from a shell command.
> >> >> >> > > | ERROR: Execution of '/srv/oe/build/tmp-rpb-glibc/work/imx7s_warp-linaro-linux-gnueabi/linux-fslc/5.4.46+gitAUTOINC+38d6c3525e-r0/temp/run.do_kernel_configme.7123' failed with exit code 1:
> >> >> >> > > | WARNING: exit code 1 from a shell command.
> >> >> >> > > |
> >> >> >> > > NOTE: recipe linux-fslc-5.4.46+gitAUTOINC+38d6c3525e-r0: task do_kernel_configme: Failed
> >> >> >> > > ERROR: Task (/srv/oe/build/conf/../../layers/meta-freescale/recipes-kernel/linux/linux-fslc_5.4.bb:do_kernel_configme) failed with exit code '1'
> >> >> >> > >
> >> >> >> > >
> >> >> >> > >
> >> >> >> > > On Mon, 6 Jul 2020 at 17:38, Steve Sakoman <steve@sakoman.com> wrote:
> >> >> >> > >>
> >> >> >> > >> On Mon, Jul 6, 2020 at 6:29 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >> >> >> > >> >
> >> >> >> > >> > We have a fixup patch for this one in test right now, so we don't want
> >> >> >> > >> > this patch, without the follow up.
> >> >> >> > >> >
> >> >> >> > >> > But this is useful for dunfell, since it was an unexpected behaviour
> >> >> >> > >> > that needed to be fixed.
> >> >> >> > >>
> >> >> >> > >> Thanks, I'll drop this patch from the pull request and include it
> >> >> >> > >> along with the fixup patch in next week's patch set.
> >> >> >> > >>
> >> >> >> > >> Steve
> >> >> >> > >>
> >> >> >> > >> > On Mon, Jul 6, 2020 at 12:11 PM Steve Sakoman <steve@sakoman.com> wrote:
> >> >> >> > >> > >
> >> >> >> > >> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> >> >> > >> > >
> >> >> >> > >> > > It is uncommon that a BSP definition and a defconfig are used in
> >> >> >> > >> > > a single configuration. That being said, it is a valid way to
> >> >> >> > >> > > organize kernel configuration meta data.
> >> >> >> > >> > >
> >> >> >> > >> > > When a defconfig is used, either on the src_uri or from in
> >> >> >> > >> > > the kernel tree, it is normally expected that it is the baseline,
> >> >> >> > >> > > with all options applied on top of it.
> >> >> >> > >> > >
> >> >> >> > >> > > With this commit, we detect either type of defconfig and ensure
> >> >> >> > >> > > that it is used first, followed by the fragments in their
> >> >> >> > >> > > previous order. This allows existing configuration stacks to
> >> >> >> > >> > > remain the same, while ensuring that a defconfig combined stack
> >> >> >> > >> > > works as expected.
> >> >> >> > >> > >
> >> >> >> > >> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> >> >> > >> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >> >> >> > >> > > (cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
> >> >> >> > >> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> >> >> >> > >> > > ---
> >> >> >> > >> > > meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
> >> >> >> > >> > > 1 file changed, 21 insertions(+), 12 deletions(-)
> >> >> >> > >> > >
> >> >> >> > >> > > diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> >> >> >> > >> > > index 5bc627066e..41d8620e67 100644
> >> >> >> > >> > > --- a/meta/classes/kernel-yocto.bbclass
> >> >> >> > >> > > +++ b/meta/classes/kernel-yocto.bbclass
> >> >> >> > >> > > @@ -131,7 +131,7 @@ do_kernel_metadata() {
> >> >> >> > >> > > else
> >> >> >> > >> > > cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
> >> >> >> > >> > > fi
> >> >> >> > >> > > - sccs="${WORKDIR}/defconfig"
> >> >> >> > >> > > + in_tree_defconfig="${WORKDIR}/defconfig"
> >> >> >> > >> > > else
> >> >> >> > >> > > bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
> >> >> >> > >> > > fi
> >> >> >> > >> > > @@ -153,14 +153,24 @@ do_kernel_metadata() {
> >> >> >> > >> > > patches="${@" ".join(find_patches(d,''))}"
> >> >> >> > >> > > feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
> >> >> >> > >> > >
> >> >> >> > >> > > - # a quick check to make sure we don't have duplicate defconfigs
> >> >> >> > >> > > - # If there's a defconfig in the SRC_URI, did we also have one from
> >> >> >> > >> > > - # the KBUILD_DEFCONFIG processing above ?
> >> >> >> > >> > > - if [ -n "$sccs" ]; then
> >> >> >> > >> > > - # we did have a defconfig from above. remove any that might be in the src_uri
> >> >> >> > >> > > - sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> >> >> > >> > > + # a quick check to make sure we don't have duplicate defconfigs If
> >> >> >> > >> > > + # there's a defconfig in the SRC_URI, did we also have one from the
> >> >> >> > >> > > + # KBUILD_DEFCONFIG processing above ?
> >> >> >> > >> > > + src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
> >> >> >> > >> > > + # drop and defconfig's from the src_uri variable, we captured it just above here if it existed
> >> >> >> > >> > > + sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
> >> >> >> > >> > > + if [ -n "$in_tree_defconfig" ]; then
> >> >> >> > >> > > + sccs_defconfig=$in_tree_defconfig
> >> >> >> > >> > > + if [ -n "$src_uri_defconfig" ]; then
> >> >> >> > >> > > + bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
> >> >> >> > >> > > + fi
> >> >> >> > >> > > + else
> >> >> >> > >> > > + # if we didn't have an in-tree one, make our defconfig the one
> >> >> >> > >> > > + # from the src_uri. Note: there may not have been one from the
> >> >> >> > >> > > + # src_uri, so this can be an empty variable.
> >> >> >> > >> > > + sccs_defconfig=$src_uri_defconfig
> >> >> >> > >> > > fi
> >> >> >> > >> > > - sccs="$sccs $sccs_from_src_uri"
> >> >> >> > >> > > + sccs="$sccs_from_src_uri"
> >> >> >> > >> > >
> >> >> >> > >> > > # check for feature directories/repos/branches that were part of the
> >> >> >> > >> > > # SRC_URI. If they were supplied, we convert them into include directives
> >> >> >> > >> > > @@ -187,11 +197,10 @@ do_kernel_metadata() {
> >> >> >> > >> > > # expand kernel features into their full path equivalents
> >> >> >> > >> > > bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
> >> >> >> > >> > > if [ -z "$bsp_definition" ]; then
> >> >> >> > >> > > - echo "$sccs" | grep -q defconfig
> >> >> >> > >> > > - if [ $? -ne 0 ]; then
> >> >> >> > >> > > + if [ -z "$sccs_defconfig" ]; then
> >> >> >> > >> > > bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
> >> >> >> > >> > > fi
> >> >> >> > >> > > -
> >> >> >> > >> > > + else
> >> >> >> > >> > > # if the bsp definition has "define KMETA_EXTERNAL_BSP t",
> >> >> >> > >> > > # then we need to set a flag that will instruct the next
> >> >> >> > >> > > # steps to use the BSP as both configuration and patches.
> >> >> >> > >> > > @@ -206,7 +215,7 @@ do_kernel_metadata() {
> >> >> >> > >> > > elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
> >> >> >> > >> > > if [ -n "${elements}" ]; then
> >> >> >> > >> > > echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
> >> >> >> > >> > > - scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
> >> >> >> > >> > > + scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
> >> >> >> > >> > > if [ $? -ne 0 ]; then
> >> >> >> > >> > > bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
> >> >> >> > >> > > fi
> >> >> >> > >> > > --
> >> >> >> > >> > > 2.17.1
> >> >> >> > >> > >
> >> >> >> > >> > >
> >> >> >> > >> >
> >> >> >> > >> >
> >> >> >> > >> >
> >> >> >> > >> > --
> >> >> >> > >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> >> >> > >> > thee at its end
> >> >> >> > >> > - "Use the force Harry" - Gandalf, Star Trek II
> >> >> >> > >>
> >> >> >> >
> >> >> >> >
> >> >> >> >
> >> >> >> > --
> >> >> >> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> >> >> > thee at its end
> >> >> >> > - "Use the force Harry" - Gandalf, Star Trek II
> >> >>
> >> >>
> >> >>
> >> >> --
> >> >> - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> >> thee at its end
> >> >> - "Use the force Harry" - Gandalf, Star Trek II
> >>
> >>
> >>
> >> --
> >> - Thou shalt not follow the NULL pointer, for chaos and madness await
> >> thee at its end
> >> - "Use the force Harry" - Gandalf, Star Trek II
> >
> >
>
>
>
> --
> Regards,
> Andrey.
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 40+ messages in thread
* [OE-core][dunfell 05/25] linux-yocto/5.4: update to v5.4.45
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (3 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 04/25] kernel/yocto: ensure that defconfigs are processed first Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 06/25] linux-yocto-rt/5.4: update to rt25 Steve Sakoman
` (19 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
3604bc07c035 Linux 5.4.45
40caf1bfd32c net: smsc911x: Fix runtime PM imbalance on error
252801505e04 selftests: mlxsw: qos_mc_aware: Specify arping timeout as an integer
aea1423a6334 net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x
6992c8995c84 net/ethernet/freescale: rework quiesce/activate for ucc_geth
6a904892d84f null_blk: return error for invalid zone size
b5cb7fe92059 s390/mm: fix set_huge_pte_at() for empty ptes
c0063f3919ae drm/edid: Add Oculus Rift S to non-desktop list
c90e773c21fb net: bmac: Fix read of MAC address from ROM
92c09e88c188 x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables
ba550153177a io_uring: initialize ctx->sqo_wait earlier
f1c582154e43 i2c: altera: Fix race between xfer_msg and isr thread
1857d7d77659 scsi: pm: Balance pm_only counter of request queue during system resume
1610cd913f5a evm: Fix RCU list related warnings
31ca6427f64d ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT
935ba01e80d4 ARC: Fix ICCM & DCCM runtime size checks
8a69220b659c RDMA/qedr: Fix synchronization methods and memory leaks in qedr
49e92679341d RDMA/qedr: Fix qpids xarray api used
0377fda07b5e s390/ftrace: save traced function caller
0734b58f84a9 ASoC: intel - fix the card names
6106585fc4c4 spi: dw: use "smp_mb()" to avoid sending spi data error
99c63ba21d2e powerpc/xmon: Restrict when kernel is locked down
f2adfe126bdb powerpc/powernv: Avoid re-registration of imc debugfs directory
a293045d38c1 scsi: hisi_sas: Check sas_port before using it
cfd5ac76ba30 drm/i915: fix port checks for MST support on gen >= 11
74028c9c22fd airo: Fix read overflows sending packets
63ad3fb06834 net: dsa: mt7530: set CPU port to fallback mode
d628f7a59e1c scsi: ufs: Release clock if DMA map fails
95ffc2a5cea7 media: staging: ipu3-imgu: Move alignment attribute to field
5b6e152341b0 media: Revert "staging: imgu: Address a compiler warning on alignment"
a122eef40fd2 mmc: fix compilation of user API
1c44e6e09dc8 kernel/relay.c: handle alloc_percpu returning NULL in relay_open
91e863ab82c8 mt76: mt76x02u: Add support for newer versions of the XBox One wifi adapter
8a6744ebdbb5 p54usb: add AirVasT USB stick device-id
ac09eae4b734 HID: i2c-hid: add Schneider SCL142ALM to descriptor override
3e8410cbef27 HID: multitouch: enable multi-input as a quirk for some devices
aa0dd0e2252b HID: sony: Fix for broken buttons on DS3 USB dongles
df4988aa1c96 mm: Fix mremap not considering huge pmd devmap
3209e3e812dd Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window"
55852b3fd146 Linux 5.4.44
f2a9b00a68c5 perf: Make perf able to build with latest libbfd
3f57fa847e27 netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build
7a075390b732 netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update
987de40bff33 netfilter: conntrack: comparison of unsigned in cthelper confirmation
a4547f63e05f bonding: Fix reference count leak in bond_sysfs_slave_add.
b668b392cc2c net: dsa: declare lockless TX feature for slave ports
35c0a6e7ef55 ipv4: nexthop version of fib_info_nh_uses_dev
568c159356d1 nexthop: Expand nexthop_is_multipath in a few places
88e81db5509b nexthops: don't modify published nexthop groups
8398275f7aed nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entry
2b043affcaea crypto: chelsio/chtls: properly set tp->lsndtime
a369e8378b48 qlcnic: fix missing release in qlcnic_83xx_interrupt_test.
1c38cfc259a7 xsk: Add overflow check for u64 division, stored into u32
73c05545fbb5 ieee80211: Fix incorrect mask for default PE duration
2e91cd11bafc bnxt_en: Fix accumulation of bp->net_stats_prev.
dda9d0eb7a96 esp6: get the right proto for transport mode in esp6_gso_encap
9f57771d09f4 netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code
b16287f99d31 netfilter: nfnetlink_cthelper: unbreak userspace helper support
7140b6280230 netfilter: conntrack: make conntrack userspace helpers work again
17021d1b899d netfilter: ipset: Fix subcounter update skip
25f629a70680 netfilter: nft_reject_bridge: enable reject with bridge vlan
26e28c10e72c ip_vti: receive ipip packet by calling ip_tunnel_rcv
0de9bed087a2 xfrm: fix error in comment
f5dc87e0e389 xfrm: fix a NULL-ptr deref in xfrm_local_error
25613580a5bc xfrm: fix a warning in xfrm_policy_insert_list
d9710d69b89f xfrm interface: fix oops when deleting a x-netns interface
de4a187389fa xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output
edd79cf0cfdf xfrm: remove the xfrm_state_put call becofe going to out_reset
cd7031ef9683 xfrm: do pskb_pull properly in __xfrm_transport_prep
14a1c1dc5695 xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input
47dc81ce7d84 copy_xstate_to_kernel(): don't leave parts of destination uninitialized
94690ca1ae4c x86/dma: Fix max PFN arithmetic overflow on 32 bit systems
e980f9cb2f2d mac80211: mesh: fix discovery timer re-arming issue / crash
2f0851690a0e x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long"
8c1bfa73353a cfg80211: fix debugfs rename crash
f9cd0c831806 parisc: Fix kernel panic in mem_init()
ca788fd797a7 iommu: Fix reference count leak in iommu_group_alloc.
b298c314b9d9 gpio: fix locking open drain IRQ lines
bba91cdba612 Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
31f0b78bb478 include/asm-generic/topology.h: guard cpumask_of_node() macro argument
a02c130efbbc fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info()
de482c445b0f mm: remove VM_BUG_ON(PageSlab()) from page_mapcount()
a7ba9f24737b mm,thp: stop leaking unreleased file pages
21358b3e77af IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode
5a1bd1704272 drm/amd/display: drop cursor position check in atomic test
b5d326a77b73 RDMA/core: Fix double destruction of uobject
6b292d7806a1 ceph: flush release queue when handling caps for unknown inode
4d145e482374 libceph: ignore pool overlay and cache logic on redirects
d162b9e1b1a9 ALSA: hda/realtek - Add new codec supported for ALC287
c33bf209deae ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio
8fc8674092b2 clk: qcom: gcc: Fix parent for gpll0_out_even
68fe063327af exec: Always set cap_ambient in cap_bprm_set_creds
4adcf889e66b ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC
8c71b0bd64df ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround
84b0a4f42584 ALSA: hwdep: fix a left shifting 1 by 31 UB bug
a003e1f653d6 RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe()
b191e3ea6dfc gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe()
d6d07089dee3 gpio: pxa: Fix return value of pxa_gpio_probe()
a971f71e91fb mmc: block: Fix use-after-free issue for rpmb
2de6df8df9bd ARM: dts: bcm: HR2: Fix PPI interrupt types
f8b161c3f3ac ARM: dts: bcm2835-rpi-zero-w: Fix led polarity
485bd944e0c6 ARM: dts/imx6q-bx50v3: Set display interface clock parents
a38a75c22b9f IB/qib: Call kobject_put() when kobject_init_and_add() fails
820be34d0137 gpu/drm: Ingenic: Fix opaque pointer casted to wrong type
707f5075021f soc: mediatek: cmdq: return send msg error code
56e7873ed267 arm64: dts: mt8173: fix vcodec-enc clock
750f47a6586b gpio: exar: Fix bad handling for ida_simple_get error path
5242e3850b1c ARM: uaccess: fix DACR mismatch with nested exceptions
d9c318f0eda3 ARM: uaccess: integrate uaccess_save and uaccess_restore
96e2df4c753b ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h
f175897a960e ARM: 8970/1: decompressor: increase tag size
4aa75ce40b1d Input: synaptics-rmi4 - fix error return code in rmi_driver_probe()
176dbb9eeba0 Input: synaptics-rmi4 - really fix attn_data use-after-free
7016d241ca64 Input: i8042 - add ThinkPad S230u to i8042 reset list
a63a679e1ec7 Input: dlink-dir685-touchkeys - fix a typo in driver name
d9d50cbccc79 Input: xpad - add custom init packet for Xbox One S controllers
9abf0403a709 Input: evdev - call input_flush_device() on release(), not flush()
5a273fa56229 Input: usbtouchscreen - add support for BonXeon TP
b66de2d961a6 drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c
dfe417b45634 samples: bpf: Fix build error
70bf0fd60f2f csky: Fixup raw_copy_from_user()
2fa8032fa78a cifs: Fix null pointer check in cifs_read
ce1ef281e786 hwmon: (nct7904) Fix incorrect range of temperature limit registers
68d72327999a csky: Fixup remove duplicate irq_disable
99bd434f8893 csky: Fixup perf callchain unwind
f3f23f4c6413 csky: Fixup msa highest 3 bits mask
e104bd855454 clk: ti: am33xx: fix RTC clock parent
6b8c281e9a48 riscv: stacktrace: Fix undefined reference to `walk_stackframe'
b84952e88336 IB/i40iw: Remove bogus call to netdev_master_upper_dev_get()
706fee65d95c net: freescale: select CONFIG_FIXED_PHY where needed
74037ef26835 usb: gadget: legacy: fix redundant initialization warnings
e8a03e73cd14 usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()'
e02fe520c11b usb: dwc3: pci: Enable extcon driver for Intel Merrifield
e1dfa986fda6 cachefiles: Fix race between read_waiter and read_copier involving op->to_do
336292c44f62 drm/amdgpu: Use GEM obj reference for KFD BOs
2dd33d3175ef drm/amd/powerplay: perform PG ungate prior to CG ungate
4552f27f9d64 drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate
49388448eda0 gfs2: Grab glock reference sooner in gfs2_add_revoke
fd5516ea8239 gfs2: move privileged user check to gfs2_quota_lock_check
02a76cd6bda6 net: microchip: encx24j600: add missed kthread_stop
2578135aa8f0 ALSA: usb-audio: add mapping for ASRock TRX40 Creator
3e4e413c93f0 gpio: tegra: mask GPIO IRQs during IRQ shutdown
6ff411af068c ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi
881dc2e22fb9 ARM: dts: rockchip: swap clock-names of gpu nodes
96e88e683165 arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node
9dc2e51ea7c1 arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts
dd35a809c158 ARM: dts: rockchip: fix phy nodename for rk3229-xms6
203a45eb258c ARM: dts: rockchip: fix phy nodename for rk3228-evb
c5b2233ad5f4 mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails
9aeacb829cad net/mlx4_core: fix a memory leak bug.
fcb4d5869e98 net: sun: fix missing release regions in cas_init_one().
d12fc818b0d8 net/tls: free record only on encryption error
cff9e73a34a2 net/tls: fix encryption error checking
3f4f034a8676 net/mlx5: Annotate mutex destroy for root ns
f493398fe0f7 net/mlx5: Fix error flow in case of function_setup failure
9fe88c940828 net/mlx5e: Update netdev txq on completions during closure
02c97e838597 net/mlx5: Fix memory leak in mlx5_events_init
e23f88f7e730 net/mlx5e: Fix inner tirs handling
f9e2700f34ec net/mlx5e: kTLS, Destroy key object after destroying the TIS
8c9df6ced1f9 tipc: block BH before using dst_cache
5398c7ff2347 sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed
70989e501fbc sctp: Don't add the shutdown timer if its already been added
34036769c84b r8152: support additional Microsoft Surface Ethernet Adapter variant
983fa2e7740f nexthop: Fix attribute checking for groups
cf4cc95a15f5 net/tls: fix race condition causing kernel panic
587e13469cfd net sched: fix reporting the first-time use timestamp
f12398120522 net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()"
83588bf1dd55 net: qrtr: Fix passing invalid reference to qrtr_local_enqueue()
7e0e066df34a net: nlmsg_cancel() if put fails for nhmsg
84e91312ad9a net: mvpp2: fix RX hashing for non-10G ports
212bcf1039a9 net/mlx5: Add command entry handling completion
a9595d1c60a7 net: ipip: fix wrong address family in init error path
4d827edb8f4e net: inet_csk: Fix so_reuseport bind-address cache in tb->fast*
b51eb49d9a5d __netif_receive_skb_core: pass skb by reference
53cf25df80c7 net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
557045f771e2 net: dsa: mt7530: fix roaming from DSA user ports
b853a13bb224 net: don't return invalid table id error when we fall back to PF_UNSPEC
40a904b1c2e5 dpaa_eth: fix usage as DSA master, try 3
d9ce4b67dd9f ax25: fix setsockopt(SO_BINDTODEVICE)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 71ab00d335d1d7f5d0827651397b8109091108d0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index a9213c2439..c88a045dfc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "1afad41c91e13f957bbe61fa7fdc05a77e84d489"
-SRCREV_meta ?= "aafb8f095e97013d6e55b09ed150369cbe0c6476"
+SRCREV_machine ?= "3401d0c3e51b083016c4c5177de686fb9606f304"
+SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.43"
+LINUX_VERSION ?= "5.4.45"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index aab53bed6a..b9ac34396a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.43"
+LINUX_VERSION ?= "5.4.45"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "c3864bf2906c5075305bf675c27788505ea93047"
-SRCREV_machine ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_meta ?= "aafb8f095e97013d6e55b09ed150369cbe0c6476"
+SRCREV_machine_qemuarm ?= "c2765f98de328de8ac03bbc112d274c093949ad0"
+SRCREV_machine ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 01795e6166..ae952e0771 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "6c628db39bf48f7dd6cd95ae826bcaa18a56df1d"
-SRCREV_machine_qemuarm64 ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_machine_qemumips ?= "c0cd2937ae195344ece04663b30b2049427b3c57"
-SRCREV_machine_qemuppc ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_machine_qemuriscv64 ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_machine_qemux86 ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_machine_qemux86-64 ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_machine_qemumips64 ?= "6254ff1d776b75bc3d9c2c66c083fbc622091cd4"
-SRCREV_machine ?= "9e1b13d7f9d84f691fb9988c5f53c5ab62b8a5e9"
-SRCREV_meta ?= "aafb8f095e97013d6e55b09ed150369cbe0c6476"
+SRCREV_machine_qemuarm ?= "25484a4f9ba2682d45c3f3bbf5497f6d7d75817d"
+SRCREV_machine_qemuarm64 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_machine_qemumips ?= "48bd1e848614da3ce48d52a1b2a15241d2a2f909"
+SRCREV_machine_qemuppc ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_machine_qemuriscv64 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_machine_qemux86 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_machine_qemux86-64 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_machine_qemumips64 ?= "0e18185e09beb99a7b6408e9650ad5f31e8f759d"
+SRCREV_machine ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
+SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.43"
+LINUX_VERSION ?= "5.4.45"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 06/25] linux-yocto-rt/5.4: update to rt25
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (4 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 05/25] linux-yocto/5.4: update to v5.4.45 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 07/25] linux-yocto/5.4: update to v5.4.46 Steve Sakoman
` (18 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the following commit(s) to linux-yocto/5.4:
46d685b7b963 Linux 5.4.43-rt25
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 361b11594b3e04e7b279a88d5d3358dd75bb2a2e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index c88a045dfc..d4d95204f6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,7 +11,7 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "3401d0c3e51b083016c4c5177de686fb9606f304"
+SRCREV_machine ?= "46d685b7b96320ec6e8b2e1a1126ce02cae35865"
SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 07/25] linux-yocto/5.4: update to v5.4.46
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (5 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 06/25] linux-yocto-rt/5.4: update to rt25 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 08/25] linux-yocto/5.4: update to v5.4.47 Steve Sakoman
` (17 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
5e3c51153922 Linux 5.4.46
9504466c9038 Revert "net/mlx5: Annotate mutex destroy for root ns"
c06c03bba03f uprobes: ensure that uprobe->offset and ->ref_ctr_offset are properly aligned
590459086bc9 x86/speculation: Add Ivy Bridge to affected list
faf187abda94 x86/speculation: Add SRBDS vulnerability and mitigation documentation
b0f61a0503ad x86/speculation: Add Special Register Buffer Data Sampling (SRBDS) mitigation
dab0161b8a0b x86/cpu: Add 'table' argument to cpu_matches()
749ec6b48a9a x86/cpu: Add a steppings field to struct x86_cpu_id
e4e57f7bca44 x86/speculation/spectre_v2: Exclude Zhaoxin CPUs from SPECTRE_V2
c2baba26ac5e nvmem: qfprom: remove incorrect write support
b3e3f4cb8c6b CDC-ACM: heed quirk also in error handling
4992c7618818 staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK
784ac0e82920 tty: hvc_console, fix crashes on parallel open/close
9619c2f746f7 vt: keyboard: avoid signed integer overflow in k_ascii
2d0c87d34dab usb: musb: Fix runtime PM imbalance on error
e8f57f50e31b usb: musb: start session in resume for host port
8d130bf2fcab iio: adc: stm32-adc: fix a wrong error message when probing interrupts
e98b0548b2f8 iio:chemical:pms7003: Fix timestamp alignment and prevent data leak.
9b0e734fde6d iio: vcnl4000: Fix i2c swapped word reading.
940530f60c60 iio:chemical:sps30: Fix timestamp alignment
0fac736dbac6 USB: serial: ch341: add basis for quirk detection
9060d48b4206 USB: serial: option: add Telit LE910C1-EUX compositions
5555c8f569fa USB: serial: usb_wwan: do not resubmit rx urb on fatal errors
f366d3a21f12 USB: serial: qcserial: add DW5816e QDL support
b3ebd9830c60 net: be more gentle about silly gso requests coming from user
a93417dfc1b0 net: check untrusted gso_size at kernel entry
a02203349750 vsock: fix timeout in vsock_accept()
646345a15350 nfp: flower: fix used time of merge flow statistics
165508e456b1 NFC: st21nfca: add missed kfree_skb() in an error path
87adb76710d0 net: usb: qmi_wwan: add Telit LE910C1-EUX composition
de8f81077be2 net: stmmac: enable timestamp snapshot for required PTP packets in dwmac v5.10a
fb915f061e9e net/mlx5: Fix crash upon suspend/resume
5fc8f9a34800 l2tp: do not use inet_hash()/inet_unhash()
1b7693c09252 l2tp: add sk_family checks to l2tp_validate_socket
449c72324085 devinet: fix memleak in inetdev_init()
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ff6b0ac5ee9fb8bb74aaeae3f5587252801113bd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index d4d95204f6..4f7b84613e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "46d685b7b96320ec6e8b2e1a1126ce02cae35865"
-SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
+SRCREV_machine ?= "29bff27700d5eaeee119c91b3a8b3540f9eff4e6"
+SRCREV_meta ?= "627191aa87d971e153f95beac4d9e45aea0e9b65"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.45"
+LINUX_VERSION ?= "5.4.46"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index b9ac34396a..0859d35ced 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.45"
+LINUX_VERSION ?= "5.4.46"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "c2765f98de328de8ac03bbc112d274c093949ad0"
-SRCREV_machine ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
+SRCREV_machine_qemuarm ?= "ef392a1fda8e56dd3f811488771d233a7374ee46"
+SRCREV_machine ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_meta ?= "627191aa87d971e153f95beac4d9e45aea0e9b65"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index ae952e0771..862ec48d82 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "25484a4f9ba2682d45c3f3bbf5497f6d7d75817d"
-SRCREV_machine_qemuarm64 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_machine_qemumips ?= "48bd1e848614da3ce48d52a1b2a15241d2a2f909"
-SRCREV_machine_qemuppc ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_machine_qemuriscv64 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_machine_qemux86 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_machine_qemux86-64 ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_machine_qemumips64 ?= "0e18185e09beb99a7b6408e9650ad5f31e8f759d"
-SRCREV_machine ?= "85c9ccdd443fe3a59511c1921b3ebc0fc396f417"
-SRCREV_meta ?= "87313d46d577412854ab491d524a94fa82af4536"
+SRCREV_machine_qemuarm ?= "db71dcd861b5d9d2c5b1a98b0cf0c67979ae8790"
+SRCREV_machine_qemuarm64 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_machine_qemumips ?= "90471d7fcb21e5955bac724d9b1cf2aa6d2e5444"
+SRCREV_machine_qemuppc ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_machine_qemuriscv64 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_machine_qemux86 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_machine_qemux86-64 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_machine_qemumips64 ?= "1b81c8b0c3a73120966d633485233382bb8f7517"
+SRCREV_machine ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
+SRCREV_meta ?= "627191aa87d971e153f95beac4d9e45aea0e9b65"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.45"
+LINUX_VERSION ?= "5.4.46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 08/25] linux-yocto/5.4: update to v5.4.47
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (6 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 07/25] linux-yocto/5.4: update to v5.4.46 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 09/25] linux-yocto/5.4: update to v5.4.49 and -rt28 Steve Sakoman
` (16 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
fd8cd8ac940c Linux 5.4.47
d96ef8fa9534 KVM: arm64: Save the host's PtrAuth keys in non-preemptible context
812857678847 KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception
85831981aa0e xen/pvcalls-back: test for errors when calling backend_connect()
29ed45653bec block/floppy: fix contended case in floppy_queue_rq()
9ec34f441ed4 mmc: sdio: Fix several potential memory leaks in mmc_sdio_init_card()
55d805ab3691 mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card()
d3c4c5a4d3d8 ARM: dts: at91: sama5d2_ptc_ek: fix sdmmc0 node description
5a05406e8c14 mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe()
1ccf2d6c5b8c mmc: tmio: Further fixup runtime PM management at remove
e9614e0c525d mmc: mmci_sdmmc: fix DMA API warning overlapping mappings
f5b13ef230dc mmc: sdhci-msm: Clear tuning done flag while hs400 tuning
bfc12ff9050b agp/intel: Reinforce the barrier after GTT updates
e81b05e535e8 perf: Add cond_resched() to task_function_call()
e0544273b70c fat: don't allow to mount if the FAT length == 0
c49a17f1f1f7 mm/slub: fix a memory leak in sysfs_slab_add()
b21602a88ef1 drm/vkms: Hold gem object while still in-use
9c09a772acb4 Smack: slab-out-of-bounds in vsscanf
b5c8896bc14f ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb
db899f242e1a ath9x: Fix stack-out-of-bounds Write in ath9k_hif_usb_rx_cb
3412e9437543 ath9k: Fix use-after-free Write in ath9k_htc_rx_msg
3eb802924486 ath9k: Fix use-after-free Read in ath9k_wmi_ctrl_rx
7f336346d001 ath9k: Fix use-after-free Read in htc_connect_service
fe0957254640 selftests/ftrace: Return unsupported if no error_log file
221b26e01d9d scsi: lpfc: Fix negation of else clause in lpfc_prep_node_fc4type
387d51f0c16f scsi: megaraid_sas: TM command refire leads to controller firmware crash
205b4c441b0e KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts
f9551b73717a KVM: arm64: Stop writing aarch32's CSSELR into ACTLR
8c8238343f0f KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits
94f4af1b73de KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data)
c6d2eb8e57b3 KVM: nVMX: Consult only the "basic" exit reason when routing nested exit
021cd99a305a KVM: nSVM: leave ASID aside in copy_vmcb_control_area
3c0bee0c0757 KVM: nSVM: fix condition for filtering async PF
64b8f33b2e1e KVM: nVMX: Skip IBPB when switching between vmcs01 and vmcs02
d181dc3667de video: fbdev: w100fb: Fix a potential double free.
dc8897b8d3b4 video: vt8500lcdfb: fix fallthrough warning
78e6964dce2a EDAC/skx: Use the mcmtr register to retrieve close_pg/bank_xor_enable
cd266f8a5b1c cpufreq: Fix up cpufreq_boost_set_sw()
943f3ae9b149 remoteproc: Fix and restore the parenting hierarchy for vdev
81fb06cb6bd4 remoteproc: Fall back to using parent memory pool if no dedicated available
12b24ba6ce56 proc: Use new_inode not new_inode_pseudo
98a3dea7e276 ovl: initialize error in ovl_copy_xattr
5650ce02d261 net/mlx5e: Fix repeated XSK usage on one channel
b05f2b60213c net/mlx5: Fix fatal error handling during device load
cd5d0278dcb1 net/mlx5: drain health workqueue in case of driver load error
57bad9e291e3 selftests/net: in rxtimestamp getopt_long needs terminating null entry
05e275d8742b dccp: Fix possible memleak in dccp_init and dccp_fini
5ab6f11621a5 crypto: virtio: Fix dest length calculation in __virtio_crypto_skcipher_do_req()
af03d5957152 crypto: virtio: Fix src/dst scatterlist calculation in __virtio_crypto_skcipher_do_req()
2ef260d686b5 crypto: virtio: Fix use-after-free in virtio_crypto_skcipher_finalize_req()
0070e73c9edc firmware: imx: scu: Fix corruption of header
a1fd068c8922 firmware: imx-scu: Support one TX and one RX
da24a76bdc81 firmware: imx: warn on unexpected RX
9a20d6c32756 x86/{mce,mm}: Unmap the entire page if the whole page is affected and poisoned
977b89e1aba0 crypto: drbg - fix error return code in drbg_alloc_state()
6ebdf342d4c7 crypto: algapi - Avoid spurious modprobe on LOADED
4a87772480aa crypto: cavium/nitrox - Fix 'nitrox_get_first_device()' when ndevlist is fully iterated
1027dc04f557 gup: document and work around "COW can break either way" issue
6ed11984edb1 PM: runtime: clk: Fix clk_pm_runtime_get() error path
fc45cd292c5e spi: bcm-qspi: when tx/rx buffer is NULL set to 0
0cd18337704f spi: bcm-qspi: Handle clock probe deferral
3bb1e6eb7c5e spi: bcm2835aux: Fix controller unregister order
496a5e5fd0e6 spi: bcm2835: Fix controller unregister order
73d9bae0a584 spi: pxa2xx: Fix runtime PM ref imbalance on probe error
1aec7b22a93f spi: pxa2xx: Fix controller unregister order
824a4e3b9acf spi: Fix controller unregister order
7753886c6dd7 spi: dw: Fix controller unregister order
ffe5ebdf81a1 nilfs2: fix null pointer dereference at nilfs_segctor_do_construct()
d4904b38ea45 lib/lzo: fix ambiguous encoding bug in lzo-rle
07ffdf0d984b arm64: acpi: fix UBSAN warning
286822392013 ACPI: PM: Avoid using power resources if there are none for D0
75d6d0ad12f3 ACPI: GED: add support for _Exx / _Lxx handler methods
040b4dcc1269 ACPI: CPPC: Fix reference count leak in acpi_cppc_processor_probe()
e4cc99efbeb9 ACPI: sysfs: Fix reference count leak in acpi_sysfs_add_hotplug_profile()
10a8c04c0b51 ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock
969c9b50fdec ALSA: usb-audio: Fix inconsistent card PM state after resume
1f5ab51e2e2f ALSA: pcm: fix snd_pcm_link() lockdep splat
4f643b8c4773 ALSA: pcm: disallow linking stream to itself
1900bf5e7fd7 ALSA: hda/realtek - add a pintbl quirk for several Lenovo machines
13c18353c985 ALSA: fireface: fix configuration error for nominal sampling transfer frequency
110d04acda5e ALSA: es1688: Add the missed snd_card_free()
f7d57ba8d7b8 watchdog: imx_sc_wdt: Fix reboot on crash
3003daa76bdf smb3: add indatalen that can be a non-zero value to calculation of credit charge in smb2 ioctl
0470d6c3276d smb3: fix incorrect number of credits when ioctl MaxOutputResponse > 64K
e1437d181d30 efi/efivars: Add missing kobject_put() in sysfs entry creation error path
ab2df991e5e2 io_uring: use kvfree() in io_sqe_buffer_register()
d4a13e671138 ASoC: max9867: fix volume controls
ac0175f9dd4d powerpc/ptdump: Properly handle non standard page size
cb810f75e98a KVM: x86: Fix APIC page invalidation race
a2b0ce3c2206 KVM: x86: respect singlestep when emulating instruction
af718119061f KVM: x86/mmu: Set mmio_value to '0' if reserved #PF can't be generated
d872f174218d perf/x86/intel: Add more available bits for OFFCORE_RESPONSE of Intel Tremont
57a537b3994e x86/reboot/quirks: Add MacBook6,1 reboot quirk
e1545848ad55 x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches.
6d60d5462a91 x86/speculation: Avoid force-disabling IBPB based on STIBP and enhanced IBRS.
9d1dcba6dd48 x86/speculation: Prevent rogue cross-process SSBD shutdown
41551b56af93 x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs
e8652fef5336 x86_64: Fix jiffies ODR violation
7ae53601458f sctp: fix refcount bug in sctp_wfree
067ef17a3f7d sctp: fix possibly using a bad saddr with a given dst
f1bb90b885cf iwlwifi: mvm: fix NVM check for 3168 devices
0315cfc6f816 ipv4: fix a RCU-list lock in fib_triestat_seq_show
7328f9a4ad58 aio: fix async fsync creds
f27ad513a474 fanotify: fix ignore mask logic for events on child and on dir
515e02bf19b3 selftests: fix flower parent qdisc
0b11ec4ae557 mm: add kvfree_sensitive() for freeing sensitive data objects
7c41d8c1bc6f perf probe: Accept the instance number of kretprobe event
a3e6ba31fc4d PCI/PM: Adjust pcie_wait_for_link_delay() for caller delay
ba95f95c27e8 KVM: x86: only do L1TF workaround on affected processors
79e378172ca3 x86/cpu/amd: Make erratum #1054 a legacy erratum
86c7d245e38d s390/pci: Log new handle in clp_disable_fh()
77db4e1d40aa padata: add separate cpuhp node for CPUHP_PADATA_DEAD
f23be4d1555d RDMA/uverbs: Make the event_queue fds return POLLERR when disassociated
3f14df580a3d smack: avoid unused 'sip' variable warning
3242fa02daf0 ath9k_htc: Silence undersized packet warnings
b06bbbc6afcd spi: dw: Fix native CS being unset
eb6315063043 powerpc/xive: Clear the page tables for the ESB IO mapping
282acc187c48 drivers/net/ibmvnic: Update VNIC protocol version reporting
f8713c2cb06e gfs2: Even more gfs2_find_jhead fixes
108681048cf7 csky: Fixup abiv2 syscall_trace break a4 & a5
16d902821bb7 Input: synaptics - add a second working PNP_ID for Lenovo T470s
53fed23f8c74 sched/fair: Don't NUMA balance for kthreads
1a28b2050334 ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook
bafaf4708a62 Input: mms114 - fix handling of mms345l
b4aa6da26135 elfnote: mark all .note sections SHF_ALLOC
f04d1e880f17 bpf: Support llvm-objcopy for vmlinux BTF
3a577e62208c vxlan: Avoid infinite loop when suppressing NS messages with invalid options
de9d1010b97c bridge: Avoid infinite loop when suppressing NS messages with invalid options
747d5bcb97eb tun: correct header offsets in napi frags mode
c8e374ee6095 net_failover: fixed rollback in net_failover_open()
5ab453bb7b29 mlxsw: core: Use different get_trend() callbacks for different thermal zones
f560ea659b33 ipv6: fix IPV6_ADDRFORM operation logic
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ea6bc1389bae6e5c28d0ee49a41ad1e3ca632d3d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 4f7b84613e..20b1586f52 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "29bff27700d5eaeee119c91b3a8b3540f9eff4e6"
-SRCREV_meta ?= "627191aa87d971e153f95beac4d9e45aea0e9b65"
+SRCREV_machine ?= "477bc652e6af1f1a21e36bb52045c78646608e22"
+SRCREV_meta ?= "8745aff15effeb7856b8dca7f8bd5a472f3173c7"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.46"
+LINUX_VERSION ?= "5.4.47"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 0859d35ced..058d7683cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.46"
+LINUX_VERSION ?= "5.4.47"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "ef392a1fda8e56dd3f811488771d233a7374ee46"
-SRCREV_machine ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_meta ?= "627191aa87d971e153f95beac4d9e45aea0e9b65"
+SRCREV_machine_qemuarm ?= "2eee5e9cb9fbd8cfd84e5b90cbb05456a30c4032"
+SRCREV_machine ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_meta ?= "8745aff15effeb7856b8dca7f8bd5a472f3173c7"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 862ec48d82..13be2acc24 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "db71dcd861b5d9d2c5b1a98b0cf0c67979ae8790"
-SRCREV_machine_qemuarm64 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_machine_qemumips ?= "90471d7fcb21e5955bac724d9b1cf2aa6d2e5444"
-SRCREV_machine_qemuppc ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_machine_qemuriscv64 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_machine_qemux86 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_machine_qemux86-64 ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_machine_qemumips64 ?= "1b81c8b0c3a73120966d633485233382bb8f7517"
-SRCREV_machine ?= "37a68a90035cd2ac28005ed4136a4d376359bd17"
-SRCREV_meta ?= "627191aa87d971e153f95beac4d9e45aea0e9b65"
+SRCREV_machine_qemuarm ?= "69a05705a437d3b0fc51518c66f93cc4db3cbd16"
+SRCREV_machine_qemuarm64 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_machine_qemumips ?= "93cc3c1275f5ef3a83610aadfcce7e8c7da7187d"
+SRCREV_machine_qemuppc ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_machine_qemuriscv64 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_machine_qemux86 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_machine_qemux86-64 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_machine_qemumips64 ?= "ed4a5ca45f3ff5aee9cb76a584e9f8db4667035d"
+SRCREV_machine ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
+SRCREV_meta ?= "8745aff15effeb7856b8dca7f8bd5a472f3173c7"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.46"
+LINUX_VERSION ?= "5.4.47"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 09/25] linux-yocto/5.4: update to v5.4.49 and -rt28
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (7 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 08/25] linux-yocto/5.4: update to v5.4.47 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 10/25] modutils-initscripts: update postinst Steve Sakoman
` (15 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating to -rt28 which has the following commits:
6b9d790392dc Linux 5.4.47-rt28
1a22749d1a0c Linux 5.4.44-rt27
7dd4c4c793df mm/zswap: Use local lock to protect per-CPU data
80552b4a4cf3 printk: Force a line break on pr_cont(" ")
446f5195e149 mm: Don't warn about atomic memory allocations during suspend
ec1f996f6740 Revert "rt: Improve the serial console PASS_LIMIT"
119ca1ac9160 fs/dcache: Include swait.h header
4df88505f123 printk: console must not schedule for drivers
b60c8a8279f5 Linux 5.4.44-rt26
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
4e9688ad3d36 Linux 5.4.49
99705220b22c net: core: device_rename: Use rwsem instead of a seqcount
e33765201db7 sched/rt, net: Use CONFIG_PREEMPTION.patch
a6030d71e62d pwm: jz4740: Enhance precision in calculation of duty cycle
d0da4be60288 net: octeon: mgmt: Repair filling of RX ring
96d98372b53a e1000e: Do not wake up the system via WOL if device wakeup is disabled
3d390370d78c kretprobe: Prevent triggering kretprobe from within kprobe_flush_task
c19f0c3c9a8a kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex
f4748ee4fa15 tracing/probe: Fix memleak in fetch_op_data operations
7bb62d0cd8ac crypto: algboss - don't wait during notifier callback
993e0d12f226 crypto: algif_skcipher - Cap recv SG list at ctx->used
972f961c5930 Revert "drm/amd/display: disable dcn20 abm feature for bring up"
021935185e2a drm/i915/icl+: Fix hotplug interrupt disabling after storm detection
d814e4732cbe drm/amd/display: Use kvfree() to free coeff in build_regamma()
50df31ea31cc drm/connector: notify userspace on hotplug after register complete
35bd59b8b68c drm/i915: Whitelist context-local timestamp in the gen9 cmdparser
962d0e0c091c drm/i915/gem: Avoid iterating an empty list
a09489576fe5 drm/msm: Check for powered down HW in the devfreq callbacks
536ffde7df46 drm/i915: Fix AUX power domain toggling across TypeC mode resets
190f6c2d6e38 s390: fix syscall_get_error for compat processes
2173a7ed6358 f2fs: avoid utf8_strncasecmp() with unstable name
de3feefa3bfd f2fs: split f2fs_d_compare() from f2fs_match_name()
9fec865dde6e net/mlx5: DR, Fix freeing in dr_create_rc_qp()
859a0a9afee3 block: nr_sects_write(): Disable preemption on seqcount write
120307746990 x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld
bba1f4ac037c drm/amd/display: Use swap() where appropriate
8f16bebbb171 drm/dp_mst: Increase ACT retry timeout to 3s
ffa9206a62d3 ext4: avoid race conditions when remounting with options that change dax
0804b23d2ff1 jbd2: clean __jbd2_journal_abort_hard() and __journal_abort_soft()
ae3c09e346bd selinux: fix double free
5471b5287cc7 drm/amdgpu: Replace invalid device ID with a valid device ID
3031fb61096c drm/qxl: Use correct notify port address when creating cursor ring
1f3f21d53fa8 drm/dp_mst: Reformat drm_dp_check_act_status() a bit
8c315a220930 ext4: avoid utf8_strncasecmp() with unstable name
779286d9babf ext4: fix partial cluster initialization when splitting extent
bc615a290faf drm: encoder_slave: fix refcouting error for modules
ef4f3b65d5a9 libata: Use per port sync for detach
81344ae52c77 arm64: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints
64183b459624 mvpp2: remove module bugfix
b3dc33946a74 block: Fix use-after-free in blkdev_get()
cb5fe511b11e scsi: ufs-bsg: Fix runtime PM imbalance on error
7c7dd0507842 bnxt_en: Return from timer if interface is not in open state.
13e6e75e68f3 afs: Fix the mapping of the UAEOVERFLOW abort code
b7420726bc8a afs: Set error flag rather than return error from file status decode
66f38da13198 afs: Always include dir in bulk status fetch from afs_do_lookup()
4fd68a35f62d afs: Fix EOF corruption
c8c19fcdabdb afs: afs_write_end() should change i_size under the right lock
6a9fd8046fbd afs: Fix non-setting of mtime when writing into mmap
7b307d292ab2 powerpc: Fix kernel crash in show_instructions() w/DEBUG_VIRTUAL
f651e94899ed bcache: fix potential deadlock problem in btree_gc_coalesce
889b69a9982b ext4: stop overwrite the errcode in ext4_setup_super
aa7baef53057 perf stat: Fix NULL pointer dereference
676634f1a831 perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events()
335d720bb4bd usb/ehci-platform: Set PM runtime as active on resume
21a45a1427dd usb: host: ehci-platform: add a quirk to avoid stuck
57a1cd87efb9 usb/xhci-plat: Set PM runtime as active on resume
33a76c15c7c2 bpf: Fix memlock accounting for sock_hash
93b675736542 iavf: fix speed reporting over virtchnl
e7847db7aa6d xdp: Fix xsk_generic_xmit errno
57f71bb57f7c nfs: set invalid blocks after NFSv4 writes
d3caf0e49492 nvme-pci: use simple suspend when a HMB is enabled
9777d12a8b23 net/filter: Permit reading NET in load_bytes_relative when MAC not set
0eb4e1573ffd x86/idt: Keep spurious entries unset in system_vectors
04ce5f6f0d3c scsi: acornscsi: Fix an error handling path in acornscsi_probe()
f3f9ee422842 libbpf: Handle GCC noreturn-turned-volatile quirk
ab482b587207 drm/sun4i: hdmi ddc clk: Fix size of m divider
c7c658ef5159 tracing/probe: Fix bpf_task_fd_query() for kprobes and uprobes
5bed77b0a2a0 bpf, sockhash: Synchronize delete from bucket list on map free
0f97842057c7 bpf/sockmap: Fix kernel panic at __tcp_bpf_recvmsg
ea8837b9435e ASoC: rt5645: Add platform-data for Asus T101HA
ebc448eb2de5 ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet
69367d9f1f0e ASoC: SOF: nocodec: conditionally set dpcm_capture/dpcm_playback flags
7b31ec2a011f ASoC: core: only convert non DPCM link to DPCM link
445a847a5507 afs: Fix memory leak in afs_put_sysnames()
3b50b29a2056 f2fs: don't return vmalloc() memory from f2fs_kmalloc()
37be9b71b748 selftests/net: in timestamping, strncpy needs to preserve null byte
a98132826820 drivers/perf: hisi: Fix wrong value for all counters enable
e1ee6238534e i2c: icy: Fix build with CONFIG_AMIGA_PCMCIA=n
ad67536d48ba NTB: ntb_test: Fix bug when counting remote files
abf918236a79 NTB: perf: Fix race condition when run with ntb_test
50a79b96b951 NTB: perf: Fix support for hardware that doesn't have port numbers
ec8490131670 NTB: perf: Don't require one more memory window than number of peers
2b97e354e586 NTB: Revert the change to use the NTB device dev for DMA allocations
e5cd9e1df0c9 NTB: ntb_tool: reading the link file should not end in a NULL byte
25abac5c9ff7 ntb_tool: pass correct struct device to dma_alloc_coherent
f167d8f7b341 ntb_perf: pass correct struct device to dma_alloc_coherent
08cc0ec9ba86 net: marvell: Fix OF_MDIO config check
fbaf0137df1e gfs2: fix use-after-free on transaction ail lists
e782a45789f8 blktrace: fix endianness for blk_log_remap()
545bafecc0f2 blktrace: fix endianness in get_pdu_int()
d578f98fa7b3 blktrace: use errno instead of bi_status
718d9a863eb3 selftests/vm/pkeys: fix alloc_random_pkey() to make it really random
7fd599522823 include/linux/bitops.h: avoid clang shift-count-overflow warnings
b7ce2e4538f6 lib/zlib: remove outdated and incorrect pre-increment optimization
62378b65237e geneve: change from tx_error to tx_dropped on missing metadata
7791ab20b8eb crypto: omap-sham - add proper load balancing support for multicore
b73df5915d13 drm/amd/display: Revalidate bandwidth before commiting DC updates
ca0cac3373fa nfsd: safer handling of corrupted c_type
e585a8b54046 pinctrl: freescale: imx: Fix an error handling path in 'imx_pinctrl_probe()'
d184d62ceb19 pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()'
bd410e6600b4 scsi: ufs: Don't update urgent bkops level when toggling auto bkops
88d678348430 scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj
08904df10d3a gfs2: Allow lock_nolock mount to specify jid=X
9adcc852d552 nfsd4: make drc_slab global, not per-net
807460787179 ceph: don't return -ESTALE if there's still an open file
145565f722c9 drm/nouveau/disp/gm200-: fix NV_PDISP_SOR_HDMI2_CTRL(n) selection
43ba1b177a49 openrisc: Fix issue with argument clobbering for clone/fork
6de31dc168f0 rxrpc: Adjust /proc/net/rxrpc/calls to display call->debug_id not user_ID
2e48a738dc15 mailbox: zynqmp-ipi: Fix NULL vs IS_ERR() check in zynqmp_ipi_mbox_probe()
2d9c7e0ff9f4 rtc: rv3028: Add missed check for devm_regmap_init_i2c()
f4fbb592d9d7 vfio/mdev: Fix reference count leak in add_mdev_supported_type
1957ac8d1b4f ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed
c75f1641ef58 extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()'
5ed5f8db9582 powerpc/4xx: Don't unmap NULL mbase
838d3e75ba50 input: i8042 - Remove special PowerPC handling
cde05d643e51 of: Fix a refcounting bug in __of_attach_node_sysfs()
f9db526da547 NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION
5e85d78ed4ff net: sunrpc: Fix off-by-one issues in 'rpc_ntop6'
ece3a3337c50 /dev/mem: Revoke mappings when a driver claims the region
3302d17ef6ea misc: xilinx-sdfec: improve get_user_pages_fast() error handling
24aa54a8b0ec clk: ast2600: Fix AHB clock divider for A1
c66e72f1721a clk: sprd: return correct type of value for _sprd_pll_recalc_rate
e5497842e253 KVM: PPC: Book3S: Fix some RCU-list locks
fd1a1089aed8 KVM: PPC: Book3S HV: Ignore kmemleak false positives
39983e188624 scsi: ufs-qcom: Fix scheduling while atomic issue
4d33659ac379 clk: bcm2835: Fix return type of bcm2835_register_gate
41324c48301d scsi: target: tcmu: Fix a use after free in tcmu_check_expired_queue_cmd()
87b3dca712b4 ASoC: fix incomplete error-handling in img_i2s_in_probe.
5578bf5ce0d8 powerpc/32s: Don't warn when mapping RO data ROX.
9669bf039ff6 mfd: stmfx: Disable IRQ in suspend to avoid spurious interrupt
d8d1b8b41783 mfd: stmfx: Fix stmfx_irq_init error path
cf90dd9fb161 mfd: stmfx: Reset chip on resume as supply was disabled
dc69fec9271a x86/apic: Make TSC deadline timer detection message visible
af92e4a595e0 RDMA/iw_cxgb4: cleanup device debugfs entries on ULD remove
4c8a62c93984 scripts: headers_install: Exit with error on config leak
c707e18796c6 usb: gadget: Fix issue with config_ep_by_speed function
84e1326ffc61 usb: gadget: fix potential double-free in m66592_probe.
51ad579d64dd usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check
4a8c5f25c6bc USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke
0a560f102d80 usb: dwc2: gadget: move gadget resume after the core is in L0 state
f1b9e29983ae watchdog: da9062: No need to ping manually before setting timeout
4820050e8438 IB/cma: Fix ports memory leak in cma_configfs
6e934217c943 PCI: amlogic: meson: Don't use FAST_LINK_MODE to set up link
443ed62ef80d PCI: dwc: Fix inner MSI IRQ domain registration
0bd8e62464e0 PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port
f04479f8d519 dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone
96cd8d249a37 powerpc/64s/pgtable: fix an undefined behaviour
a7ba81f26d70 arm64: tegra: Fix flag for 64-bit resources in 'ranges' property
17232b92cf79 arm64: tegra: Fix ethernet phy-mode for Jetson Xavier
d658c127fc41 fuse: copy_file_range should truncate cache
c9ddb8dd12e1 fuse: fix copy_file_range cache issues
ad7f78b7ce39 firmware: imx: scu: Fix possible memory leak in imx_scu_probe()
95ea51b2690e scsi: target: tcmu: Userspace must not complete queued commands
1503314a3354 RDMA/hns: Fix cmdq parameter of querying pf timer resource
d09de58d2b65 RDMA/hns: Bugfix for querying qkey
7d95cb8a4073 clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1
fddd06f7490f fpga: dfl: afu: Corrected error handling levels
7454c171a88c tty: n_gsm: Fix bogus i++ in gsm_data_kick
4f01308480c5 USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe()
0e0332473790 ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT8-A tablet
f1069001bba7 drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation
fbf719e5da12 usb/ohci-platform: Fix a warning when hibernating
8a67dae365e0 vfio-pci: Mask cap zero
f5e28a0824ec powerpc/ps3: Fix kexec shutdown hang
8f4372f4724d drivers: phy: sr-usb: do not use internal fsm for USB2 phy init
1a588c7edcd0 powerpc/pseries/ras: Fix FWNMI_VALID off by one
8240829fc38c powerpc/64s/exception: Fix machine check no-loss idle wakeup
b1bc8753eefc ipmi: use vzalloc instead of kmalloc for user creation
5c2207ba2394 habanalabs: increase timeout during reset
828b192c57e8 PCI/PM: Assume ports without DLL Link Active train links in 100 ms
c6737f3a1b01 HID: Add quirks for Trust Panora Graphic Tablet
7961800651fa ALSA: usb-audio: Add duplex sound support for USB devices using implicit feedback
860b8717f724 tty: n_gsm: Fix waking up upper tty layer when room available
3a497f97a3b6 tty: n_gsm: Fix SOF skipping
7fcc2ca6a3fb powerpc/64: Don't initialise init_task->thread.regs
c7fab8a5c3ba PCI: Fix pci_register_host_bridge() device_register() error handling
86e8dd9d249c clk: ti: composite: fix memory leak
4536dbe64bd1 USB: ohci-sm501: fix error return code in ohci_hcd_sm501_drv_probe()
c17e7243051a dlm: remove BUG() before panic()
d40e6a98aa55 pinctrl: rockchip: fix memleak in rockchip_dt_node_to_map
5248114b9bcf ASoC: ti: omap-mcbsp: Fix an error handling path in 'asoc_mcbsp_probe()'
5acfef99644c ASoC: ux500: mop500: Fix some refcounted resources issues
b0ccdd2fdd00 SoC: rsnd: add interrupt support for SSI BUSIF buffer
f34a3697a8d4 scsi: mpt3sas: Fix double free warnings
f20dfec03b82 scsi: target: loopback: Fix READ with data and sensebytes
a798daf42a35 arm64: dts: msm8996: Fix CSI IRQ types
6544b95bd789 ASoC: SOF: core: fix error return code in sof_probe_continue()
79790202d4f3 power: supply: smb347-charger: IRQSTAT_D is volatile
ad8b5b5faf9d power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()'
c1bcf01aea0e ALSA: firewire-lib: fix invalid assignment to union data for directional parameter
3201bb03c8fd scsi: qla2xxx: Fix warning after FC target reset
766c787e55ca PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges
742f8ac8edd4 PCI: rcar: Fix incorrect programming of OB windows
efb5f7b106ea drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish
33cf7944af54 serial: amba-pl011: Make sure we initialize the port.lock spinlock
32a5bc992b6c i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output
9eb54d0e8962 PCI: v3-semi: Fix a memory leak in v3_pci_probe() error handling paths
4d30daf901aa staging: sm750fb: add missing case while setting FB_VISUAL
2428682e3f6c staging: wilc1000: Increase the size of wid_list array
b14b7359535d usb: dwc3: gadget: Properly handle failed kick_transfer
1bfa09147282 usb: dwc3: gadget: Properly handle ClearFeature(halt)
e320bb0e01db HID: intel-ish-hid: avoid bogus uninitialized-variable warning
cbec16266a35 soundwire: slave: don't init debugfs on device registration error
a45fc52449d7 ASoC: max98373: reorder max98373_reset() in resume
7377ba16b542 clk: meson: meson8b: Don't rely on u-boot to init all GP_PLL registers
ea78361174c4 thermal/drivers/ti-soc-thermal: Avoid dereferencing ERR_PTR
3296e566b0d2 gpio: pca953x: fix handling of automatic address incrementing
dd47c98992d6 clk: meson: meson8b: Fix the vclk_div{1, 2, 4, 6, 12}_en gate bits
ecb9a8068ba5 clk: meson: meson8b: Fix the polarity of the RESET_N lines
1fa1d1ceb02f clk: meson: meson8b: Fix the first parent of vid_pll_in_sel
9a624802e628 slimbus: ngd: get drvdata from correct device
793e15fb6681 tty: hvc: Fix data abort due to race in hvc_open
eb3e85b3375d s390/qdio: put thinint indicator after early error
d7852661f9fd ALSA: usb-audio: Fix racy list management in output queue
aba41867dd66 ALSA: usb-audio: Improve frames size computation
3468bca1ea44 staging: gasket: Fix mapping refcnt leak when register/store fails
b3b4dcdc2bb4 staging: gasket: Fix mapping refcnt leak when put attribute fails
0c884f3236f3 firmware: qcom_scm: fix bogous abuse of dma-direct internals
0c48b6df64c0 arm64: dts: qcom: fix pm8150 gpio interrupts
2b5e027657d4 virtiofs: schedule blocking async replies in separate worker
ff86bd6cca2e pinctrl: rza1: Fix wrong array assignment of rza1l_swio_entries
cd3f4ed1c567 scsi: qedf: Fix crash when MFW calls for protocol stats while function is still probing
a0a00156d50e gpio: dwapb: Append MODULE_ALIAS for platform driver
02416142fdf4 RDMA/mlx5: Fix udata response upon SRQ creation
7acbadd1aa29 ARM: dts: sun8i-h2-plus-bananapi-m2-zero: Fix led polarity
ef0c0fbf1d4a arm64: dts: qcom: msm8916: remove unit name for thermal trip points
f37623862ec5 scsi: qedi: Do not flush offload work if ARP not resolved
0e5d7bff3b06 arm64: dts: mt8173: fix unit name warnings
7bf3a213f79e staging: greybus: fix a missing-check bug in gb_lights_light_config()
c970dcc085b8 x86/purgatory: Disable various profiling and sanitizing options
a78c65cb4b67 apparmor: fix nnp subset test for unconfined
af1f72ad18bb scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM
08d2ea2e236a scsi: sr: Fix sr_probe() missing deallocate of device minor
8f73ac0b6434 bpf, sockhash: Fix memory leak when unlinking sockets in sock_hash_free
efdb1bf81aab ASoC: meson: add missing free_irq() in error path
390f1688fb46 f2fs: handle readonly filesystem in f2fs_ioc_shutdown()
039a79ef0b1e apparmor: check/put label on apparmor_sk_clone_security()
2a9b3e4667f5 net: dsa: lantiq_gswip: fix and improve the unsupported interface error
88bc3e060390 apparmor: fix introspection of of task mode for unconfined tasks
d782d6a142d5 mksysmap: Fix the mismatch of '.L' symbols in System.map
d0af43b47418 NTB: Fix the default port and peer numbers for legacy drivers
f0b8eead5b1c NTB: ntb_pingpong: Choose doorbells based on port number
0ec407dfc1ec yam: fix possible memory leak in yam_init_driver
a4d4b8437731 sparc32: mm: Don't try to free page-table pages if ctor() fails
7f16ba366a66 pwm: img: Call pm_runtime_put() in pm_runtime_get_sync() failed case
9b163c91620c powerpc/crashkernel: Take "mem=" option into account
211836827af3 ASoC: qcom: q6asm-dai: kCFI fix
117929a41db1 cifs: set up next DFS target before generic_ip_connect()
c0c8c8b10567 RDMA/core: Fix several reference count leaks.
3851967ff567 PCI: vmd: Filter resource type bits from shadow register
e8cac2e3067e nfsd: Fix svc_xprt refcnt leak when setup callback client failed
db686568ae52 powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run
ecb9c4d344c9 IB/mlx5: Fix DEVX support for MLX5_CMD_OP_INIT2INIT_QP command
a2fe8d88aeff clk: clk-flexgen: fix clock-critical handling
6a70c943a26f scsi: vhost: Notify TCM about the maximum sg entries supported per command
296cec70500b scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event
82ac4863030c clk: zynqmp: fix memory leak in zynqmp_register_clocks
bee9cc351308 scsi: cxgb3i: Fix some leaks in init_act_open()
4deddbf7db45 mfd: wm8994: Fix driver operation if loaded as modules
8e52a1eef19b powerpc/ptdump: Add _PAGE_COHERENT flag
805bae7592fa usb: gadget: core: sync interrupt before unbind the udc
2ec338547c67 gpio: dwapb: Call acpi_gpiochip_free_interrupts() on GPIO chip de-registration
02bdd581404d m68k/PCI: Fix a memory leak in an error handling path
ec475f960e92 PCI: pci-bridge-emul: Fix PCIe bit conflicts
ba5192db9672 scsi: hisi_sas: Do not reset phy timer to wait for stray phy up
2b670bbfd8c0 RDMA/mlx5: Add init2init as a modify command
cbd55ce91abf coresight: tmc: Fix TMC mode read in tmc_read_prepare_etb()
c74ead459747 vfio/pci: fix memory leaks in alloc_perm_bits()
24911d387b84 arm64: dts: fvp/juno: Fix node address fields
6d79ba8094fa ps3disk: use the default segment boundary
bc881cd5334c PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register
492c50fe65a9 arm64: dts: fvp: Fix GIC child nodes
376ef9d7ee4c ASoC: SOF: Do nothing when DSP PM callbacks are not set
1cdae7bb4221 clk: renesas: cpg-mssr: Fix STBCR suspend/resume handling
14c5e25d3b00 pinctrl: ocelot: Fix GPIO interrupt decoding on Jaguar2
4e55b843fa61 arm64: dts: juno: Fix GIC child nodes
7df82e1754df arm64: dts: armada-3720-turris-mox: fix SFP binding
4ca96a5de812 arm64: dts: armada-3720-turris-mox: forbid SDR104 on SDIO for FCC purposes
a86306dbefc3 dm mpath: switch paths in dm_blk_ioctl() code path
08f396eb02c8 misc: fastrpc: fix potential fastrpc_invoke_ctx leak
8d8991bb2bf0 misc: fastrpc: Fix an incomplete memory release in fastrpc_rpmsg_probe()
c2ff1fcc2530 serial: 8250: Fix max baud limit in generic 8250 port
9e6a9201b78b usblp: poison URBs upon disconnect
cc9024f69ba7 clk: samsung: Mark top ISP and CAM clocks on Exynos542x as critical
2b5e61da68e8 remoteproc: qcom_q6v5_mss: map/unmap mpss segments before/after use
8a44731af689 i2c: pxa: clear all master action bits in i2c_pxa_stop_message()
ceb63ec0ef6e f2fs: report delalloc reserve as non-free in statfs for project quota
ca90f67ece5c iio: bmp280: fix compensation of humidity
30bd1f36b6eb rtc: mc13xxx: fix a double-unlock issue
91fce7922a75 powerpc/kasan: Fix stack overflow by increasing THREAD_SHIFT
a6a0317bf9c2 Input: edt-ft5x06 - fix get_default register write access
70a2296d4bab scsi: qla2xxx: Fix issue with adapter's stopping state
5800b7f7d231 PCI: Allow pci_resize_resource() for devices on root bus
956a2e737a2c ALSA: isa/wavefront: prevent out of bounds write in ioctl
23337efa940c ALSA: hda/realtek - Introduce polarity for micmute LED GPIO
66a177ae4ed0 arm64: dts: meson: fixup SCP sram nodes
7631dc491a3f scsi: qedi: Check for buffer overflow in qedi_set_path()
545b86efa0d0 scsi: core: free sgtables in case command setup fails
bde2d5d443c4 ARM: dts: stm32: Add missing ethernet PHY reset on AV96
38ede4d7736e ARM: integrator: Add some Kconfig selections
a1359b9fdd8d ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type
8908c555e06e ARM: dts: renesas: Fix IOMMU device node names
2c40fc80331b backlight: lp855x: Ensure regulators are disabled on probe failure
53057bd4ac84 ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet
b543c3595188 clk: qcom: msm8916: Fix the address location of pll->config_reg
7906a075c900 remoteproc: Fix IDR initialisation in rproc_alloc()
8bd207bb1a25 iio: pressure: bmp280: Tolerate IRQ before registering
2e714a547ef8 ASoC: SOF: imx8: Fix randbuild error
dc570a1fb48c i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets
30e82a3edd94 ASoC: tegra: tegra_wm8903: Support nvidia, headset property
7b139b714a5d clk: sunxi: Fix incorrect usage of round_down()
8aa822a1305c power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select
67cb016870e2 Linux 5.4.48
8e38ea68da06 perf symbols: Fix kernel maps for kcore and eBPF
807cc607f129 perf symbols: Fix debuginfo search for Ubuntu
842645de05d5 perf probe: Check address correctness by map instead of _etext
be781abe3ae8 perf probe: Fix to check blacklist address correctly
a2e097910334 perf probe: Do not show the skipped events
9660edf6729d f2fs: fix checkpoint=disable:%u%%
1866b1493e2e w1: omap-hdq: cleanup to add missing newline for some dev_dbg
2140d7d5d878 mtd: rawnand: tmio: Fix the probe error path
ec851b26a3e5 mtd: rawnand: mtk: Fix the probe error path
b5404756b54f mtd: rawnand: pasemi: Fix the probe error path
44a9bf52ef80 mtd: rawnand: plat_nand: Fix the probe error path
ab702f81e978 mtd: rawnand: sunxi: Fix the probe error path
2d77d5575e09 mtd: rawnand: oxnas: Fix the probe error path
2d6b0901b834 mtd: rawnand: socrates: Fix the probe error path
3a54e242870b mtd: rawnand: orion: Fix the probe error path
0b19623af5a6 mtd: rawnand: xway: Fix the probe error path
ae7cf595e15b mtd: rawnand: ingenic: Fix the probe error path
38abdd9bf77c mtd: rawnand: sharpsl: Fix the probe error path
8d695fbaa5cb mtd: rawnand: diskonchip: Fix the probe error path
1260c45ac55b mtd: rawnand: brcmnand: fix hamming oob layout
ba4ffbb5592d mtd: rawnand: onfi: Fix redundancy detection check
869a782420da mtd: rawnand: Fix nand_gpio_waitrdy()
e5084eadf193 sunrpc: clean up properly in gss_mech_unregister()
4a68a2e25e20 sunrpc: svcauth_gss_register_pseudoflavor must reject duplicate registrations.
e4f7a7260737 kbuild: force to build vmlinux if CONFIG_MODVERSION=y
1b0d830e0ce0 powerpc/64s: Save FSCR to init_task.thread.fscr after feature init
b3b357d83079 powerpc/64s: Don't let DT CPU features set FSCR_DSCR
1d9a4422c9ac powerpc/32: Disable KASAN with pages bigger than 16k
4719cb8a16af powerpc/kasan: Fix shadow pages allocation failure
002d22c4945a powerpc/kasan: Fix issues by lowering KASAN_SHADOW_END
23e07a77aa7c powerpc/32s: Fix another build failure with CONFIG_PPC_KUAP_DEBUG
c6077abc067f drivers/macintosh: Fix memleak in windfarm_pm112 driver
1d5144d7dc5d ARM: dts: s5pv210: Set keep-power-in-suspend for SDHCI1 on Aries
727111d44a59 ARM: dts: at91: sama5d2_ptc_ek: fix vbus pin
1bfcafbb4d1e ARM: dts: exynos: Fix GPIO polarity for thr GalaxyS3 CM36651 sensor's bus
8c7ca9ab5abc soc/tegra: pmc: Select GENERIC_PINCONF
be20b99a86b3 ARM: tegra: Correct PL310 Auxiliary Control Register initialization
b5d2f71b98b7 kernel/cpu_pm: Fix uninitted local in cpu_pm
6d9cc26aa164 powerpc/fadump: Account for memory_limit while reserving memory
6fd930da24e1 powerpc/fadump: consider reserved ranges while reserving memory
3e9211d98803 powerpc/fadump: use static allocation for reserved memory ranges
c81e34c4346f alpha: fix memory barriers so that they conform to the specification
5018a0bd0964 dm crypt: avoid truncating the logical block size
ee6fa4903f84 sparc64: fix misuses of access_process_vm() in genregs32_[sg]et()
0dcbc7d6cd2d sparc32: fix register window handling in genregs32_[gs]et()
f2f18147c7db gnss: sirf: fix error return code in sirf_probe()
e75e551606f4 pinctrl: samsung: Save/restore eint_mask over suspend for EINT_TYPE GPIOs
407933bbb385 pinctrl: samsung: Correct setting of eint wakeup mask on s5pv210
8b28e5c35d32 power: supply: core: fix memory leak in HWMON error path
6050811edffb power: supply: core: fix HWMON temperature labels
0fd525d817ea power: vexpress: add suppress_bind_attrs to true
7c71b9aa18a0 EDAC/amd64: Add AMD family 17h model 60h PCI IDs
67712fa4a662 hwmon: (k10temp) Add AMD family 17h model 60h PCI match
3046b09d45ec igb: Report speed and duplex as unknown when device is runtime suspended
e6f91166fc37 clk: mediatek: assign the initial value to clk_init_data of mtk_mux
adecd49745f8 media: ov5640: fix use of destroyed mutex
3ef00d99199d b43_legacy: Fix connection problem with WPA3
b74d369d2962 b43: Fix connection problem with WPA3
5c039a9921b3 b43legacy: Fix case where channel status is corrupted
eeb0cf8bb68e Bluetooth: hci_bcm: fix freeing not-requested IRQ
4c79dd14c15d serial: 8250: Avoid error message on reprobe
80462f7c296d media: cedrus: Program output format during each run
6e688a315acf media: go7007: fix a miss of snd_card_free
bda6ebf290fa carl9170: remove P2P_GO support
cedbd8709cc1 e1000e: Relax condition to trigger reset for ME workaround
0fedb80811f4 e1000e: Disable TSO for buffer overrun workaround
f4cc36066a31 PCI: Program MPS for RCiEP devices
e131e70e2144 ima: Set again build_ima_appraise variable
2600136eaee9 ima: Remove redundant policy rule set in add_rules()
70ce85319d45 x86/amd_nb: Add AMD family 17h model 60h PCI IDs
44eec92cc4bf serial: 8250_pci: Move Pericom IDs to pci_ids.h
3c8938fb19ed PCI: Add Loongson vendor ID
9cfece5c0e2b x86/amd_nb: Add Family 19h PCI IDs
b35415c0949a PCI: vmd: Add device id for VMD device 8086:9A0B
3179b408c401 PCI: Add ACS quirk for Intel Root Complex Integrated Endpoints
0e4528cdbaf0 PCI: Avoid FLR for AMD Starship USB 3.0
cb5ac1a32552 PCI: Avoid FLR for AMD Matisse HD Audio & USB 3.0
c41d7ca0061e PCI: Avoid Pericom USB controller OHCI/EHCI PME# defect
fd8abb78b129 ext4: fix race between ext4_sync_parent() and rename()
c316ebcf9f4b ext4: fix error pointer dereference
319b553695ec ext4: fix EXT_MAX_EXTENT/INDEX to check for zeroed eh_max
6de50456fe17 evm: Fix possible memory leak in evm_calc_hmac_or_hash()
ce7f038f859d ima: Remove __init annotation from ima_pcrread()
f387759c2d67 ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()
64712383a186 ima: Directly assign the ima_default_policy pointer to ima_rules
4ce29d9b1941 ima: Evaluate error in init_ima()
5f7272bd228c ima: Switch to ima_hash_algo for boot aggregate
0698eacdfc4f ima: Fix ima digest hash table key calculation
13ae9eaae0cc mm: call cond_resched() from deferred_init_memmap()
5386d93bc5b6 mm/pagealloc.c: call touch_nmi_watchdog() on max order boundaries in deferred init
c388f173ed8a mm: initialize deferred pages with interrupts enabled
a88d8aaf9b8b mm: thp: make the THP mapcount atomic against __split_huge_pmd_locked()
e418045e25a9 powerpc/mm: Fix conditions to perform MMU specific management by blocks on PPC32.
0ccfd7a531e8 btrfs: fix space_info bytes_may_use underflow during space cache writeout
248cdf728895 btrfs: fix space_info bytes_may_use underflow after nocow buffered write
8076bdd4fe00 btrfs: fix wrong file range cleanup after an error filling dealloc range
c2c69ecb605f btrfs: fix error handling when submitting direct I/O bio
05c5e98bf402 btrfs: force chunk allocation if our global rsv is larger than metadata
f63545770fc4 btrfs: send: emit file capabilities after chown
20f260ed536a btrfs: include non-missing as a qualifier for the latest_bdev
fd9720b8e957 btrfs: free alien device after device add
b008ae4cc74d string.h: fix incompatibility between FORTIFY_SOURCE and KASAN
d6c2b4d246c5 kasan: stop tests being eliminated as dead code with FORTIFY_SOURCE
c48a842d8ce7 selftests/bpf, flow_dissector: Close TAP device FD after the test
e7b1564a24e6 bpf: Fix running sk_skb program types with ktls
d9cd7b83942f bpf: Refactor sockmap redirect code so its easy to reuse
215a256bc8dd bpf: Fix map permissions check
0d55b7032ad1 libbpf: Fix perf_buffer__free() API for sparse allocs
98545815cfcf platform/x86: asus_wmi: Reserve more space for struct bias_args
4383a5dfbdc5 platform/x86: intel-vbtn: Only blacklist SW_TABLET_MODE on the 9 / "Laptop" chasis-type
5f3cba4bc241 platform/x86: intel-hid: Add a quirk to support HP Spectre X2 (2015)
176396ad0594 platform/x86: hp-wmi: Convert simple_strtoul() to kstrtou32()
b77412359c1e cpuidle: Fix three reference count leaks
cf3359869819 spi: dw: Return any value retrieved from the dma_transfer callback
2c95fc879a2f mmc: sdhci-esdhc-imx: fix the mask for tuning start point
7fe3a1c29869 iwlwifi: mvm: fix aux station leak
ffa118a164e6 ixgbe: fix signed-integer-overflow warning
99ea968e3766 ice: fix potential double free in probe unrolling
62b2fbb9c463 mmc: via-sdmmc: Respect the cmd->busy_timeout from the mmc core
3d6143663f21 staging: greybus: sdio: Respect the cmd->busy_timeout from the mmc core
8a7c5b83f846 mmc: sdhci-msm: Set SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 quirk
62e7e4f5976c bcache: fix refcount underflow in bcache_device_free()
d55960f7f6b7 MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe()
3f6482c0a486 PCI: Don't disable decoding when mmio_always_on is set
fa99a4b3fb12 macvlan: Skip loopback packets in RX handler
c6f1f12a8c3d btrfs: qgroup: mark qgroup inconsistent if we're inherting snapshot to a new qgroup
1e42a1857bcf btrfs: improve global reserve stealing logic
590aad883521 m68k: mac: Don't call via_flush_cache() on Mac IIfx
ce066ce05e1b MIPS: tools: Fix resource leak in elf-entry.c
87ef5086a3c2 x86/mm: Stop printing BRK addresses
41b44325c9eb selftests/bpf: CONFIG_IPV6_SEG6_BPF required for test_seg6_loop.o
5b8d09eeb4a6 drm/amdgpu: Sync with VM root BO when switching VM to CPU update mode
b06a7dc9e5f6 drm/amd/powerpay: Disable gfxoff when setting manual mode on picasso and raven
188e3e6ed902 crypto: stm32/crc32 - fix multi-instance
d879598b8dae crypto: stm32/crc32 - fix run-time self test issue.
8fe61a2027db crypto: stm32/crc32 - fix ext4 chksum BUG_ON()
c79c643fca61 mips: Add udelay lpj numbers adjustment
34a45e84edc5 mips: MAAR: Use more precise address mask
9fa3b0bd9914 sched: Defend cfs and rt bandwidth quota against overflow
fecf17b609a7 x86/boot: Correct relocation destination on old linkers
7b3423eff20e kgdboc: Use a platform device to handle tty drivers showing up late
39d7ce336ec5 mwifiex: Fix memory corruption in dump_station
65f1c3e4e906 rtlwifi: Fix a double free in _rtl_usb_tx_urb_setup()
916f41e40643 net/mlx5e: IPoIB, Drop multicast packets that this interface sent
fa408bbe1007 veth: Adjust hard_start offset on redirect XDP frames
894d9cd52466 iocost: don't let vrate run wild while there's no saturation signal
7f5d77570b0c raid5: remove gfp flags from scribble_alloc()
cd4013947eae md: don't flush workqueue unconditionally in md_open
5deaa24167a6 mt76: avoid rx reorder buffer overflow
095e7a6a326c drm/mcde: dsi: Fix return value check in mcde_dsi_bind()
727093f432d1 net: qed*: Reduce RX and TX default ring count when running inside kdump kernel
5099a9c22dbf wcn36xx: Fix error handling path in 'wcn36xx_probe()'
dbf2fab3f540 ath10k: Remove msdu from idr when management pkt send fails
671d8b8726a1 nvme-tcp: use bh_lock in data_ready
a09fc96a3d54 nvme-pci: align io queue count with allocted nvme_queue in nvme_probe
be7f2672c341 nvme: refine the Qemu Identify CNS quirk
66ea23154df0 iwlwifi: avoid debug max amsdu config overwriting itself
287a0f7a3393 platform/x86: intel-vbtn: Also handle tablet-mode switch on "Detachable" and "Portable" chassis-types
708e0175edf5 platform/x86: intel-vbtn: Do not advertise switches to userspace if they are not there
0ac5741007f1 platform/x86: intel-vbtn: Split keymap into buttons and switches parts
4a091f1d273f platform/x86: intel-vbtn: Use acpi_evaluate_integer()
b04c79255e8d xfs: fix duplicate verification from xfs_qm_dqflush()
f69806af2a2f xfs: reset buffer write failure state on successful completion
4f1a132115ef kgdb: Fix spurious true from in_dbg_master()
fe99bb25c452 mips: cm: Fix an invalid error code of INTVN_*_ERR
7bf491d01ea7 MIPS: Truncate link address into 32bit for 32bit kernel
ec19b7a525aa Crypto/chcr: fix for ccm(aes) failed test
984fc5f4e3b4 xfs: clean up the error handling in xfs_swap_extents
0eeea4b8f0a9 libertas_tf: avoid a null dereference in pointer priv
964de53149ab powerpc/spufs: fix copy_to_user while atomic
dc091fc86216 net: allwinner: Fix use correct return type for ndo_start_xmit()
8ca0e780b4e8 media: cec: silence shift wrapping warning in __cec_s_log_addrs()
4f6762503fa2 drivers: net: davinci_mdio: fix potential NULL dereference in davinci_mdio_probe()
b2083327ea3c selinux: fix error return code in policydb_read()
86dced2417b7 net: lpc-enet: fix error return code in lpc_mii_init()
7b88ccc137fb iocost_monitor: drop string wrap around numbers when outputting json
5934e2270901 drivers/perf: hisi: Fix typo in events attribute array
f7757368e0f0 sched/core: Fix illegal RCU from offline CPUs
2e256dd5b055 exit: Move preemption fixup up, move blocking operations down
338ff29604d9 lib/mpi: Fix 64-bit MIPS build with Clang
4fbc334749e7 net: bcmgenet: Fix WoL with password after deep sleep
d7b1ca9eebdf net: bcmgenet: set Rx mode before starting netif
1dbb13ceedac selftests/bpf: Fix memory leak in extract_build_id()
58ee4d253753 netfilter: nft_nat: return EOPNOTSUPP if type or flags are not supported
d1a00c9bb1c7 dpaa2-eth: fix return codes used in ndo_setup_tc
04ab099d1eb0 Drivers: hv: vmbus: Always handle the VMBus messages on CPU0
51d2957b21b5 audit: fix a net reference leak in audit_list_rules_send()
5b737a0ae101 Bluetooth: btbcm: Add 2 missing models to subver tables
c5edfe811b4a ath10k: add flush tx packets for SDIO chip
cc66b6bb3241 MIPS: Make sparse_init() using top-down allocation
c3bc42b70ed1 media: platform: fcp: Set appropriate DMA parameters
79d622a81322 media: dvb: return -EREMOTEIO on i2c transfer failure.
189ca174b87d audit: fix a net reference leak in audit_send_reply()
6315839f14b9 drm/mediatek: set dpi pin mode to gpio low to avoid leakage current
878ca9ebf1a0 dt-bindings: display: mediatek: control dpi pins mode to avoid leakage
4f8c52320202 e1000: Distribute switch variables for initialization
0bf9805dfdae tools api fs: Make xxx__mountpoint() more scalable
a17cc8a6abab regulator: qcom-rpmh: Fix typos in pm8150 and pm8150l
22a734616824 brcmfmac: fix wrong location to get firmware feature
90e5154c737c spi: Respect DataBitLength field of SpiSerialBusV2() ACPI resource
42c22e4834c2 media: staging/intel-ipu3: Implement lock for stream on/off operations
bfc0ee2b31f8 ath10k: fix kernel null pointer dereference
76ecfcfefe3b staging: android: ion: use vmap instead of vm_map_ram
3ec7b42f1747 x86: fix vmap arguments in map_irq_stack
ece6218eea3a net: vmxnet3: fix possible buffer overflow caused by bad DMA value in vmxnet3_get_rss()
af510d6fd690 x86/kvm/hyper-v: Explicitly align hcall param for kvm_hyperv_exit
bd18ecbbc7aa spi: dw: Fix Rx-only DMA transfers
999b59be5d20 Bluetooth: btmtkuart: Improve exception handling in btmtuart_probe()
2daf747c2831 mmc: meson-mx-sdio: trigger a soft reset after a timeout or CRC error
804664580662 ice: Fix for memory leaks and modify ICE_FREE_CQ_BUFS
f9b545956421 ice: Fix memory leak
f503e7fe3099 batman-adv: Revert "disable ethtool link speed detection when auto negotiation off"
8cf93ef213f9 ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE
2a005026102e btrfs: do not ignore error from btrfs_next_leaf() when inserting checksums
3bb51c966b9f btrfs: account for trans_block_rsv in may_commit_transaction
cb0ee3f03f0b media: dvbdev: Fix tuner->demod media controller link
bffe2c8e2303 clocksource: dw_apb_timer_of: Fix missing clockevent timers
7bd656984566 clocksource: dw_apb_timer: Make CPU-affiliation being optional
e8ec0ae0f3cf spi: dw: Enable interrupts in accordance with DMA xfer mode
a2683765887d mips: Fix cpu_has_mips64r1/2 activation for MIPS32 CPUs
b1d2d3dd016f ACPI/IORT: Fix PMCG node single ID mapping handling
c2ad0dc7b9e0 pmu/smmuv3: Clear IRQ affinity hint on device removal
308c2095da30 kgdb: Prevent infinite recursive entries to the debugger
1343e0a85941 kgdb: Disable WARN_CONSOLE_UNLOCKED for all kgdb
5c79bf440d35 Bluetooth: Add SCO fallback for invalid LMP parameters error
461b239e3a73 MIPS: Loongson: Build ATI Radeon GPU driver as module
544a3a292d8e platform/x86: dell-laptop: don't register micmute LED if there is no token
ece1e470af13 ixgbe: Fix XDP redirect on archs with PAGE_SIZE above 4K
6eec65c9e283 lockdown: Allow unprivileged users to see lockdown status
00f73938ef65 drm: rcar-du: Set primary plane zpos immutably at initializing
e7aefaba39d2 block: reset mapping if failed to update hardware queue count
b432540123f5 arm64: insn: Fix two bugs in encoding 32-bit logical immediates
201219691a9a block: alloc map and request for new hardware queue
fec6f8c0b221 ACPICA: Dispatcher: add status checks
c916af516d82 spi: dw: Zero DMA Tx and Rx configurations on stack
92fb6909b058 rtw88: fix an issue about leak system resources
bd7662d6036e media: staging: ipu3: Fix stale list entries on parameter queue failure
9a0c99419125 arm64: cacheflush: Fix KGDB trap detection
12d4dac2be77 ath10k: remove the max_sched_scan_reqs value
c573a13f72fb efi/libstub/x86: Work around LLVM ELF quirk build regression
fa15b59b1ea2 net: ena: fix error returning in ena_com_get_hash_function()
84c8498320d2 net: atlantic: make hw_get_regs optional
9f664eda61a0 sched/fair: Refill bandwidth before scaling
91517e951830 x86,smap: Fix smap_{save,restore}() alternatives
6fc5d5834b37 spi: pxa2xx: Apply CS clk quirk to BXT
269e7b43f2b4 libbpf: Fix memory leak and possible double-free in hashmap__clear
072d23eef600 arm64/kernel: Fix range on invalidating dcache for boot page tables
614722f1ffd2 drm/amdgpu: Init data to avoid oops while reading pp_num_states.
d2a244e74808 spi: spi-mem: Fix Dual/Quad modes on Octal-capable devices
07d45406db69 objtool: Ignore empty alternatives
1121685ca1bd media: si2157: Better check for running tuner in init
18b2a6f250cc media: vicodec: Fix error codes in probe function
f9f8f0c24203 crypto: ccp -- don't "select" CONFIG_DMADEVICES
68aeaeac683b media: imx: imx7-mipi-csis: Cleanup and fix subdev pad format handling
ff41c7b3c7db media: staging: imgu: do not hold spinlock during freeing mmu page table
22710f6c35a3 drm: bridge: adv7511: Extend list of audio sample rates
30c5d951a557 ath10k: Fix the race condition in firmware dump work queue
6fc5719b85ec drm/amdgpu: fix and cleanup amdgpu_gem_object_close v4
f3ec5b536fc1 ACPI: GED: use correct trigger type field in _Exx / _Lxx handling
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0ebb9d1d1f02ec4c567d56c18103df388e75e3ba)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 20b1586f52..e5401587d6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "477bc652e6af1f1a21e36bb52045c78646608e22"
-SRCREV_meta ?= "8745aff15effeb7856b8dca7f8bd5a472f3173c7"
+SRCREV_machine ?= "f611b456c071c5898e3762a190b71e3a51b0ad65"
+SRCREV_meta ?= "30814016b37dc93699992221763ad4e2960b02fa"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.47"
+LINUX_VERSION ?= "5.4.49"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 058d7683cf..fb2d37405d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.47"
+LINUX_VERSION ?= "5.4.49"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "2eee5e9cb9fbd8cfd84e5b90cbb05456a30c4032"
-SRCREV_machine ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_meta ?= "8745aff15effeb7856b8dca7f8bd5a472f3173c7"
+SRCREV_machine_qemuarm ?= "ddf262a3be1304a97d62bb8f60a0c0ae2b41fdc9"
+SRCREV_machine ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_meta ?= "30814016b37dc93699992221763ad4e2960b02fa"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 13be2acc24..fc8c442ef1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "69a05705a437d3b0fc51518c66f93cc4db3cbd16"
-SRCREV_machine_qemuarm64 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_machine_qemumips ?= "93cc3c1275f5ef3a83610aadfcce7e8c7da7187d"
-SRCREV_machine_qemuppc ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_machine_qemuriscv64 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_machine_qemux86 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_machine_qemux86-64 ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_machine_qemumips64 ?= "ed4a5ca45f3ff5aee9cb76a584e9f8db4667035d"
-SRCREV_machine ?= "403891379b317f9f12e3cee8aa1622a6d74d7b0c"
-SRCREV_meta ?= "8745aff15effeb7856b8dca7f8bd5a472f3173c7"
+SRCREV_machine_qemuarm ?= "93677fbb328db35b696740a0c34e05036e75f1b7"
+SRCREV_machine_qemuarm64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_machine_qemumips ?= "c2068f8b670dce4a8d409981a8993df12b993fd3"
+SRCREV_machine_qemuppc ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_machine_qemuriscv64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_machine_qemux86 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_machine_qemux86-64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_machine_qemumips64 ?= "4c723a6a9eb908e34d228c5a478af237d9baabf8"
+SRCREV_machine ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
+SRCREV_meta ?= "30814016b37dc93699992221763ad4e2960b02fa"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.47"
+LINUX_VERSION ?= "5.4.49"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 10/25] modutils-initscripts: update postinst
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (8 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 09/25] linux-yocto/5.4: update to v5.4.49 and -rt28 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 11/25] initscripts: " Steve Sakoman
` (14 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
in container image, it don't have init system,
install package modutils-initscripts will report error:
+ systemctl mask modutils.service
/var/tmp/rpm-tmp.DYK3Pm: line 8: systemctl: command not found
%post(modutils-initscripts-1.0-r7.3.cortexa72): waitpid(823) rc 823 status 7f00
warning: %post(modutils-initscripts-1.0-r7.3.cortexa72) scriptlet failed, exit status 127
fix by use same way as systemd.bbclass to decide if systemctl mask will run
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit eec648f23df0a4e05130f8ef5a04902296567e38)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../recipes-kernel/modutils-initscripts/modutils-initscripts.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index 0f3df5577b..881b7db92e 100644
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
@@ -24,7 +24,7 @@ do_install () {
PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
pkg_postinst_${PN} () {
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if type systemctl >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then
OPTS="--root=$D"
fi
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 11/25] initscripts: update postinst
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (9 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 10/25] modutils-initscripts: update postinst Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 12/25] common-licenses: fix filename of BSD-2-Clause-Patent Steve Sakoman
` (13 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
in container image, it don't have init system,
install package initscripts will report error:
systemctl: command not found
fix by use same way as systemd.bbclass to decide if systemctl
mask will run
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 790276bde066ecc9876120c3097dcd57a9936f00)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1a59b82fbf..f98e42eb2e 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -169,7 +169,7 @@ MASKED_SCRIPTS = " \
urandom"
pkg_postinst_${PN} () {
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if type systemctl >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then
OPTS="--root=$D"
fi
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 12/25] common-licenses: fix filename of BSD-2-Clause-Patent
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (10 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 11/25] initscripts: " Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 13/25] python3-libarchive-c: add the missing rdepends Steve Sakoman
` (12 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4a9c62d49940b154177d817a845188d827370607)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{BSD-2-Clause-Patent.txt => BSD-2-Clause-Patent} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/files/common-licenses/{BSD-2-Clause-Patent.txt => BSD-2-Clause-Patent} (100%)
diff --git a/meta/files/common-licenses/BSD-2-Clause-Patent.txt b/meta/files/common-licenses/BSD-2-Clause-Patent
similarity index 100%
rename from meta/files/common-licenses/BSD-2-Clause-Patent.txt
rename to meta/files/common-licenses/BSD-2-Clause-Patent
--
2.17.1
^ permalink raw reply [flat|nested] 40+ messages in thread* [OE-core][dunfell 13/25] python3-libarchive-c: add the missing rdepends
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (11 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 12/25] common-licenses: fix filename of BSD-2-Clause-Patent Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 14/25] classes/archiver: run do_unpack_and_patch after do_preconfigure Steve Sakoman
` (11 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
Add the missing rdepends to fix below error:
# python3
[snip]
>>> import libarchive
[snip]
ModuleNotFoundError: No module named 'ctypes'
ModuleNotFoundError: No module named 'mmap'
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b3a2615878bc7515a7bdace525dc27be45f158e2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/python/python3-libarchive-c_2.9.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3-libarchive-c_2.9.bb b/meta/recipes-devtools/python/python3-libarchive-c_2.9.bb
index 4983ae527a..3a2d8733e9 100644
--- a/meta/recipes-devtools/python/python3-libarchive-c_2.9.bb
+++ b/meta/recipes-devtools/python/python3-libarchive-c_2.9.bb
@@ -12,6 +12,10 @@ inherit pypi setuptools3
SRC_URI[md5sum] = "083bd2cb0043c1e22a52cb9a05e31532"
SRC_URI[sha256sum] = "9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60"
-RDEPENDS_${PN} += "libarchive"
+RDEPENDS_${PN} += "\
+ libarchive \
+ ${PYTHON_PN}-ctypes \
+ ${PYTHON_PN}-mmap \
+"
BBCLASSEXTEND = "native"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 14/25] classes/archiver: run do_unpack_and_patch after do_preconfigure
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (12 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 13/25] python3-libarchive-c: add the missing rdepends Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 17:12 ` Joshua Watt
2020-07-06 16:10 ` [OE-core][dunfell 15/25] oescripts.py: fix typo Steve Sakoman
` (10 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Joshua Watt <JPEWhacker@gmail.com>
The commit 8a7c779487 ("classes/archiver: Create patched archive before
configuring") fixed a race condition when using the archiver, but
introduced a bug where the GCC source would occasionally be deleted due
to the archiving code running before do_preconfigure. Instead, make sure
the archiving code runs after do_preconfigure by making
do_unpack_and_patch depend on it. This makes more sense anyway since
do_preconfigure is effectively an extension of do_patch.
This fixes errors like:
cat: .../gcc/defaults.h: No such file or directory
when making certain configuration changes
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d4be264061023ae0ea6e023d82a7b99605bfc22c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/archiver.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index a8d3afcbe9..bf275f4543 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -583,8 +583,8 @@ do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}"
addtask do_deploy_archives_setscene
addtask do_ar_original after do_unpack
-addtask do_unpack_and_patch after do_patch
-addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure
+addtask do_unpack_and_patch after do_patch do_preconfigure
+addtask do_ar_patched after do_unpack_and_patch before do_configure
addtask do_ar_configured after do_unpack_and_patch
addtask do_ar_mirror after do_fetch
addtask do_dumpdata
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 14/25] classes/archiver: run do_unpack_and_patch after do_preconfigure
2020-07-06 16:10 ` [OE-core][dunfell 14/25] classes/archiver: run do_unpack_and_patch after do_preconfigure Steve Sakoman
@ 2020-07-06 17:12 ` Joshua Watt
2020-07-06 18:48 ` Steve Sakoman
0 siblings, 1 reply; 40+ messages in thread
From: Joshua Watt @ 2020-07-06 17:12 UTC (permalink / raw)
To: Steve Sakoman, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1992 bytes --]
Steve,
Please also grab f02c190433 ("classes/archive: do_configure should not
depend on do_ar_patched") as it fixes a bug introduced by this patch
On 7/6/20 11:10 AM, Steve Sakoman wrote:
> From: Joshua Watt <JPEWhacker@gmail.com>
>
> The commit 8a7c779487 ("classes/archiver: Create patched archive before
> configuring") fixed a race condition when using the archiver, but
> introduced a bug where the GCC source would occasionally be deleted due
> to the archiving code running before do_preconfigure. Instead, make sure
> the archiving code runs after do_preconfigure by making
> do_unpack_and_patch depend on it. This makes more sense anyway since
> do_preconfigure is effectively an extension of do_patch.
>
> This fixes errors like:
>
> cat: .../gcc/defaults.h: No such file or directory
>
> when making certain configuration changes
>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit d4be264061023ae0ea6e023d82a7b99605bfc22c)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> meta/classes/archiver.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
> index a8d3afcbe9..bf275f4543 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -583,8 +583,8 @@ do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}"
> addtask do_deploy_archives_setscene
>
> addtask do_ar_original after do_unpack
> -addtask do_unpack_and_patch after do_patch
> -addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure
> +addtask do_unpack_and_patch after do_patch do_preconfigure
> +addtask do_ar_patched after do_unpack_and_patch before do_configure
> addtask do_ar_configured after do_unpack_and_patch
> addtask do_ar_mirror after do_fetch
> addtask do_dumpdata
>
>
[-- Attachment #2: Type: text/html, Size: 2760 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [OE-core][dunfell 14/25] classes/archiver: run do_unpack_and_patch after do_preconfigure
2020-07-06 17:12 ` Joshua Watt
@ 2020-07-06 18:48 ` Steve Sakoman
0 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 18:48 UTC (permalink / raw)
To: Joshua Watt; +Cc: Patches and discussions about the oe-core layer
On Mon, Jul 6, 2020 at 7:15 AM Joshua Watt <JPEWhacker@gmail.com> wrote:
>
> Steve,
>
> Please also grab f02c190433 ("classes/archive: do_configure should not depend on do_ar_patched") as it fixes a bug introduced by this patch
Thanks, I'll also drop this patch from the pull request and add it
along with the fix in next week's batch of patches.
Steve
> On 7/6/20 11:10 AM, Steve Sakoman wrote:
>
> From: Joshua Watt <JPEWhacker@gmail.com>
>
> The commit 8a7c779487 ("classes/archiver: Create patched archive before
> configuring") fixed a race condition when using the archiver, but
> introduced a bug where the GCC source would occasionally be deleted due
> to the archiving code running before do_preconfigure. Instead, make sure
> the archiving code runs after do_preconfigure by making
> do_unpack_and_patch depend on it. This makes more sense anyway since
> do_preconfigure is effectively an extension of do_patch.
>
> This fixes errors like:
>
> cat: .../gcc/defaults.h: No such file or directory
>
> when making certain configuration changes
>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit d4be264061023ae0ea6e023d82a7b99605bfc22c)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> meta/classes/archiver.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
> index a8d3afcbe9..bf275f4543 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -583,8 +583,8 @@ do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}"
> addtask do_deploy_archives_setscene
>
> addtask do_ar_original after do_unpack
> -addtask do_unpack_and_patch after do_patch
> -addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure
> +addtask do_unpack_and_patch after do_patch do_preconfigure
> +addtask do_ar_patched after do_unpack_and_patch before do_configure
> addtask do_ar_configured after do_unpack_and_patch
> addtask do_ar_mirror after do_fetch
> addtask do_dumpdata
>
>
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [OE-core][dunfell 15/25] oescripts.py: fix typo
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (13 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 14/25] classes/archiver: run do_unpack_and_patch after do_preconfigure Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 16/25] oescripts: ignore whitespaces when comparing lines Steve Sakoman
` (9 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 115d44958806a2c73d0bf140f45c11db462cc7db)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/oescripts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index 2f18d8f29c..f697d29b50 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -177,7 +177,7 @@ class OEListPackageconfigTests(OEScriptTests):
self.check_endlines(results, expected_endlines)
- def test_packageconfig_flags_optiins_preferred_only(self):
+ def test_packageconfig_flags_options_preferred_only(self):
results = runCmd('%s/contrib/list-packageconfig-flags.py -p' % self.scripts_dir)
expected_endlines = []
expected_endlines.append("RECIPE NAME PACKAGECONFIG FLAGS")
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 16/25] oescripts: ignore whitespaces when comparing lines
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (14 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 15/25] oescripts.py: fix typo Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 17/25] gtk-icon-cache.bbclass: add runtime dependency Steve Sakoman
` (8 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
list-packageconfig-flags.py determines the whitespace numbers according
to the longest package name. This is reasonable for the tool as it's
trying to generate pretty output.
However, in this selftest case, the output is hardcoded. This results in
"pinentry gtk2 libcap ncurses qt secret" not recognized
as correct as the expected line is:
"pinentry gtk2 libcap ncurses qt secret".
The difference is only about whitespaces. So we should ignore the whitespaces
when comparing lines.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/oescripts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index f697d29b50..726daff7c6 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -133,7 +133,7 @@ class OEListPackageconfigTests(OEScriptTests):
def check_endlines(self, results, expected_endlines):
for line in results.output.splitlines():
for el in expected_endlines:
- if line == el:
+ if line.split() == el.split():
expected_endlines.remove(el)
break
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 17/25] gtk-icon-cache.bbclass: add runtime dependency
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (15 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 16/25] oescripts: ignore whitespaces when comparing lines Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 18/25] oeqa/core/loader: refine regex to find module Steve Sakoman
` (7 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
fix error:
+ /usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
/var/tmp/rpm-tmp.mdYxY6: line 12: /usr/lib/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders: No such file or directory
%post(adwaita-icon-theme-3.36.1-r0.0.noarch): waitpid(2961) rc 2961 status 7f00
warning: %post(adwaita-icon-theme-3.36.1-r0.0.noarch) scriptlet failed, exit status 127
when install adwaita-icon-theme on target, which inherit gtk-icon-cache
above error reported, fix by add runtime dependency to pkgs
we don't use explicit RDEPENDS, so fix do_rootfs breaking by adding it into DEPENDS.
Error:
Problem: conflicting requests
- nothing provides gdk-pixbuf needed by adwaita-icon-theme-3.36.1-r0.noarch
- nothing provides gtk+3 needed by adwaita-icon-theme-3.36.1-r0.noarch
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 31e3d34c8a9c3e8481aa837aa0bf52adf095fe62)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/gtk-icon-cache.bbclass | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 91cb4ad409..dd394af27c 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,10 @@
FILES_${PN} += "${datadir}/icons/hicolor"
-DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+3-native"
+DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \
+ ${@['gdk-pixbuf', '']['${BPN}' == 'gdk-pixbuf']} \
+ ${@['gtk+3', '']['${BPN}' == 'gtk+3']} \
+ gtk+3-native \
+"
PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native"
@@ -48,9 +52,18 @@ python populate_packages_append () {
bb.note("adding hicolor-icon-theme dependency to %s" % pkg)
rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme"
d.appendVar('RDEPENDS_%s' % pkg, rdepends)
-
+
+ #gtk_icon_cache_postinst depend on gdk-pixbuf and gtk+3
+ bb.note("adding gdk-pixbuf dependency to %s" % pkg)
+ rdepends = ' ' + d.getVar('MLPREFIX', False) + "gdk-pixbuf"
+ d.appendVar('RDEPENDS_%s' % pkg, rdepends)
+
+ bb.note("adding gtk+3 dependency to %s" % pkg)
+ rdepends = ' ' + d.getVar('MLPREFIX', False) + "gtk+3"
+ d.appendVar('RDEPENDS_%s' % pkg, rdepends)
+
bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
-
+
postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst:
postinst = '#!/bin/sh\n'
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 18/25] oeqa/core/loader: refine regex to find module
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (16 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 17/25] gtk-icon-cache.bbclass: add runtime dependency Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 19/25] oeqa/selftest: recipetool/devtool: Avoid load_plugin test race Steve Sakoman
` (6 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Lee Chee Yang <chee.yang.lee@intel.com>
test case in format <module name>.<class name>.<test case name>
this is clear when test cases is only 3 item deep.
but confused when it is 4 item deep, eg,
oelib.types.TestList.test_list_nosep
in this case, oelib and oelib.types can both be treated as module
since module name contains only lower cases and class name should
contain atleast one upper case.
so, always treat leading item without upper case as module also allow
module name to contain dot.
[YOCTO #13941]
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ad81ea90a815389e45ff302a85151724c71f71c3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/core/loader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 0d7970d49e..73c5788508 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -46,7 +46,7 @@ def _built_modules_dict(modules):
for module in modules:
# Assumption: package and module names do not contain upper case
# characters, whereas class names do
- m = re.match(r'^(\w+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$', module, flags=re.ASCII)
+ m = re.match(r'^([1-2a-z_.]+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$', module, flags=re.ASCII)
if not m:
continue
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 19/25] oeqa/selftest: recipetool/devtool: Avoid load_plugin test race
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (17 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 18/25] oeqa/core/loader: refine regex to find module Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 20/25] oeqa/targetcontrol: Attempt to fix log closure warning message Steve Sakoman
` (5 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
This bug has plagued the autobuilder for a couple of years and we've
struggled to reproduce/debug it.
The problem is the "lib" directory in meta-poky used during the load_plugin
tests for recipetool and devtool can race and one can delete the files
from the other leading to test failures.
Deleting the lib directory only if empty will avoid this.
[YOCTO #13070]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d603e2fd589e1edbc67c8c2fefb6337e728b9d01)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/devtool.py | 6 +++++-
meta/lib/oeqa/selftest/cases/recipetool.py | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 5886862d6c..5003f08c75 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1447,7 +1447,11 @@ class DevtoolUpgradeTests(DevtoolBase):
dstdir = os.path.join(dstdir, p)
if not os.path.exists(dstdir):
os.makedirs(dstdir)
- self.track_for_cleanup(dstdir)
+ if p == "lib":
+ # Can race with other tests
+ self.add_command_to_tearDown('rmdir --ignore-fail-on-non-empty %s' % dstdir)
+ else:
+ self.track_for_cleanup(dstdir)
dstfile = os.path.join(dstdir, os.path.basename(srcfile))
if srcfile != dstfile:
shutil.copy(srcfile, dstfile)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index 6bfe8f177f..c2ade2543a 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -534,7 +534,11 @@ class RecipetoolTests(RecipetoolBase):
dstdir = os.path.join(dstdir, p)
if not os.path.exists(dstdir):
os.makedirs(dstdir)
- self.track_for_cleanup(dstdir)
+ if p == "lib":
+ # Can race with other tests
+ self.add_command_to_tearDown('rmdir --ignore-fail-on-non-empty %s' % dstdir)
+ else:
+ self.track_for_cleanup(dstdir)
dstfile = os.path.join(dstdir, os.path.basename(srcfile))
if srcfile != dstfile:
shutil.copy(srcfile, dstfile)
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 20/25] oeqa/targetcontrol: Attempt to fix log closure warning message
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (18 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 19/25] oeqa/selftest: recipetool/devtool: Avoid load_plugin test race Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 21/25] logrotate.py: fix testimage occasionally failure Steve Sakoman
` (4 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
We continue to see the warning message:
WARNING: lib/bb/daemonize.py:76: ResourceWarning: unclosed file <_io.TextIOWrapper
name='build/tmp/work/qemux86_64-poky-linux/oe-selftest-image/1.0-r0/testimage/qemurunner_log.20200703011821'
mode='a' encoding='UTF-8'>
I've been unable to reprodue this but believe its caused by garbage
collection of the FileHandler used in QemuTarget being delayed until
after a new tinfoil instance is created by a subseqent test.
Force the log file to be closed when we stop using it to avoid this.
[YOCTO #13961]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e15cc7801ec611f867f5b31028741722ac718c87)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/targetcontrol.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 7bbba6016b..19f5a4ea7e 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -187,6 +187,7 @@ class QemuTarget(BaseTarget):
except:
pass
self.logger.removeHandler(self.loggerhandler)
+ self.loggerhandler.close()
self.connection = None
self.ip = None
self.server_ip = None
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 21/25] logrotate.py: fix testimage occasionally failure
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (19 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 20/25] oeqa/targetcontrol: Attempt to fix log closure warning message Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 22/25] rootfs-postcommands: Improve/fix rootfs_check_host_user_contaminated Steve Sakoman
` (3 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
testcase test_systemd_failed occasionally failed with below error:
Failed to start Rotate log files.
logrotate.service: Failed with result 'exit-code'.
logrotate.service: Main process exited, code=exited, status=1/FAILURE
error: stat of /var/log/logrotate_test failed: No such file or directory
error: logrotate_test:1 lines must begin with a keyword or a filename (possibly in double quotes)
above failure caused since testcase test_logrotate_wtmp
add /etc/logrotate.d/logrotate_test, which need /var/log/logrotate_test,
but there is no such file. so when logrotate.service is triggerd
by logrotate.timer after testcase test_logrotate_wtmp is runned,
the testcase test_systemd_failed will fail.
these 3 lines are useless, so remove them to fix above problem.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 22f5f7f86a4d47624c476be00e5121009c48cb7b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/runtime/cases/logrotate.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/logrotate.py b/meta/lib/oeqa/runtime/cases/logrotate.py
index 3938e91993..a4efcd07c0 100644
--- a/meta/lib/oeqa/runtime/cases/logrotate.py
+++ b/meta/lib/oeqa/runtime/cases/logrotate.py
@@ -37,10 +37,6 @@ class LogrotateTest(OERuntimeTestCase):
msg = ('Could not write to /tmp/logrotate-test.conf')
self.assertEqual(status, 0, msg = msg)
- status, output = self.target.run('echo "/var/log/logrotate_test {\\n missingok \\n monthly \\n rotate 1" > /etc/logrotate.d/logrotate_test')
- msg = ('Could not write to /etc/logrotate.d/logrotate_test')
- self.assertEqual(status, 0, msg = msg)
-
# If logrotate fails to rotate the log, view the verbose output of logrotate to see what prevented it
_, logrotate_output = self.target.run('logrotate -vf /tmp/logrotate-test.conf')
status, _ = self.target.run('find $HOME/logrotate_dir -type f | grep wtmp.1')
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 22/25] rootfs-postcommands: Improve/fix rootfs_check_host_user_contaminated
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (20 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 21/25] logrotate.py: fix testimage occasionally failure Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 23/25] sqlite3: Security fix for CVE-2020-15358 Steve Sakoman
` (2 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently if the find command finds /home it stops checking the other
files. Tweak the find expression to fix this.
Also, from Alex Kiernan <alex.kiernan@gmail.com>, generate output for
each contaminated path so it's visible in the main log file.
When matches are found, dump the data from the group and passwd files
so useful debugging can be done based on the results.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 504f1d158bf7c6ad08fbce755021db2b14565231)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/rootfs-postcommands.bbclass | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 2f171836fa..c43b9a9823 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -308,12 +308,16 @@ rootfs_check_host_user_contaminated () {
HOST_USER_UID="$(PSEUDO_UNLOAD=1 id -u)"
HOST_USER_GID="$(PSEUDO_UNLOAD=1 id -g)"
- find "${IMAGE_ROOTFS}" -wholename "${IMAGE_ROOTFS}/home" -prune \
- -user "$HOST_USER_UID" -o -group "$HOST_USER_GID" >"$contaminated"
+ find "${IMAGE_ROOTFS}" -path "${IMAGE_ROOTFS}/home" -prune -o \
+ -user "$HOST_USER_UID" -print -o -group "$HOST_USER_GID" -print >"$contaminated"
+
+ sed -e "s,${IMAGE_ROOTFS},," $contaminated | while read line; do
+ bbwarn "Path in the rootfs is owned by the same user or group as the user running bitbake:" $line `ls -lan ${IMAGE_ROOTFS}/$line`
+ done
if [ -s "$contaminated" ]; then
- echo "WARNING: Paths in the rootfs are owned by the same user or group as the user running bitbake. See the logfile for the specific paths."
- cat "$contaminated" | sed "s,^, ,"
+ bbwarn "/etc/passwd:" `cat ${IMAGE_ROOTFS}/etc/passwd`
+ bbwarn "/etc/group:" `cat ${IMAGE_ROOTFS}/etc/group`
fi
}
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 23/25] sqlite3: Security fix for CVE-2020-15358
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (21 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 22/25] rootfs-postcommands: Improve/fix rootfs_check_host_user_contaminated Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 24/25] qemu: fix CVE-2020-10702/10761/13362/13659/13800 Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 25/25] python3: fix CVE-2020-14422 Steve Sakoman
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Armin Kuster <akuster@mvista.com>
Source: sqlite.org
MR: 104526
Type: Security Fix
Disposition: Backport from https://www.sqlite.org/src/vinfo/10fa79d00f8091e5?diff=1
ChangeID: a1c012b8c8aecd4970f3ae16686bf25f2376f542
Description:
Affects sqlite < 3.32.3
Fixes CVE CVE-2020-15358
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../sqlite/files/CVE-2020-15358.patch | 47 +++++++++++++++++++
meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 +
2 files changed, 48 insertions(+)
create mode 100644 meta/recipes-support/sqlite/files/CVE-2020-15358.patch
diff --git a/meta/recipes-support/sqlite/files/CVE-2020-15358.patch b/meta/recipes-support/sqlite/files/CVE-2020-15358.patch
new file mode 100644
index 0000000000..086f6ef913
--- /dev/null
+++ b/meta/recipes-support/sqlite/files/CVE-2020-15358.patch
@@ -0,0 +1,47 @@
+Fix a defect in the query-flattener optimization identified by ticket [8f157e8010b22af0].
+
+Upstream-Status: Backport
+https://www.sqlite.org/src/info/10fa79d00f8091e5
+CVE: CVE-2020-15358
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Index: sqlite-autoconf-3310100/sqlite3.c
+===================================================================
+--- sqlite-autoconf-3310100.orig/sqlite3.c
++++ sqlite-autoconf-3310100/sqlite3.c
+@@ -18349,6 +18349,7 @@ struct Select {
+ #define SF_WhereBegin 0x0080000 /* Really a WhereBegin() call. Debug Only */
+ #define SF_WinRewrite 0x0100000 /* Window function rewrite accomplished */
+ #define SF_View 0x0200000 /* SELECT statement is a view */
++#define SF_NoopOrderBy 0x0400000 /* ORDER BY is ignored for this query */
+
+ /*
+ ** The results of a SELECT can be distributed in several ways, as defined
+@@ -130607,9 +130608,7 @@ static int multiSelect(
+ selectOpName(p->op)));
+ rc = sqlite3Select(pParse, p, &uniondest);
+ testcase( rc!=SQLITE_OK );
+- /* Query flattening in sqlite3Select() might refill p->pOrderBy.
+- ** Be sure to delete p->pOrderBy, therefore, to avoid a memory leak. */
+- sqlite3ExprListDelete(db, p->pOrderBy);
++ assert( p->pOrderBy==0 );
+ pDelete = p->pPrior;
+ p->pPrior = pPrior;
+ p->pOrderBy = 0;
+@@ -131958,7 +131957,7 @@ static int flattenSubquery(
+ ** We look at every expression in the outer query and every place we see
+ ** "a" we substitute "x*3" and every place we see "b" we substitute "y+10".
+ */
+- if( pSub->pOrderBy ){
++ if( pSub->pOrderBy && (pParent->selFlags & SF_NoopOrderBy)==0 ){
+ /* At this point, any non-zero iOrderByCol values indicate that the
+ ** ORDER BY column expression is identical to the iOrderByCol'th
+ ** expression returned by SELECT statement pSub. Since these values
+@@ -133659,6 +133658,7 @@ SQLITE_PRIVATE int sqlite3Select(
+ sqlite3ExprListDelete(db, p->pOrderBy);
+ p->pOrderBy = 0;
+ p->selFlags &= ~SF_Distinct;
++ p->selFlags |= SF_NoopOrderBy;
+ }
+ sqlite3SelectPrep(pParse, p, 0);
+ if( pParse->nErr || db->mallocFailed ){
diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb
index 57a791385c..e5071b48bb 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb
@@ -7,6 +7,7 @@ SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \
file://CVE-2020-9327.patch \
file://CVE-2020-11656.patch \
file://CVE-2020-11655.patch \
+ file://CVE-2020-15358.patch \
"
SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125"
SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 24/25] qemu: fix CVE-2020-10702/10761/13362/13659/13800
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (22 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 23/25] sqlite3: Security fix for CVE-2020-15358 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
2020-07-06 16:10 ` [OE-core][dunfell 25/25] python3: fix CVE-2020-14422 Steve Sakoman
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Lee Chee Yang <chee.yang.lee@intel.com>
fix these CVE:
CVE-2020-10702
CVE-2020-10761
CVE-2020-13362
CVE-2020-13659
CVE-2020-13800
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/qemu/qemu.inc | 5 +
.../qemu/qemu/CVE-2020-10702.patch | 52 ++++++
.../qemu/qemu/CVE-2020-10761.patch | 150 ++++++++++++++++++
.../qemu/qemu/CVE-2020-13362.patch | 52 ++++++
.../qemu/qemu/CVE-2020-13659.patch | 55 +++++++
.../qemu/qemu/CVE-2020-13800.patch | 60 +++++++
6 files changed, 374 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-10761.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13362.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13659.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13800.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 3e5006937b..24b0379de4 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -39,6 +39,11 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-11102.patch \
file://CVE-2020-11869.patch \
file://CVE-2020-13361.patch \
+ file://CVE-2020-10761.patch \
+ file://CVE-2020-10702.patch \
+ file://CVE-2020-13659.patch \
+ file://CVE-2020-13800.patch \
+ file://CVE-2020-13362.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch
new file mode 100644
index 0000000000..0931489af4
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch
@@ -0,0 +1,52 @@
+From de0b1bae6461f67243282555475f88b2384a1eb9 Mon Sep 17 00:00:00 2001
+From: Vincent Dehors <vincent.dehors@smile.fr>
+Date: Thu, 23 Jan 2020 15:22:38 +0000
+Subject: [PATCH] target/arm: Fix PAuth sbox functions
+
+In the PAC computation, sbox was applied over wrong bits.
+As this is a 4-bit sbox, bit index should be incremented by 4 instead of 16.
+
+Test vector from QARMA paper (https://eprint.iacr.org/2016/444.pdf) was
+used to verify one computation of the pauth_computepac() function which
+uses sbox2.
+
+Launchpad: https://bugs.launchpad.net/bugs/1859713
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Signed-off-by: Vincent DEHORS <vincent.dehors@smile.fr>
+Signed-off-by: Adrien GRASSEIN <adrien.grassein@smile.fr>
+Message-id: 20200116230809.19078-2-richard.henderson@linaro.org
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+
+Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=patch;h=de0b1bae6461f67243282555475f88b2384a1eb9]
+CVE: CVE-2020-10702
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ target/arm/pauth_helper.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
+index d3194f2..0a5f41e 100644
+--- a/target/arm/pauth_helper.c
++++ b/target/arm/pauth_helper.c
+@@ -89,7 +89,7 @@ static uint64_t pac_sub(uint64_t i)
+ uint64_t o = 0;
+ int b;
+
+- for (b = 0; b < 64; b += 16) {
++ for (b = 0; b < 64; b += 4) {
+ o |= (uint64_t)sub[(i >> b) & 0xf] << b;
+ }
+ return o;
+@@ -104,7 +104,7 @@ static uint64_t pac_inv_sub(uint64_t i)
+ uint64_t o = 0;
+ int b;
+
+- for (b = 0; b < 64; b += 16) {
++ for (b = 0; b < 64; b += 4) {
+ o |= (uint64_t)inv_sub[(i >> b) & 0xf] << b;
+ }
+ return o;
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-10761.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-10761.patch
new file mode 100644
index 0000000000..e5e336a2ee
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-10761.patch
@@ -0,0 +1,150 @@
+From 5c4fe018c025740fef4a0a4421e8162db0c3eefd Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Mon, 8 Jun 2020 13:26:37 -0500
+Subject: [PATCH] nbd/server: Avoid long error message assertions
+ CVE-2020-10761
+
+Ever since commit 36683283 (v2.8), the server code asserts that error
+strings sent to the client are well-formed per the protocol by not
+exceeding the maximum string length of 4096. At the time the server
+first started sending error messages, the assertion could not be
+triggered, because messages were completely under our control.
+However, over the years, we have added latent scenarios where a client
+could trigger the server to attempt an error message that would
+include the client's information if it passed other checks first:
+
+- requesting NBD_OPT_INFO/GO on an export name that is not present
+ (commit 0cfae925 in v2.12 echoes the name)
+
+- requesting NBD_OPT_LIST/SET_META_CONTEXT on an export name that is
+ not present (commit e7b1948d in v2.12 echoes the name)
+
+At the time, those were still safe because we flagged names larger
+than 256 bytes with a different message; but that changed in commit
+93676c88 (v4.2) when we raised the name limit to 4096 to match the NBD
+string limit. (That commit also failed to change the magic number
+4096 in nbd_negotiate_send_rep_err to the just-introduced named
+constant.) So with that commit, long client names appended to server
+text can now trigger the assertion, and thus be used as a denial of
+service attack against a server. As a mitigating factor, if the
+server requires TLS, the client cannot trigger the problematic paths
+unless it first supplies TLS credentials, and such trusted clients are
+less likely to try to intentionally crash the server.
+
+We may later want to further sanitize the user-supplied strings we
+place into our error messages, such as scrubbing out control
+characters, but that is less important to the CVE fix, so it can be a
+later patch to the new nbd_sanitize_name.
+
+Consideration was given to changing the assertion in
+nbd_negotiate_send_rep_verr to instead merely log a server error and
+truncate the message, to avoid leaving a latent path that could
+trigger a future CVE DoS on any new error message. However, this
+merely complicates the code for something that is already (correctly)
+flagging coding errors, and now that we are aware of the long message
+pitfall, we are less likely to introduce such errors in the future,
+which would make such error handling dead code.
+
+Reported-by: Xueqiang Wei <xuwei@redhat.com>
+CC: qemu-stable@nongnu.org
+Fixes: https://bugzilla.redhat.com/1843684 CVE-2020-10761
+Fixes: 93676c88d7
+Signed-off-by: Eric Blake <eblake@redhat.com>
+Message-Id: <20200610163741.3745251-2-eblake@redhat.com>
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+
+Upstream-Status: Backport [https://github.com/qemu/qemu/commit/5c4fe018c025740fef4a0a4421e8162db0c3eefd]
+CVE: CVE-2020-10761
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ nbd/server.c | 23 ++++++++++++++++++++---
+ tests/qemu-iotests/143 | 4 ++++
+ tests/qemu-iotests/143.out | 2 ++
+ 3 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/nbd/server.c b/nbd/server.c
+index 02b1ed08014..20754e9ebc3 100644
+--- a/nbd/server.c
++++ b/nbd/server.c
+@@ -217,7 +217,7 @@ nbd_negotiate_send_rep_verr(NBDClient *client, uint32_t type,
+
+ msg = g_strdup_vprintf(fmt, va);
+ len = strlen(msg);
+- assert(len < 4096);
++ assert(len < NBD_MAX_STRING_SIZE);
+ trace_nbd_negotiate_send_rep_err(msg);
+ ret = nbd_negotiate_send_rep_len(client, type, len, errp);
+ if (ret < 0) {
+@@ -231,6 +231,19 @@ nbd_negotiate_send_rep_verr(NBDClient *client, uint32_t type,
+ return 0;
+ }
+
++/*
++ * Return a malloc'd copy of @name suitable for use in an error reply.
++ */
++static char *
++nbd_sanitize_name(const char *name)
++{
++ if (strnlen(name, 80) < 80) {
++ return g_strdup(name);
++ }
++ /* XXX Should we also try to sanitize any control characters? */
++ return g_strdup_printf("%.80s...", name);
++}
++
+ /* Send an error reply.
+ * Return -errno on error, 0 on success. */
+ static int GCC_FMT_ATTR(4, 5)
+@@ -595,9 +608,11 @@ static int nbd_negotiate_handle_info(NBDClient *client, Error **errp)
+
+ exp = nbd_export_find(name);
+ if (!exp) {
++ g_autofree char *sane_name = nbd_sanitize_name(name);
++
+ return nbd_negotiate_send_rep_err(client, NBD_REP_ERR_UNKNOWN,
+ errp, "export '%s' not present",
+- name);
++ sane_name);
+ }
+
+ /* Don't bother sending NBD_INFO_NAME unless client requested it */
+@@ -995,8 +1010,10 @@ static int nbd_negotiate_meta_queries(NBDClient *client,
+
+ meta->exp = nbd_export_find(export_name);
+ if (meta->exp == NULL) {
++ g_autofree char *sane_name = nbd_sanitize_name(export_name);
++
+ return nbd_opt_drop(client, NBD_REP_ERR_UNKNOWN, errp,
+- "export '%s' not present", export_name);
++ "export '%s' not present", sane_name);
+ }
+
+ ret = nbd_opt_read(client, &nb_queries, sizeof(nb_queries), errp);
+diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
+index f649b361950..d2349903b1b 100755
+--- a/tests/qemu-iotests/143
++++ b/tests/qemu-iotests/143
+@@ -58,6 +58,10 @@ _send_qemu_cmd $QEMU_HANDLE \
+ $QEMU_IO_PROG -f raw -c quit \
+ "nbd+unix:///no_such_export?socket=$SOCK_DIR/nbd" 2>&1 \
+ | _filter_qemu_io | _filter_nbd
++# Likewise, with longest possible name permitted in NBD protocol
++$QEMU_IO_PROG -f raw -c quit \
++ "nbd+unix:///$(printf %4096d 1 | tr ' ' a)?socket=$SOCK_DIR/nbd" 2>&1 \
++ | _filter_qemu_io | _filter_nbd | sed 's/aaaa*aa/aa--aa/'
+
+ _send_qemu_cmd $QEMU_HANDLE \
+ "{ 'execute': 'quit' }" \
+diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
+index 1f4001c6013..fc9c0a761fa 100644
+--- a/tests/qemu-iotests/143.out
++++ b/tests/qemu-iotests/143.out
+@@ -5,6 +5,8 @@ QA output created by 143
+ {"return": {}}
+ qemu-io: can't open device nbd+unix:///no_such_export?socket=SOCK_DIR/nbd: Requested export not available
+ server reported: export 'no_such_export' not present
++qemu-io: can't open device nbd+unix:///aa--aa1?socket=SOCK_DIR/nbd: Requested export not available
++server reported: export 'aa--aa...' not present
+ { 'execute': 'quit' }
+ {"return": {}}
+ {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-13362.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-13362.patch
new file mode 100644
index 0000000000..7c92d762f2
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-13362.patch
@@ -0,0 +1,52 @@
+From f50ab86a2620bd7e8507af865b164655ee921661 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 14 May 2020 00:55:38 +0530
+Subject: [PATCH] megasas: use unsigned type for reply_queue_head and check
+ index
+
+A guest user may set 'reply_queue_head' field of MegasasState to
+a negative value. Later in 'megasas_lookup_frame' it is used to
+index into s->frames[] array. Use unsigned type to avoid OOB
+access issue.
+
+Also check that 'index' value stays within s->frames[] bounds
+through the while() loop in 'megasas_lookup_frame' to avoid OOB
+access.
+
+Reported-by: Ren Ding <rding@gatech.edu>
+Reported-by: Hanqing Zhao <hanqing@gatech.edu>
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Acked-by: Alexander Bulekov <alxndr@bu.edu>
+Message-Id: <20200513192540.1583887-2-ppandit@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=f50ab86a2620bd7e8507af865b164655ee921661]
+CVE: CVE-2020-13362
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ hw/scsi/megasas.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
+index af18c88b656..6ce598cd690 100644
+--- a/hw/scsi/megasas.c
++++ b/hw/scsi/megasas.c
+@@ -112,7 +112,7 @@ typedef struct MegasasState {
+ uint64_t reply_queue_pa;
+ void *reply_queue;
+ int reply_queue_len;
+- int reply_queue_head;
++ uint16_t reply_queue_head;
+ int reply_queue_tail;
+ uint64_t consumer_pa;
+ uint64_t producer_pa;
+@@ -445,7 +445,7 @@ static MegasasCmd *megasas_lookup_frame(MegasasState *s,
+
+ index = s->reply_queue_head;
+
+- while (num < s->fw_cmds) {
++ while (num < s->fw_cmds && index < MEGASAS_MAX_FRAMES) {
+ if (s->frames[index].pa && s->frames[index].pa == frame) {
+ cmd = &s->frames[index];
+ break;
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-13659.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-13659.patch
new file mode 100644
index 0000000000..f1e9345eca
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-13659.patch
@@ -0,0 +1,55 @@
+From 77f55eac6c433e23e82a1b88b2d74f385c4c7d82 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Tue, 26 May 2020 16:47:43 +0530
+Subject: [PATCH] exec: set map length to zero when returning NULL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When mapping physical memory into host's virtual address space,
+'address_space_map' may return NULL if BounceBuffer is in_use.
+Set and return '*plen = 0' to avoid later NULL pointer dereference.
+
+Reported-by: Alexander Bulekov <alxndr@bu.edu>
+Fixes: https://bugs.launchpad.net/qemu/+bug/1878259
+Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
+Suggested-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Message-Id: <20200526111743.428367-1-ppandit@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+Upstream-Status: Backport [https://github.com/qemu/qemu/commit/77f55eac6c433e23e82a1b88b2d74f385c4c7d82]
+CVE: CVE-2020-13659
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ exec.c | 1 +
+ include/exec/memory.h | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/exec.c b/exec.c
+index 9cbde85d8c1..778263f1c6a 100644
+--- a/exec.c
++++ b/exec.c
+@@ -3540,6 +3540,7 @@ void *address_space_map(AddressSpace *as,
+
+ if (!memory_access_is_direct(mr, is_write)) {
+ if (atomic_xchg(&bounce.in_use, true)) {
++ *plen = 0;
+ return NULL;
+ }
+ /* Avoid unbounded allocations */
+diff --git a/include/exec/memory.h b/include/exec/memory.h
+index bd7fdd60810..af8ca7824e0 100644
+--- a/include/exec/memory.h
++++ b/include/exec/memory.h
+@@ -2314,7 +2314,8 @@ bool address_space_access_valid(AddressSpace *as, hwaddr addr, hwaddr len,
+ /* address_space_map: map a physical memory region into a host virtual address
+ *
+ * May map a subset of the requested range, given by and returned in @plen.
+- * May return %NULL if resources needed to perform the mapping are exhausted.
++ * May return %NULL and set *@plen to zero(0), if resources needed to perform
++ * the mapping are exhausted.
+ * Use only for reads OR writes - not for read-modify-write operations.
+ * Use cpu_register_map_client() to know when retrying the map operation is
+ * likely to succeed.
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-13800.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-13800.patch
new file mode 100644
index 0000000000..84b2f06894
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-13800.patch
@@ -0,0 +1,60 @@
+From a98610c429d52db0937c1e48659428929835c455 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 4 Jun 2020 14:38:30 +0530
+Subject: [PATCH] ati-vga: check mm_index before recursive call
+ (CVE-2020-13800)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+While accessing VGA registers via ati_mm_read/write routines,
+a guest may set 's->regs.mm_index' such that it leads to infinite
+recursion. Check mm_index value to avoid such recursion. Log an
+error message for wrong values.
+
+Reported-by: Ren Ding <rding@gatech.edu>
+Reported-by: Hanqing Zhao <hanqing@gatech.edu>
+Reported-by: Yi Ren <c4tren@gmail.com>
+Message-id: 20200604090830.33885-1-ppandit@redhat.com
+Suggested-by: BALATON Zoltan <balaton@eik.bme.hu>
+Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+
+Upstream-Status: Backport [https://github.com/qemu/qemu/commit/a98610c429d52db0937c1e48659428929835c455]
+CVE: CVE-2020-13800
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ hw/display/ati.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/hw/display/ati.c b/hw/display/ati.c
+index 065f197678e..67604e68deb 100644
+--- a/hw/display/ati.c
++++ b/hw/display/ati.c
+@@ -285,8 +285,11 @@ static uint64_t ati_mm_read(void *opaque, hwaddr addr, unsigned int size)
+ if (idx <= s->vga.vram_size - size) {
+ val = ldn_le_p(s->vga.vram_ptr + idx, size);
+ }
+- } else {
++ } else if (s->regs.mm_index > MM_DATA + 3) {
+ val = ati_mm_read(s, s->regs.mm_index + addr - MM_DATA, size);
++ } else {
++ qemu_log_mask(LOG_GUEST_ERROR,
++ "ati_mm_read: mm_index too small: %u\n", s->regs.mm_index);
+ }
+ break;
+ case BIOS_0_SCRATCH ... BUS_CNTL - 1:
+@@ -520,8 +523,11 @@ static void ati_mm_write(void *opaque, hwaddr addr,
+ if (idx <= s->vga.vram_size - size) {
+ stn_le_p(s->vga.vram_ptr + idx, size, data);
+ }
+- } else {
++ } else if (s->regs.mm_index > MM_DATA + 3) {
+ ati_mm_write(s, s->regs.mm_index + addr - MM_DATA, data, size);
++ } else {
++ qemu_log_mask(LOG_GUEST_ERROR,
++ "ati_mm_write: mm_index too small: %u\n", s->regs.mm_index);
+ }
+ break;
+ case BIOS_0_SCRATCH ... BUS_CNTL - 1:
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 25/25] python3: fix CVE-2020-14422
2020-07-06 16:10 [OE-core][dunfell 00/25] Patch review Steve Sakoman
` (23 preceding siblings ...)
2020-07-06 16:10 ` [OE-core][dunfell 24/25] qemu: fix CVE-2020-10702/10761/13362/13659/13800 Steve Sakoman
@ 2020-07-06 16:10 ` Steve Sakoman
24 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2020-07-06 16:10 UTC (permalink / raw)
To: openembedded-core
From: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../python/python3/CVE-2020-14422.patch | 77 +++++++++++++++++++
meta/recipes-devtools/python/python3_3.8.2.bb | 1 +
2 files changed, 78 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3/CVE-2020-14422.patch
diff --git a/meta/recipes-devtools/python/python3/CVE-2020-14422.patch b/meta/recipes-devtools/python/python3/CVE-2020-14422.patch
new file mode 100644
index 0000000000..6889e46da9
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/CVE-2020-14422.patch
@@ -0,0 +1,77 @@
+From dc8ce8ead182de46584cc1ed8a8c51d48240cbd5 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington@users.noreply.github.com>
+Date: Mon, 29 Jun 2020 11:12:50 -0700
+Subject: [PATCH] bpo-41004: Resolve hash collisions for IPv4Interface and
+ IPv6Interface (GH-21033)
+
+The __hash__() methods of classes IPv4Interface and IPv6Interface had issue
+of generating constant hash values of 32 and 128 respectively causing hash collisions.
+The fix uses the hash() function to generate hash values for the objects
+instead of XOR operation
+(cherry picked from commit b30ee26e366bf509b7538d79bfec6c6d38d53f28)
+
+Co-authored-by: Ravi Teja P <rvteja92@gmail.com>
+
+Upstream-Status: Backport [https://github.com/python/cpython/commit/dc8ce8ead182de46584cc1ed8a8c51d48240cbd5]
+CVE: CVE-2020-14422
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ Lib/ipaddress.py | 4 ++--
+ Lib/test/test_ipaddress.py | 12 ++++++++++++
+ .../2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst | 1 +
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst
+
+diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
+index 873c7644081af..a3a04f7f4b309 100644
+--- a/Lib/ipaddress.py
++++ b/Lib/ipaddress.py
+@@ -1370,7 +1370,7 @@ def __lt__(self, other):
+ return False
+
+ def __hash__(self):
+- return self._ip ^ self._prefixlen ^ int(self.network.network_address)
++ return hash((self._ip, self._prefixlen, int(self.network.network_address)))
+
+ __reduce__ = _IPAddressBase.__reduce__
+
+@@ -2017,7 +2017,7 @@ def __lt__(self, other):
+ return False
+
+ def __hash__(self):
+- return self._ip ^ self._prefixlen ^ int(self.network.network_address)
++ return hash((self._ip, self._prefixlen, int(self.network.network_address)))
+
+ __reduce__ = _IPAddressBase.__reduce__
+
+diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
+index de77111705b69..2eba740e5e7a4 100644
+--- a/Lib/test/test_ipaddress.py
++++ b/Lib/test/test_ipaddress.py
+@@ -2053,6 +2053,18 @@ def testsixtofour(self):
+ sixtofouraddr.sixtofour)
+ self.assertFalse(bad_addr.sixtofour)
+
++ # issue41004 Hash collisions in IPv4Interface and IPv6Interface
++ def testV4HashIsNotConstant(self):
++ ipv4_address1 = ipaddress.IPv4Interface("1.2.3.4")
++ ipv4_address2 = ipaddress.IPv4Interface("2.3.4.5")
++ self.assertNotEqual(ipv4_address1.__hash__(), ipv4_address2.__hash__())
++
++ # issue41004 Hash collisions in IPv4Interface and IPv6Interface
++ def testV6HashIsNotConstant(self):
++ ipv6_address1 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:1")
++ ipv6_address2 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:2")
++ self.assertNotEqual(ipv6_address1.__hash__(), ipv6_address2.__hash__())
++
+
+ if __name__ == '__main__':
+ unittest.main()
+diff --git a/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst b/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst
+new file mode 100644
+index 0000000000000..1380b31fbe9f4
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst
+@@ -0,0 +1 @@
++The __hash__() methods of ipaddress.IPv4Interface and ipaddress.IPv6Interface incorrectly generated constant hash values of 32 and 128 respectively. This resulted in always causing hash collisions. The fix uses hash() to generate hash values for the tuple of (address, mask length, network address).
diff --git a/meta/recipes-devtools/python/python3_3.8.2.bb b/meta/recipes-devtools/python/python3_3.8.2.bb
index a4a16fd495..99d9f6748f 100644
--- a/meta/recipes-devtools/python/python3_3.8.2.bb
+++ b/meta/recipes-devtools/python/python3_3.8.2.bb
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \
file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \
+ file://CVE-2020-14422.patch \
"
SRC_URI_append_class-native = " \
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread