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). Cheers, Bruce > > 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 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core