* [PATCH 01/10] kern-tools: tweak symbol_why to be python safe
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 02/10] kern-tools: integrate merge_config fix for gold linker bruce.ashfield
` (10 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating the SRCREV to pickup tweaks to symbol_why.py to be
python3 safe:
- we explicitly call /usr/bin/env python3
- we full specifiy our symbols
- do not assume that 'None' can be converted to a string
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index a4c0b6fb8a..57ec1abc6d 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435
DEPENDS = "git-native"
-SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b"
+SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed"
PR = "r12"
PV = "0.2+git${SRCPV}"
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 02/10] kern-tools: integrate merge_config fix for gold linker
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
2020-02-06 17:35 ` [PATCH 01/10] kern-tools: tweak symbol_why to be python safe bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 03/10] kern-tools-native: use more common S value and oe_runmake bruce.ashfield
` (9 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Bumping the SRCREV to pickup the following fix:
Author: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed Feb 5 03:26:57 2020 +0100
merge_config.sh: pass LD variable from shell environment to make
* since 5.4 kernel Kconfig will fail immediately when it detects
that LD points to gold linker:
scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported
* in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh
but we need to pass it also into the make call here
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 57ec1abc6d..3f9cfe7fe5 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435
DEPENDS = "git-native"
-SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed"
+SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8"
PR = "r12"
PV = "0.2+git${SRCPV}"
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 03/10] kern-tools-native: use more common S value and oe_runmake
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
2020-02-06 17:35 ` [PATCH 01/10] kern-tools: tweak symbol_why to be python safe bruce.ashfield
2020-02-06 17:35 ` [PATCH 02/10] kern-tools: integrate merge_config fix for gold linker bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 04/10] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass bruce.ashfield
` (8 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../kern-tools/kern-tools-native_git.bb | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 3f9cfe7fe5..f263421234 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -1,6 +1,6 @@
SUMMARY = "Tools for managing Yocto Project style branched kernels"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501"
+LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501"
DEPENDS = "git-native"
@@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}"
inherit native
SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git"
-S = "${WORKDIR}"
+S = "${WORKDIR}/git"
UPSTREAM_CHECK_COMMITS = "1"
+do_configure() {
+ :
+}
+
do_compile() {
:
}
do_install() {
- cd ${S}/git
- make DESTDIR=${D}${bindir} install
+ oe_runmake DESTDIR=${D}${bindir} install
}
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 04/10] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (2 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 03/10] kern-tools-native: use more common S value and oe_runmake bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 05/10] kernel-yocto: Drop setting of unused variables in do_kernel_metadata bruce.ashfield
` (7 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Paul Barker <pbarker@konsulko.com>
This allows the kernel-yocto bbclass to be inherited in a recipe without
needing to include linux-yocto.inc. The bbclass should stand on its own
and linux-yocto.inc does a few things which may not be desired in other
kernel recipes (such as modifying KERNEL_FEATURES).
The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes
may not want this setting in place.
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++
meta/recipes-kernel/linux/linux-yocto.inc | 21 ---------------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 141eeafeb9..a0362f6acb 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config
PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe"
PATCH_GIT_USER_NAME ?= "OpenEmbedded"
+# The distro or local.conf should set this, but if nobody cares...
+LINUX_KERNEL_TYPE ??= "standard"
+
+# KMETA ?= ""
+KBRANCH ?= "master"
+KMACHINE ?= "${MACHINE}"
+SRCREV_FORMAT ?= "meta_machine"
+
+# LEVELS:
+# 0: no reporting
+# 1: report options that are specified, but not in the final config
+# 2: report options that are not hardware related, but set by a BSP
+KCONF_AUDIT_LEVEL ?= "1"
+KCONF_BSP_AUDIT_LEVEL ?= "0"
+KMETA_AUDIT ?= "yes"
+
# returns local (absolute) path names for all valid patches in the
# src_uri
def find_patches(d,subdir):
@@ -475,3 +491,8 @@ python () {
if 'do_diffconfig' in d:
bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d)
}
+
+# extra tasks
+addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile
+addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index f191946f2a..91df9c1cd5 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea
# and it can be specific to the machine or shared
# KMACHINE = "UNDEFINED"
-# The distro or local.conf should set this, but if nobody cares...
-LINUX_KERNEL_TYPE ??= "standard"
-
-# KMETA ?= ""
-KBRANCH ?= "master"
-KMACHINE ?= "${MACHINE}"
-SRCREV_FORMAT ?= "meta_machine"
-
-# LEVELS:
-# 0: no reporting
-# 1: report options that are specified, but not in the final config
-# 2: report options that are not hardware related, but set by a BSP
-KCONF_AUDIT_LEVEL ?= "1"
-KCONF_BSP_AUDIT_LEVEL ?= "0"
-KMETA_AUDIT ?= "yes"
-
LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}"
# Pick up shared functions
@@ -69,10 +53,5 @@ do_install_append(){
fi
}
-# extra tasks
-addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
# enable kernel-sample for oeqa/runtime/cases's ksample.py test
KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc"
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 05/10] kernel-yocto: Drop setting of unused variables in do_kernel_metadata
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (3 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 04/10] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 06/10] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set bruce.ashfield
` (6 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Paul Barker <pbarker@konsulko.com>
The machine_branch and machine_srcrev variables were set but not used in
do_kernel_metadata.
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 7 -------
1 file changed, 7 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index a0362f6acb..9a4d2864eb 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -99,13 +99,6 @@ do_kernel_metadata() {
fi
fi
- machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
- machine_srcrev="${SRCREV_machine}"
- if [ -z "${machine_srcrev}" ]; then
- # fallback to SRCREV if a non machine_meta tree is being built
- machine_srcrev="${SRCREV}"
- fi
-
# In a similar manner to the kernel itself:
#
# defconfig: $(obj)/conf
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 06/10] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (4 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 05/10] kernel-yocto: Drop setting of unused variables in do_kernel_metadata bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 07/10] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh bruce.ashfield
` (5 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Paul Barker <pbarker@konsulko.com>
CONFIG_LOCALVERSION may already be set in a defconfig or config fragment
and this should not be unconditionally overridden.
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9a4d2864eb..e8a9b1f18e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -359,8 +359,10 @@ do_kernel_configme() {
bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
fi
- echo "# Global settings from linux recipe" >> ${B}/.config
- echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
+ if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
+ echo "# Global settings from linux recipe" >> ${B}/.config
+ echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
+ fi
}
addtask kernel_configme before do_configure after do_patch
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 07/10] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (5 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 06/10] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 08/10] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created bruce.ashfield
` (4 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything
useful in .config (and also include directory isn't created):
tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build:
total 164K
drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 .
drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 ..
-rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config
-rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore
drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include
-rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile
drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts
lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source
tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build:
total 28K
drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 .
drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 ..
-rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config
-rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore
-rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile
drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts
lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source
$ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config
CONFIG_LOCALVERSION="-yocto-standard"
* and because the failure is silent, it will happily start building
kernel with default defconfig, which even builds OK for qemux86-64
but on qemux86 I've noticed this issue, because incorrectly
configured kernel build fails with:
$ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile
LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o
AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a
HOSTCC scripts/mod/mk_elfconfig
CC scripts/mod/devicetable-offsets.s
CC scripts/mod/empty.o
cc1: error: code model 'kernel' not supported in the 32 bit mode
cc1: sorry, unimplemented: 64-bit mode not compiled in
make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1
make[2]: *** Waiting for unfinished jobs....
cc1: error: code model 'kernel' not supported in the 32 bit mode
cc1: sorry, unimplemented: 64-bit mode not compiled in
make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1
make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:1111: prepare0] Error 2
make[1]: *** Waiting for unfinished jobs....
LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o
/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool
LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool
make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2
WARNING: exit code 1 from a shell command.
* the issue happens in log.do_kernel_configme, but the log is completely useless:
cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme
DEBUG: Executing python function extend_recipe_sysroot
NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot']
NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native']
NOTE: Skipping as already exists in sysroot: ['kern-tools-native', 'quilt-native']
DEBUG: sed -e 's:^[^/]*/:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/:g' /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/bison-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gcc-cross-i686/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/autoconf-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gnu-config-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/automake-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/libtool-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/gmp-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/ncurses-native/fixmepath /OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pkgconfig-native/fixmepath | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot:g; s:FIXMESTAGINGDIRHOST:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native:g' -e 's:FIXME_PSEUDO_SYSROOT:/OE/build/oe-core/tmp-glibc/sysroots-components/x86_64/pseudo-native:g' -e 's:FIXME_HOSTTOOLS_DIR:/OE/build/oe-core/tmp-glibc/hosttools:g' -e 's:FIXME_PKGDATA_DIR:/OE/build/oe-core/tmp-glibc/pkgdata/qemux86:g' -e 's:FIXME_PSEUDO_LOCALSTATEDIR:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/pseudo/:g' -e 's:FIXME_LOGFIFO:/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/fifo.10476:g'
DEBUG: Python function extend_recipe_sysroot finished
DEBUG: Executing shell function do_kernel_configme
DEBUG: Shell function do_kernel_configme finished
]because merge_config.sh is redirected to work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log
and bbfatal_log called in do_kernel_configme only when merge_config.sh fails which it should in this case
but doesn't.
The merge_config_build.log shows 5.4 specific error:
scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported
but then it happily continues reporting what isn't applied in not created
.config file
--- tmp-glibc-bfd-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:28:01.455520207 +0100
+++ tmp-glibc-gold-qemux86-do_kernel_configme/work-shared/qemux86/kernel-source/.kernel-meta/cfg/merge_config_build.log 2020-02-05 02:26:30.656470909 +0100
@@ -171,586 +171,5113 @@
HOSTCC scripts/kconfig/symbol.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --alldefconfig Kconfig
-./.tmp.config.jDjIEYi9Yq:2208:warning: unexpected data: #
-./.tmp.config.jDjIEYi9Yq:2209:warning: unexpected data: # Generic Driver Options
-./.tmp.config.jDjIEYi9Yq:2210:warning: unexpected data: #
-./.tmp.config.jDjIEYi9Yq:3102:warning: symbol value 'm' invalid for SAMPLE_SECCOMP
-./.tmp.config.jDjIEYi9Yq:3119:warning: symbol value 'm' invalid for NF_CT_PROTO_GRE
-./.tmp.config.jDjIEYi9Yq:3120:warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP
-./.tmp.config.jDjIEYi9Yq:3121:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE
-#
-# configuration written to .config
-#
+scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported
+make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/kconfig/Makefile:73: alldefconfig] Error 1
+make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:567: alldefconfig] Error 2
make[1]: Leaving directory '/OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build'
+make: *** [Makefile:179: sub-make] Error 2
+grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory
+Value requested for CONFIG_LOCALVERSION not in final .config
+Requested value: CONFIG_LOCALVERSION=""
+Actual value:
+
+grep: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config: No such file or directory
+Value requested for CONFIG_LOCALVERSION_AUTO not in final .config
+Requested value: # CONFIG_LOCALVERSION_AUTO is not set
+Actual value:
* I don't know why merge_config.sh uses separate more difficult to find merge_config_build.log
instead of leaving the output to end in log.do_kernel_configme, I'll send it as separate
commit so that it can be discussed there.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index e8a9b1f18e..f71aa7d0a6 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -354,7 +354,7 @@ do_kernel_configme() {
bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
fi
- CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
+ CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
if [ $? -ne 0 ]; then
bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
fi
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 08/10] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (6 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 07/10] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 09/10] kernel-yocto: fix defconfig detection in find_sccs() bruce.ashfield
` (3 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* for whatever reason, instead of silently continuing to build default kernel config
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f71aa7d0a6..d961901b74 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
do_kernel_configme[dirs] += "${S} ${B}"
do_kernel_configme() {
- set +e
-
# translate the kconfig_mode into something that merge_config.sh
# understands
case ${KCONFIG_MODE} in
@@ -354,8 +352,9 @@ do_kernel_configme() {
bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
fi
- CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
- if [ $? -ne 0 ]; then
+ CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs}
+
+ if [ $? -ne 0 -o ! -f ${B}/.config ]; then
bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
fi
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 09/10] kernel-yocto: fix defconfig detection in find_sccs()
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (7 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 08/10] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-06 17:35 ` [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters bruce.ashfield
` (2 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Gavin Li <gavinli@thegavinli.com>
The current code would cause a file like "config.bin" to added to the
config sources list. I am sure the intention was to add any files with
defconfig in its name and not the other way around.
Signed-off-by: Gavin Li <gavinli@thegavinli.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index d961901b74..918d101d3d 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -47,7 +47,7 @@ def find_sccs(d):
base, ext = os.path.splitext(os.path.basename(s))
if ext and ext in [".scc", ".cfg"]:
sources_list.append(s)
- elif base and base in 'defconfig':
+ elif base and 'defconfig' in base:
sources_list.append(s)
return sources_list
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (8 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 09/10] kernel-yocto: fix defconfig detection in find_sccs() bruce.ashfield
@ 2020-02-06 17:35 ` bruce.ashfield
2020-02-07 14:19 ` Martin Jansa
2020-02-06 18:02 ` ✗ patchtest: failure for kernel-yocto: consolidated pull request Patchwork
2020-02-06 19:12 ` [PATCH 00/10][v2] " Bruce Ashfield
11 siblings, 1 reply; 17+ messages in thread
From: bruce.ashfield @ 2020-02-06 17:35 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
To ensure that the kernel linker is used when allno/mod/yes config
merge_config steps were executed, the call to make was tweaked to
explicitly pass LD.
But since the variable wasn't quoted, any parameters to LD (like
the sysroot) were mistakenly passed to make, and hence could trigger
an error on some architectures.
We also tweak the logging to hightlight errors like this in the
future and avoid losing it in the noise of merge configs sometimes
overly verbose output.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 10 +++++++---
.../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 918d101d3d..31ea42580c 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -352,10 +352,14 @@ do_kernel_configme() {
bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
fi
- CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs}
-
+ CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
if [ $? -ne 0 -o ! -f ${B}/.config ]; then
- bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
+ bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}"
+ if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then
+ bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`"
+ else
+ bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log"
+ fi
fi
if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index f263421234..4f1af731d6 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249
DEPENDS = "git-native"
-SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8"
+SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9"
PR = "r12"
PV = "0.2+git${SRCPV}"
--
2.19.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters
2020-02-06 17:35 ` [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters bruce.ashfield
@ 2020-02-07 14:19 ` Martin Jansa
2020-02-07 14:45 ` Bruce Ashfield
0 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2020-02-07 14:19 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3348 bytes --]
With the LD="${KERNEL_LD}" removed here, the build with ld-is-gold doesn't
work anymore again.
Why did you remove it?
On Thu, Feb 6, 2020 at 6:37 PM <bruce.ashfield@gmail.com> wrote:
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> To ensure that the kernel linker is used when allno/mod/yes config
> merge_config steps were executed, the call to make was tweaked to
> explicitly pass LD.
>
> But since the variable wasn't quoted, any parameters to LD (like
> the sysroot) were mistakenly passed to make, and hence could trigger
> an error on some architectures.
>
> We also tweak the logging to hightlight errors like this in the
> future and avoid losing it in the noise of merge configs sometimes
> overly verbose output.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> meta/classes/kernel-yocto.bbclass | 10 +++++++---
> .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> index 918d101d3d..31ea42580c 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -352,10 +352,14 @@ do_kernel_configme() {
> bbfatal_log "Could not find configuration queue
> (${meta_dir}/config.queue)"
> fi
>
> - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC}
> ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}"
> LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags}
> ${configs}
> -
> + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC}
> ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}"
> ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} >
> ${meta_dir}/cfg/merge_config_build.log 2>&1
> if [ $? -ne 0 -o ! -f ${B}/.config ]; then
> - bbfatal_log "Could not configure
> ${KMACHINE}-${LINUX_KERNEL_TYPE}"
> + bberror "Could not generate a .config for
> ${KMACHINE}-${LINUX_KERNEL_TYPE}"
> + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then
> + bbfatal_log "`cat
> ${meta_dir}/cfg/merge_config_build.log`"
> + else
> + bbfatal_log "Details can be found at:
> ${S}/${meta_dir}/cfg/merge_config_build.log"
> + fi
> fi
>
> if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> index f263421234..4f1af731d6 100644
> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
> "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249
>
> DEPENDS = "git-native"
>
> -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8"
> +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9"
> PR = "r12"
> PV = "0.2+git${SRCPV}"
>
> --
> 2.19.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 4812 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters
2020-02-07 14:19 ` Martin Jansa
@ 2020-02-07 14:45 ` Bruce Ashfield
2020-02-07 14:46 ` Martin Jansa
0 siblings, 1 reply; 17+ messages in thread
From: Bruce Ashfield @ 2020-02-07 14:45 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
On Fri, Feb 7, 2020 at 9:20 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> With the LD="${KERNEL_LD}" removed here, the build with ld-is-gold doesn't work anymore again.
>
> Why did you remove it?
I removed it by mistake, and fixed it .. but apparently sent the wrong
version of the patch.
I'll send a v2 shortly!
Bruce
>
> On Thu, Feb 6, 2020 at 6:37 PM <bruce.ashfield@gmail.com> wrote:
>>
>> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>>
>> To ensure that the kernel linker is used when allno/mod/yes config
>> merge_config steps were executed, the call to make was tweaked to
>> explicitly pass LD.
>>
>> But since the variable wasn't quoted, any parameters to LD (like
>> the sysroot) were mistakenly passed to make, and hence could trigger
>> an error on some architectures.
>>
>> We also tweak the logging to hightlight errors like this in the
>> future and avoid losing it in the noise of merge configs sometimes
>> overly verbose output.
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
>> ---
>> meta/classes/kernel-yocto.bbclass | 10 +++++++---
>> .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
>> 2 files changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
>> index 918d101d3d..31ea42580c 100644
>> --- a/meta/classes/kernel-yocto.bbclass
>> +++ b/meta/classes/kernel-yocto.bbclass
>> @@ -352,10 +352,14 @@ do_kernel_configme() {
>> bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
>> fi
>>
>> - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs}
>> -
>> + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
>> if [ $? -ne 0 -o ! -f ${B}/.config ]; then
>> - bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
>> + bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}"
>> + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then
>> + bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`"
>> + else
>> + bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log"
>> + fi
>> fi
>>
>> if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
>> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
>> index f263421234..4f1af731d6 100644
>> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
>> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
>> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249
>>
>> DEPENDS = "git-native"
>>
>> -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8"
>> +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9"
>> PR = "r12"
>> PV = "0.2+git${SRCPV}"
>>
>> --
>> 2.19.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters
2020-02-07 14:45 ` Bruce Ashfield
@ 2020-02-07 14:46 ` Martin Jansa
0 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2020-02-07 14:46 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 4057 bytes --]
Awesome, thanks!
On Fri, Feb 7, 2020 at 3:45 PM Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:
> On Fri, Feb 7, 2020 at 9:20 AM Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >
> > With the LD="${KERNEL_LD}" removed here, the build with ld-is-gold
> doesn't work anymore again.
> >
> > Why did you remove it?
>
> I removed it by mistake, and fixed it .. but apparently sent the wrong
> version of the patch.
>
> I'll send a v2 shortly!
>
> Bruce
>
> >
> > On Thu, Feb 6, 2020 at 6:37 PM <bruce.ashfield@gmail.com> wrote:
> >>
> >> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >>
> >> To ensure that the kernel linker is used when allno/mod/yes config
> >> merge_config steps were executed, the call to make was tweaked to
> >> explicitly pass LD.
> >>
> >> But since the variable wasn't quoted, any parameters to LD (like
> >> the sysroot) were mistakenly passed to make, and hence could trigger
> >> an error on some architectures.
> >>
> >> We also tweak the logging to hightlight errors like this in the
> >> future and avoid losing it in the noise of merge configs sometimes
> >> overly verbose output.
> >>
> >> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> >> ---
> >> meta/classes/kernel-yocto.bbclass | 10 +++++++---
> >> .../recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
> >> 2 files changed, 8 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/meta/classes/kernel-yocto.bbclass
> b/meta/classes/kernel-yocto.bbclass
> >> index 918d101d3d..31ea42580c 100644
> >> --- a/meta/classes/kernel-yocto.bbclass
> >> +++ b/meta/classes/kernel-yocto.bbclass
> >> @@ -352,10 +352,14 @@ do_kernel_configme() {
> >> bbfatal_log "Could not find configuration queue
> (${meta_dir}/config.queue)"
> >> fi
> >>
> >> - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC}
> ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}"
> LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags}
> ${configs}
> >> -
> >> + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC}
> ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}"
> ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} >
> ${meta_dir}/cfg/merge_config_build.log 2>&1
> >> if [ $? -ne 0 -o ! -f ${B}/.config ]; then
> >> - bbfatal_log "Could not configure
> ${KMACHINE}-${LINUX_KERNEL_TYPE}"
> >> + bberror "Could not generate a .config for
> ${KMACHINE}-${LINUX_KERNEL_TYPE}"
> >> + if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then
> >> + bbfatal_log "`cat
> ${meta_dir}/cfg/merge_config_build.log`"
> >> + else
> >> + bbfatal_log "Details can be found at:
> ${S}/${meta_dir}/cfg/merge_config_build.log"
> >> + fi
> >> fi
> >>
> >> if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
> >> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> >> index f263421234..4f1af731d6 100644
> >> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> >> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> >> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
> "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249
> >>
> >> DEPENDS = "git-native"
> >>
> >> -SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8"
> >> +SRCREV = "c66833e1caac25279a5052fceb13213f5e4f79f9"
> >> PR = "r12"
> >> PV = "0.2+git${SRCPV}"
> >>
> >> --
> >> 2.19.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
[-- Attachment #2: Type: text/html, Size: 6094 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* ✗ patchtest: failure for kernel-yocto: consolidated pull request
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (9 preceding siblings ...)
2020-02-06 17:35 ` [PATCH 10/10] kern-tools: fix merge_config when LD contains parameters bruce.ashfield
@ 2020-02-06 18:02 ` Patchwork
2020-02-06 19:12 ` [PATCH 00/10][v2] " Bruce Ashfield
11 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2020-02-06 18:02 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
== Series Details ==
Series: kernel-yocto: consolidated pull request
Revision: 1
URL : https://patchwork.openembedded.org/series/22454/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Patch [08/10] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created
Issue Commit shortlog is too long [test_shortlog_length]
Suggested fix Edit shortlog so that it is 90 characters or less (currently 122 characters)
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 00/10][v2] kernel-yocto: consolidated pull request
2020-02-06 17:35 [PATCH 00/10][v2] kernel-yocto: consolidated pull request bruce.ashfield
` (10 preceding siblings ...)
2020-02-06 18:02 ` ✗ patchtest: failure for kernel-yocto: consolidated pull request Patchwork
@ 2020-02-06 19:12 ` Bruce Ashfield
2020-02-06 20:33 ` Bruce Ashfield
11 siblings, 1 reply; 17+ messages in thread
From: Bruce Ashfield @ 2020-02-06 19:12 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Thu, Feb 6, 2020 at 12:35 PM <bruce.ashfield@gmail.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> v2 adds a 10th patch to the series to fixup a config issue seen
> with qemuarm64. The other patches are unchanged.
Hold on queuing this quite yet.
On a clean build/test on a second machine, I saw the error pop back
up. I'll follow up shortly, once I've had a chance to look at that and
see if I missed something.
Bruce
>
> The original pull request text follows:
>
> ---------
>
> Hi all,
>
> I've kept the v5.4 content changes, as well as the kernel version default
> changes out of this series and instead focused it on the collection of
> kernel-yocto and kern-tools tweaks that I've gethered over the past few
> weeks.
>
> I have Martin's gold linker fixes included, as well as the re-org'ing of
> the linux-yocto tasks that Paul Barker did to make it usable as a single
> inherit of the bbclass.
>
> I also have a defconfig detection fix included that was sent to the list.
>
> I was able to confirm that my configuration was the same with this series
> enabled, and I was able to boot.
>
> That being said, I'll keep my eye out for any AB fallout and will continue
> some more build locally .. but I wanted to get this out today as promised.
>
> Cheers,
>
> Bruce
>
> The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4:
>
> kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +0000)
>
> are available in the Git repository at:
>
> git://git.pokylinux.org/poky-contrib zedd/kernel
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
>
> Bruce Ashfield (3):
> kern-tools: tweak symbol_why to be python safe
> kern-tools: integrate merge_config fix for gold linker
> kern-tools: fix merge_config when LD contains parameters
>
> Gavin Li (1):
> kernel-yocto: fix defconfig detection in find_sccs()
>
> Martin Jansa (3):
> kern-tools-native: use more common S value and oe_runmake
> kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh
> kernel-yocto.bbclass: do_kernel_configme: don't use +errexit,
> merge_config_build.log and fail when /.config wasn't created
>
> Paul Barker (3):
> kernel-yocto: Move defaults and tasks from linux-yocto.inc into
> bbclass
> kernel-yocto: Drop setting of unused variables in do_kernel_metadata
> kernel-yocto: Only override CONFIG_LOCALVERSION if
> LINUX_VERSION_EXTENSION is set
>
> meta/classes/kernel-yocto.bbclass | 49 +++++++++++++------
> .../kern-tools/kern-tools-native_git.bb | 13 +++--
> meta/recipes-kernel/linux/linux-yocto.inc | 21 --------
> 3 files changed, 42 insertions(+), 41 deletions(-)
>
> --
> 2.19.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] 17+ messages in thread* Re: [PATCH 00/10][v2] kernel-yocto: consolidated pull request
2020-02-06 19:12 ` [PATCH 00/10][v2] " Bruce Ashfield
@ 2020-02-06 20:33 ` Bruce Ashfield
0 siblings, 0 replies; 17+ messages in thread
From: Bruce Ashfield @ 2020-02-06 20:33 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Thu, Feb 6, 2020 at 2:12 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Thu, Feb 6, 2020 at 12:35 PM <bruce.ashfield@gmail.com> wrote:
> >
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > v2 adds a 10th patch to the series to fixup a config issue seen
> > with qemuarm64. The other patches are unchanged.
>
> Hold on queuing this quite yet.
>
> On a clean build/test on a second machine, I saw the error pop back
> up. I'll follow up shortly, once I've had a chance to look at that and
> see if I missed something.
There were some missing directories during the builds that showed
errors, but I've since removed tmp and things are building through the
kernel now.
As such, I don't have an updated patch and this series should be good
.. but I'll be waiting to see if the AB runs into what I saw.
Bruce
>
> Bruce
>
> >
> > The original pull request text follows:
> >
> > ---------
> >
> > Hi all,
> >
> > I've kept the v5.4 content changes, as well as the kernel version default
> > changes out of this series and instead focused it on the collection of
> > kernel-yocto and kern-tools tweaks that I've gethered over the past few
> > weeks.
> >
> > I have Martin's gold linker fixes included, as well as the re-org'ing of
> > the linux-yocto tasks that Paul Barker did to make it usable as a single
> > inherit of the bbclass.
> >
> > I also have a defconfig detection fix included that was sent to the list.
> >
> > I was able to confirm that my configuration was the same with this series
> > enabled, and I was able to boot.
> >
> > That being said, I'll keep my eye out for any AB fallout and will continue
> > some more build locally .. but I wanted to get this out today as promised.
> >
> > Cheers,
> >
> > Bruce
> >
> > The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4:
> >
> > kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +0000)
> >
> > are available in the Git repository at:
> >
> > git://git.pokylinux.org/poky-contrib zedd/kernel
> > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
> >
> > Bruce Ashfield (3):
> > kern-tools: tweak symbol_why to be python safe
> > kern-tools: integrate merge_config fix for gold linker
> > kern-tools: fix merge_config when LD contains parameters
> >
> > Gavin Li (1):
> > kernel-yocto: fix defconfig detection in find_sccs()
> >
> > Martin Jansa (3):
> > kern-tools-native: use more common S value and oe_runmake
> > kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh
> > kernel-yocto.bbclass: do_kernel_configme: don't use +errexit,
> > merge_config_build.log and fail when /.config wasn't created
> >
> > Paul Barker (3):
> > kernel-yocto: Move defaults and tasks from linux-yocto.inc into
> > bbclass
> > kernel-yocto: Drop setting of unused variables in do_kernel_metadata
> > kernel-yocto: Only override CONFIG_LOCALVERSION if
> > LINUX_VERSION_EXTENSION is set
> >
> > meta/classes/kernel-yocto.bbclass | 49 +++++++++++++------
> > .../kern-tools/kern-tools-native_git.bb | 13 +++--
> > meta/recipes-kernel/linux/linux-yocto.inc | 21 --------
> > 3 files changed, 42 insertions(+), 41 deletions(-)
> >
> > --
> > 2.19.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] 17+ messages in thread