On Wed, Feb 05, 2020 at 09:39:25AM -0500, Bruce Ashfield wrote: > On Wed, Feb 5, 2020 at 8:57 AM Martin Jansa <martin.ja...@gmail.com> wrote: > > > > OK, the patchdir cleanup won't be needed as you've already applied that > > .patch file in the repo. > > > > But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the > > "git/" anymore as it's relative to ${S}. > > > > LIC_FILES_CHKSUM = > > "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" > > > > Please adjust in your consolidated pull requests. > > Absolutely, I tweaked and squashed it here. > > But I've definitely taken the cleanups, since there's no valid reason > to make it so hard to patch (even if I grab and merge things).
BTW there is still another issue with gold enabled builds in runtime When running "bitbake -k -c testimage core-image-sato-sdk-ptest" to test my artifacts changes I've noticed: Stopped HTTPService on 0.0.0.0:0 Traceback (most recent call last): File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) [Previous line repeated 2 more times] File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/runtime/cases/kernelmodule.py", line 46, in test_kernel_module self.assertEqual(status, 0, msg='\n'.join([cmd, output])) AssertionError: 2 != 0 : cd /usr/src/kernel && make scripts prepare HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o HOSTCC scripts/kconfig/expr.o LEX scripts/kconfig/lexer.lex.c YACC scripts/kconfig/parser.tab.[ch] HOSTCC scripts/kconfig/lexer.lex.o HOSTCC scripts/kconfig/parser.tab.o HOSTCC scripts/kconfig/preprocess.o HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --syncconfig Kconfig scripts/Kconfig.include:39: gold linker 'ld' not supported make[2]: *** [scripts/kconfig/Makefile:73: syncconfig] Error 1 make[1]: *** [Makefile:567: syncconfig] Error 2 make: *** [Makefile:678: include/config/auto.conf.cmd] Error 2 make: *** [include/config/auto.conf.cmd] Deleting file 'include/config/tristate.conf' Looks like kernelmodule.py also needs to be adjusted to pass KERNEL_LD as LD. Regards, > > On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield <bruce.ashfi...@gmail.com> > > wrote: > >> > >> On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa <martin.ja...@gmail.com> wrote: > >> > > >> > Signed-off-by: Martin Jansa <martin.ja...@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 8053483355..28080e510f 100644 > >> > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" > >> > inherit native > >> > > >> > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" > >> > -S = "${WORKDIR}" > >> > +S = "${WORKDIR}/git" > >> > >> While not common, this was on purpose. This isn't something that is > >> typically patched, it is something I queue and bump for release. > >> > >> So I'm ok with the cleanup, but I'll drop the patch tweaking part when > >> I queue for test, since I'll have the patch already in the repo. > >> > >> Bruce > >> > >> > UPSTREAM_CHECK_COMMITS = "1" > >> > > >> > +do_configure() { > >> > + : > >> > +} > >> > + > >> > do_compile() { > >> > : > >> > } > >> > > >> > do_install() { > >> > - cd ${S}/git > >> > - make DESTDIR=${D}${bindir} install > >> > + oe_runmake DESTDIR=${D}${bindir} install > >> > } > >> > > >> > -SRC_URI += > >> > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > >> > +SRC_URI += > >> > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" > >> > -- > >> > 2.20.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
signature.asc
Description: PGP signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core