* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure [not found] <16946C428749E68B.14137@lists.yoctoproject.org> @ 2021-07-23 12:54 ` Martin Jansa [not found] ` <16946CAE23AAF8C1.14473@lists.yoctoproject.org> 1 sibling, 0 replies; 8+ messages in thread From: Martin Jansa @ 2021-07-23 12:54 UTC (permalink / raw) To: Martin Jansa; +Cc: meta-virtualization, Christopher Clark [-- Attachment #1: Type: text/plain, Size: 4640 bytes --] 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 > > > > > [-- Attachment #2: Type: text/html, Size: 5870 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <16946CAE23AAF8C1.14473@lists.yoctoproject.org>]
* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure [not found] ` <16946CAE23AAF8C1.14473@lists.yoctoproject.org> @ 2021-07-23 13:29 ` Martin Jansa 2021-07-23 16:55 ` Bruce Ashfield 0 siblings, 1 reply; 8+ messages in thread From: Martin Jansa @ 2021-07-23 13:29 UTC (permalink / raw) To: Martin Jansa; +Cc: meta-virtualization, Christopher Clark [-- Attachment #1: Type: text/plain, Size: 5048 bytes --] it builds ok with 5.4 in dunfell now, only gatesgarth with 5.8 and newer with 5.10 kernel are broken 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 >> >> >> >> >> > > > [-- Attachment #2: Type: text/html, Size: 6490 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure 2021-07-23 13:29 ` Martin Jansa @ 2021-07-23 16:55 ` Bruce Ashfield 2021-07-29 17:53 ` Christopher Clark 0 siblings, 1 reply; 8+ messages in thread From: Bruce Ashfield @ 2021-07-23 16:55 UTC (permalink / raw) To: Martin Jansa; +Cc: meta-virtualization, Christopher Clark 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 ? 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure 2021-07-23 16:55 ` Bruce Ashfield @ 2021-07-29 17:53 ` Christopher Clark 2021-11-30 15:36 ` Martin Jansa [not found] ` <16BC5CFE06DCDDB2.14741@lists.yoctoproject.org> 0 siblings, 2 replies; 8+ messages in thread From: Christopher Clark @ 2021-07-29 17:53 UTC (permalink / raw) To: Bruce Ashfield; +Cc: Martin Jansa, meta-virtualization 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure 2021-07-29 17:53 ` Christopher Clark @ 2021-11-30 15:36 ` Martin Jansa [not found] ` <16BC5CFE06DCDDB2.14741@lists.yoctoproject.org> 1 sibling, 0 replies; 8+ messages in thread From: Martin Jansa @ 2021-11-30 15:36 UTC (permalink / raw) To: Christopher Clark; +Cc: Bruce Ashfield, meta-virtualization [-- 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 --] ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <16BC5CFE06DCDDB2.14741@lists.yoctoproject.org>]
* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure [not found] ` <16BC5CFE06DCDDB2.14741@lists.yoctoproject.org> @ 2021-11-30 16:51 ` Martin Jansa 2021-12-08 1:39 ` Christopher Clark 0 siblings, 1 reply; 8+ messages in thread From: Martin Jansa @ 2021-11-30 16:51 UTC (permalink / raw) To: martin.jansa; +Cc: Christopher Clark, Bruce Ashfield, meta-virtualization [-- Attachment #1: Type: text/plain, Size: 7973 bytes --] I've found the cause of MODULE_LICENSE issue and sent updated PATCHv2, see: https://lists.yoctoproject.org/g/meta-virtualization/message/6929 https://lists.yoctoproject.org/g/meta-virtualization/message/6930 Christopher can you please try to upstream these changes for newer kernels? Me and Bruce both failed to find up2date upstream repo, but you mentioned before that you have reported the issue in some upstream bugtracker (where you can possibly propose these changes). I never used uxen-guest-tools, I was fixing it just to resolve build failures in world builds, so I haven't tested it in runtime at all. Regards, On Tue, Nov 30, 2021 at 4:36 PM Martin Jansa via lists.yoctoproject.org <Martin.Jansa=gmail.com@lists.yoctoproject.org> wrote: > 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: 11543 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure 2021-11-30 16:51 ` Martin Jansa @ 2021-12-08 1:39 ` Christopher Clark 0 siblings, 0 replies; 8+ messages in thread From: Christopher Clark @ 2021-12-08 1:39 UTC (permalink / raw) To: Martin Jansa; +Cc: Bruce Ashfield, meta-virtualization [-- Attachment #1: Type: text/plain, Size: 8971 bytes --] On Tue, Nov 30, 2021 at 8:52 AM Martin Jansa <martin.jansa@gmail.com> wrote: > I've found the cause of MODULE_LICENSE issue and sent updated PATCHv2, see: > https://lists.yoctoproject.org/g/meta-virtualization/message/6929 > https://lists.yoctoproject.org/g/meta-virtualization/message/6930 > Hi Martin, Bruce Apologies for taking a long time to reply to the work on the uxen tools and thanks to both of you for your patches. > Christopher can you please try to upstream these changes for newer > kernels? Me and Bruce both failed to find up2date upstream repo, but you > mentioned before that you have reported the issue in some upstream > bugtracker (where you can possibly propose these changes). > Ack, and I agree, I would like to get this fixed upstream to retire the patches. The issue tracker is https://github.com/uxen-virt/uxen/issues and I'll add a reference to that to the recipe in my next update to it. > > I never used uxen-guest-tools, I was fixing it just to resolve build > failures in world builds, so I haven't tested it in runtime at all. > Ack - thanks for addressing the build issue. I've now studied the patches, the uxen tools driver code and code in Linux, and believe that some additional changes may be necessary for the newer kernels - I will look into that (I will need a bit of time, with holidays, end of year etc. - hope that's ok). Christopher > > Regards, > > On Tue, Nov 30, 2021 at 4:36 PM Martin Jansa via lists.yoctoproject.org > <Martin.Jansa=gmail.com@lists.yoctoproject.org> wrote: > >> 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: 13333 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure @ 2021-07-23 12:46 Martin Jansa 0 siblings, 0 replies; 8+ messages in thread From: Martin Jansa @ 2021-07-23 12:46 UTC (permalink / raw) To: meta-virtualization; +Cc: christopher.w.clark, Martin Jansa * 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-12-08 1:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <16946C428749E68B.14137@lists.yoctoproject.org>
2021-07-23 12:54 ` [meta-virtualization][dunfell][gatesgarth][hardknott][master][PATCH] uxen-guest-tools: inherit dos2unix to fix do_patch failure Martin Jansa
[not found] ` <16946CAE23AAF8C1.14473@lists.yoctoproject.org>
2021-07-23 13:29 ` Martin Jansa
2021-07-23 16:55 ` Bruce Ashfield
2021-07-29 17:53 ` Christopher Clark
2021-11-30 15:36 ` Martin Jansa
[not found] ` <16BC5CFE06DCDDB2.14741@lists.yoctoproject.org>
2021-11-30 16:51 ` Martin Jansa
2021-12-08 1:39 ` Christopher Clark
2021-07-23 12:46 Martin Jansa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.