Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure

["Martin Jansa" <Martin.Jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 7006 bytes --]

Hi Christopher,

any update on this?

Bruce tried to fix this MODULE_LICENSE issue recently in:
https://git.yoctoproject.org/meta-virtualization/diff/recipes-extended/uxen/uxen-guest-tools/0001-vm-support-fix-build-for-kernel-s-5.4.patch?id=844f4e1d7be32b4888193357d944fcf84170d019

but it still fails for newer kernel as shown in:
https://lists.yoctoproject.org/g/meta-virtualization/message/6927

Regards,

On Thu, Jul 29, 2021 at 7:53 PM Christopher Clark <
christopher.w.clark@gmail.com> wrote:

> On Fri, Jul 23, 2021 at 9:55 AM Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
> >
> > On Fri, Jul 23, 2021 at 9:29 AM Martin Jansa <Martin.Jansa@gmail.com>
> wrote:
> > >
> > > it builds ok with 5.4 in dunfell now, only gatesgarth with 5.8 and
> newer with 5.10 kernel are broken
> > >
> >
> > I've applied your patch, and have pushed it to the repo.
> >
> > I'm also seeing the build failure now.
> >
> > I tried to bump the version of the package, but it still has the same
> > kernel build issue. (my efforts are here:
> >
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?h=master-test&id=3ae2e9b3036890968cb9b152d128db9b47f01c89
> )
> >
> > Christoper: did you want to take a look at the uprev / fix of the build ?
>
> A quick update on this: I did take a look and repro'd the build
> failure with the current Linux 5.10 kernel.
> I've filed a ticket on the upstream project issue tracker with some
> details and am waiting on a response.
>
> Christopher
>
> >
> > Bruce
> >
> >
> > > On Fri, Jul 23, 2021 at 2:54 PM Martin Jansa via
> lists.yoctoproject.org <Martin.Jansa=gmail.com@lists.yoctoproject.org>
> wrote:
> > >>
> > >> Now with do_patch fixed it fails a bit later in do_compile with:
> > >>
> > >> | make[1]: warning: jobserver unavailable: using -j1.  Add '+' to
> parent make rule.
> > >> | make[1]: Entering directory
> '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source'
> > >> | make[2]: Entering directory
> '/OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-build-artifacts'
> > >> |   CC [M]
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.o
> > >> |
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.c:
> In function 'uxen_hypercall_init':
> > >> |
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.c:127:24:
> error: too many arguments to function '__vmalloc'
> > >> |   127 |         uxen_hcbase =  __vmalloc(PAGE_SIZE, GFP_KERNEL,
> PAGE_KERNEL_EXEC);
> > >> |       |                        ^~~~~~~~~
> > >> | In file included from
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.c:9:
> > >> |
> /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/include/linux/vmalloc.h:131:14:
> note: declared here
> > >> |   131 | extern void *__vmalloc(unsigned long size, gfp_t gfp_mask);
> > >> |       |              ^~~~~~~~~
> > >> | In file included from
> /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/include/linux/module.h:21,
> > >> |                  from
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.c:3:
> > >> |
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.c:
> At top level:
> > >> |
> /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/include/linux/module.h:182:43:
> error: expected ',' or ';' before 'KBUILD_MODFILE'
> > >> |   182 | #define MODULE_FILE     MODULE_INFO(file, KBUILD_MODFILE);
> > >> |       |                                           ^~~~~~~~~~~~~~
> > >> |
> /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/include/linux/moduleparam.h:26:61:
> note: in definition of macro '__MODULE_INFO'
> > >> |    26 |                 = __MODULE_INFO_PREFIX __stringify(tag) "="
> info
> > >> |       |
>  ^~~~
> > >> |
> /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/include/linux/module.h:182:25:
> note: in expansion of macro 'MODULE_INFO'
> > >> |   182 | #define MODULE_FILE     MODULE_INFO(file, KBUILD_MODFILE);
> > >> |       |                         ^~~~~~~~~~~
> > >> |
> /OE/build/oe-core/tmp-glibc/work-shared/qemux86-64/kernel-source/include/linux/module.h:229:34:
> note: in expansion of macro 'MODULE_FILE'
> > >> |   229 | #define MODULE_LICENSE(_license) MODULE_FILE
> MODULE_INFO(license, _license)
> > >> |       |                                  ^~~~~~~~~~~
> > >> |
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/uxen-vmsupport-linux-4.1.7/uxenhc/hypercall.c:156:1:
> note: in expansion of macro 'MODULE_LICENSE'
> > >> |   156 | MODULE_LICENSE("GPL");
> > >> |       | ^~~~~~~~~~~~~~
> > >>
> > >> at least with oe-core/master, will check with older kernel in dunfell
> next.
> > >>
> > >> On Fri, Jul 23, 2021 at 2:46 PM Martin Jansa via
> lists.yoctoproject.org <Martin.Jansa=gmail.com@lists.yoctoproject.org>
> wrote:
> > >>>
> > >>> * fixes:
> > >>>   ERROR: uxen-guest-tools-4.1.7-r0 do_patch: Command Error: 'quilt
> --quiltrc
> /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/uxen-guest-tools/4.1.7-r0/recipe-sysroot-native/etc/quiltrc
> push' exited with 0  Output:
> > >>>   stdout: Applying patch fix-Makefile-for-OE-kernel-build.patch
> > >>>   patching file Makefile
> > >>>   Hunk #1 FAILED at 1 (different line endings).
> > >>>   Hunk #2 FAILED at 19 (different line endings).
> > >>>   2 out of 2 hunks FAILED -- rejects in file Makefile
> > >>>   Patch fix-Makefile-for-OE-kernel-build.patch does not apply
> (enforce with -f)
> > >>>
> > >>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > >>> ---
> > >>>  recipes-extended/uxen/uxen-guest-tools_4.1.7.bb | 2 +-
> > >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>
> > >>> diff --git a/recipes-extended/uxen/uxen-guest-tools_4.1.7.bb
> b/recipes-extended/uxen/uxen-guest-tools_4.1.7.bb
> > >>> index 757f1e3..4dcfe51 100644
> > >>> --- a/recipes-extended/uxen/uxen-guest-tools_4.1.7.bb
> > >>> +++ b/recipes-extended/uxen/uxen-guest-tools_4.1.7.bb
> > >>> @@ -19,4 +19,4 @@ LIC_FILES_CHKSUM =
> "file://../Bromium-4.1.8-Open-Source-Software.pdf;md5=cf120df
> > >>>
> > >>>  S = "${WORKDIR}/uxen-vmsupport-linux-${PV}"
> > >>>
> > >>> -inherit module
> > >>> +inherit module dos2unix
> > >>> --
> > >>> 2.30.2
> > >>>
> > >>>
> > >>>
> > >>>
> > >>
> > >>
> > >>
> > >
> > > 
> > >
> >
> >
> > --
> > - 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: 10148 bytes --]