* [PATCH] ipxe: Fix gcc10 compilation
@ 2020-10-09 12:31 Bertrand Marquis
2020-10-09 12:31 ` [PATCH] xen: Fix x86_64 xen-tools installation Bertrand Marquis
[not found] ` <163C52E32AF7858D.12576@lists.yoctoproject.org>
0 siblings, 2 replies; 6+ messages in thread
From: Bertrand Marquis @ 2020-10-09 12:31 UTC (permalink / raw)
To: meta-virtualization
Add ipxe patch to pass -fcommon flag to gcc during compilation.
This patch is required to have ipxe compiling properly with gcc10.
Without it the following error occur (and multiple others of the same
kind:
bin/blib.a(epic100.o):(.bss+0x0): multiple definition of `_shared_bss';
bin/blib.a(davicom.o):(.bss+0x0): first defined here
Change-Id: Id9aed4cfe6bec9c0cbdb0b99271ddff472f1f0c3
Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
---
...cit-about-fcommon-compiler-directive.patch | 33 +++++++++++++++++++
recipes-extended/ipxe/ipxe_git.bb | 1 +
2 files changed, 34 insertions(+)
create mode 100644 recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch
diff --git a/recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch b/recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch
new file mode 100644
index 0000000..6fa5858
--- /dev/null
+++ b/recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch
@@ -0,0 +1,33 @@
+From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001
+Message-Id: <f982a712979619dbae2c6e0d741757e2ce94be11.1602165412.git.bertrand.marquis@arm.com>
+From: Bruce Rogers <brogers@suse.com>
+Date: Wed, 6 May 2020 15:03:02 -0600
+Subject: [PATCH] [build] Be explicit about -fcommon compiler directive
+
+gcc10 switched default behavior from -fcommon to -fno-common. Since
+"__shared" relies on the legacy behavior, explicitly specify it.
+
+Upstream-Status: backport
+
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+Modified-by: Michael Brown <mcb30@ipxe.org>
+Signed-off-by: Michael Brown <mcb30@ipxe.org>
+---
+ src/Makefile.housekeeping | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
+index 66d6dd44..b6c61c11 100644
+--- a/Makefile.housekeeping
++++ b/Makefile.housekeeping
+@@ -418,6 +418,7 @@ CFLAGS += -Os
+ CFLAGS += -g
+ ifeq ($(CCTYPE),gcc)
+ CFLAGS += -ffreestanding
++CFLAGS += -fcommon
+ CFLAGS += -Wall -W -Wformat-nonliteral
+ HOST_CFLAGS += -Wall -W -Wformat-nonliteral
+ endif
+--
+2.17.1
+
diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb
index fbaad30..d7c60ab 100644
--- a/recipes-extended/ipxe/ipxe_git.bb
+++ b/recipes-extended/ipxe/ipxe_git.bb
@@ -15,6 +15,7 @@ SRC_URI = " \
file://ipxe-fix-hostcc-nopie-cflags.patch \
file://ipxe-intel-Avoid-spurious-compiler-warning-on-GCC-10.patch \
file://ipxe-golan-Add-explicit-type-casts-for-nodnic_queue_pair_.patch \
+ file://build-be-explicit-about-fcommon-compiler-directive.patch \
"
FILES_${PN} = "/usr/share/firmware/*.rom"
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] xen: Fix x86_64 xen-tools installation 2020-10-09 12:31 [PATCH] ipxe: Fix gcc10 compilation Bertrand Marquis @ 2020-10-09 12:31 ` Bertrand Marquis [not found] ` <163C52E32AF7858D.12576@lists.yoctoproject.org> 1 sibling, 0 replies; 6+ messages in thread From: Bertrand Marquis @ 2020-10-09 12:31 UTC (permalink / raw) To: meta-virtualization Python related things are installed in /usr/lib and not /usr/lib64 even if xen-tools is built for x86_64 with multilib activated. Use nonarch_libdir variable for all python related files. Change-Id: I24e4336aaac4477efc5dc7426a6d9e909c98a6af Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> --- recipes-extended/xen/xen-tools.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index ace1a01..736a766 100644 --- a/recipes-extended/xen/xen-tools.inc +++ b/recipes-extended/xen/xen-tools.inc @@ -247,8 +247,8 @@ RPROVIDES_${PN}-xenstored = "virtual/xenstored" FILES_${PN}-dbg += "\ ${libdir}/xen/bin/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ ${libdir}/fs/xfs/.debug \ ${libdir}/fs/ufs/.debug \ ${libdir}/fs/ext2fs-lib/.debug \ @@ -261,8 +261,8 @@ FILES_${PN}-dbg += "\ ${libdir}exec/.debug \ ${libdir}/xen/libexec/.debug \ ${bindir}/.debug \ - ${libdir}/${PYTHON_DIR}/dist-packages/.debug \ - ${libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \ + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ " FILES_${PN}-dev = "\ @@ -497,7 +497,7 @@ FILES_${PN}-pygrub = "\ " FILES_${PN}-python = "\ - ${libdir}/${PYTHON_DIR} \ + ${nonarch_libdir}/${PYTHON_DIR} \ " FILES_${PN}-remus = "\ -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <163C52E32AF7858D.12576@lists.yoctoproject.org>]
* Re: [meta-virtualization] [PATCH] xen: Fix x86_64 xen-tools installation [not found] ` <163C52E32AF7858D.12576@lists.yoctoproject.org> @ 2020-10-15 9:28 ` Bertrand Marquis 2020-10-15 11:44 ` Bruce Ashfield 0 siblings, 1 reply; 6+ messages in thread From: Bertrand Marquis @ 2020-10-15 9:28 UTC (permalink / raw) To: meta-virtualization; +Cc: Christopher Clark, Rich Persaud, Bruce Ashfield Hi, Gentle ping :-) Cheers Bertrand > On 9 Oct 2020, at 13:31, Bertrand Marquis via lists.yoctoproject.org <bertrand.marquis=arm.com@lists.yoctoproject.org> wrote: > > Change-Id: I24e4336aaac4477efc5dc7426a6d9e909c98a6af > Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> > --- > recipes-extended/xen/xen-tools.inc | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc > index ace1a01..736a766 100644 > --- a/recipes-extended/xen/xen-tools.inc > +++ b/recipes-extended/xen/xen-tools.inc > @@ -247,8 +247,8 @@ RPROVIDES_${PN}-xenstored = "virtual/xenstored" > > FILES_${PN}-dbg += "\ > ${libdir}/xen/bin/.debug \ > - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ > - ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \ > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > ${libdir}/fs/xfs/.debug \ > ${libdir}/fs/ufs/.debug \ > ${libdir}/fs/ext2fs-lib/.debug \ > @@ -261,8 +261,8 @@ FILES_${PN}-dbg += "\ > ${libdir}exec/.debug \ > ${libdir}/xen/libexec/.debug \ > ${bindir}/.debug \ > - ${libdir}/${PYTHON_DIR}/dist-packages/.debug \ > - ${libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \ > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > " > > FILES_${PN}-dev = "\ > @@ -497,7 +497,7 @@ FILES_${PN}-pygrub = "\ > " > > FILES_${PN}-python = "\ > - ${libdir}/${PYTHON_DIR} \ > + ${nonarch_libdir}/${PYTHON_DIR} \ > " > > FILES_${PN}-remus = "\ > -- > 2.17.1 > > > > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization] [PATCH] xen: Fix x86_64 xen-tools installation 2020-10-15 9:28 ` [meta-virtualization] " Bertrand Marquis @ 2020-10-15 11:44 ` Bruce Ashfield 2020-10-15 11:54 ` Bertrand Marquis 0 siblings, 1 reply; 6+ messages in thread From: Bruce Ashfield @ 2020-10-15 11:44 UTC (permalink / raw) To: Bertrand Marquis; +Cc: meta-virtualization, Christopher Clark, Rich Persaud [-- Attachment #1: Type: text/plain, Size: 2564 bytes --] I merged this yesterday, but it is held up in my breakage of containerd. Bruce On Thu, Oct 15, 2020 at 5:28 AM Bertrand Marquis <Bertrand.Marquis@arm.com> wrote: > Hi, > > Gentle ping :-) > > Cheers > Bertrand > > > On 9 Oct 2020, at 13:31, Bertrand Marquis via lists.yoctoproject.org > <bertrand.marquis=arm.com@lists.yoctoproject.org> wrote: > > > > Change-Id: I24e4336aaac4477efc5dc7426a6d9e909c98a6af > > Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> > > --- > > recipes-extended/xen/xen-tools.inc | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/recipes-extended/xen/xen-tools.inc > b/recipes-extended/xen/xen-tools.inc > > index ace1a01..736a766 100644 > > --- a/recipes-extended/xen/xen-tools.inc > > +++ b/recipes-extended/xen/xen-tools.inc > > @@ -247,8 +247,8 @@ RPROVIDES_${PN}-xenstored = "virtual/xenstored" > > > > FILES_${PN}-dbg += "\ > > ${libdir}/xen/bin/.debug \ > > - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ > > - ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > > ${libdir}/fs/xfs/.debug \ > > ${libdir}/fs/ufs/.debug \ > > ${libdir}/fs/ext2fs-lib/.debug \ > > @@ -261,8 +261,8 @@ FILES_${PN}-dbg += "\ > > ${libdir}exec/.debug \ > > ${libdir}/xen/libexec/.debug \ > > ${bindir}/.debug \ > > - ${libdir}/${PYTHON_DIR}/dist-packages/.debug \ > > - ${libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > > " > > > > FILES_${PN}-dev = "\ > > @@ -497,7 +497,7 @@ FILES_${PN}-pygrub = "\ > > " > > > > FILES_${PN}-python = "\ > > - ${libdir}/${PYTHON_DIR} \ > > + ${nonarch_libdir}/${PYTHON_DIR} \ > > " > > > > FILES_${PN}-remus = "\ > > -- > > 2.17.1 > > > > > > > > > > IMPORTANT NOTICE: The contents of this email and any attachments are > confidential and may also be privileged. If you are not the intended > recipient, please notify the sender immediately and do not disclose the > contents to any other person, use it for any purpose, or store or copy the > information in any medium. Thank you. > -- - 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: 3675 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization] [PATCH] xen: Fix x86_64 xen-tools installation 2020-10-15 11:44 ` Bruce Ashfield @ 2020-10-15 11:54 ` Bertrand Marquis 2020-10-15 14:58 ` Bruce Ashfield 0 siblings, 1 reply; 6+ messages in thread From: Bertrand Marquis @ 2020-10-15 11:54 UTC (permalink / raw) To: Bruce Ashfield; +Cc: meta-virtualization > On 15 Oct 2020, at 12:44, Bruce Ashfield <bruce.ashfield@gmail.com> wrote: > > I merged this yesterday, but it is held up in my breakage of containerd. Ok thanks for the info Bertrand > > Bruce > > On Thu, Oct 15, 2020 at 5:28 AM Bertrand Marquis <Bertrand.Marquis@arm.com> wrote: > Hi, > > Gentle ping :-) > > Cheers > Bertrand > > > On 9 Oct 2020, at 13:31, Bertrand Marquis via lists.yoctoproject.org <bertrand.marquis=arm.com@lists.yoctoproject.org> wrote: > > > > Change-Id: I24e4336aaac4477efc5dc7426a6d9e909c98a6af > > Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> > > --- > > recipes-extended/xen/xen-tools.inc | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc > > index ace1a01..736a766 100644 > > --- a/recipes-extended/xen/xen-tools.inc > > +++ b/recipes-extended/xen/xen-tools.inc > > @@ -247,8 +247,8 @@ RPROVIDES_${PN}-xenstored = "virtual/xenstored" > > > > FILES_${PN}-dbg += "\ > > ${libdir}/xen/bin/.debug \ > > - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ > > - ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > > ${libdir}/fs/xfs/.debug \ > > ${libdir}/fs/ufs/.debug \ > > ${libdir}/fs/ext2fs-lib/.debug \ > > @@ -261,8 +261,8 @@ FILES_${PN}-dbg += "\ > > ${libdir}exec/.debug \ > > ${libdir}/xen/libexec/.debug \ > > ${bindir}/.debug \ > > - ${libdir}/${PYTHON_DIR}/dist-packages/.debug \ > > - ${libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \ > > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > > " > > > > FILES_${PN}-dev = "\ > > @@ -497,7 +497,7 @@ FILES_${PN}-pygrub = "\ > > " > > > > FILES_${PN}-python = "\ > > - ${libdir}/${PYTHON_DIR} \ > > + ${nonarch_libdir}/${PYTHON_DIR} \ > > " > > > > FILES_${PN}-remus = "\ > > -- > > 2.17.1 > > > > > > > > > > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization] [PATCH] xen: Fix x86_64 xen-tools installation 2020-10-15 11:54 ` Bertrand Marquis @ 2020-10-15 14:58 ` Bruce Ashfield 0 siblings, 0 replies; 6+ messages in thread From: Bruce Ashfield @ 2020-10-15 14:58 UTC (permalink / raw) To: Bertrand Marquis; +Cc: meta-virtualization [-- Attachment #1: Type: text/plain, Size: 3540 bytes --] On Thu, Oct 15, 2020 at 7:54 AM Bertrand Marquis <Bertrand.Marquis@arm.com> wrote: > > > > On 15 Oct 2020, at 12:44, Bruce Ashfield <bruce.ashfield@gmail.com> > wrote: > > > > I merged this yesterday, but it is held up in my breakage of containerd. > > Ok thanks for the info > > And I got containerd to build again, so this was merged along with that fix. Bruce > Bertrand > > > > > Bruce > > > > On Thu, Oct 15, 2020 at 5:28 AM Bertrand Marquis < > Bertrand.Marquis@arm.com> wrote: > > Hi, > > > > Gentle ping :-) > > > > Cheers > > Bertrand > > > > > On 9 Oct 2020, at 13:31, Bertrand Marquis via lists.yoctoproject.org > <bertrand.marquis=arm.com@lists.yoctoproject.org> wrote: > > > > > > Change-Id: I24e4336aaac4477efc5dc7426a6d9e909c98a6af > > > Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> > > > --- > > > recipes-extended/xen/xen-tools.inc | 10 +++++----- > > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > > > diff --git a/recipes-extended/xen/xen-tools.inc > b/recipes-extended/xen/xen-tools.inc > > > index ace1a01..736a766 100644 > > > --- a/recipes-extended/xen/xen-tools.inc > > > +++ b/recipes-extended/xen/xen-tools.inc > > > @@ -247,8 +247,8 @@ RPROVIDES_${PN}-xenstored = "virtual/xenstored" > > > > > > FILES_${PN}-dbg += "\ > > > ${libdir}/xen/bin/.debug \ > > > - ${libdir}/${PYTHON_DIR}/site-packages/.debug \ > > > - ${libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \ > > > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \ > > > + ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug > \ > > > ${libdir}/fs/xfs/.debug \ > > > ${libdir}/fs/ufs/.debug \ > > > ${libdir}/fs/ext2fs-lib/.debug \ > > > @@ -261,8 +261,8 @@ FILES_${PN}-dbg += "\ > > > ${libdir}exec/.debug \ > > > ${libdir}/xen/libexec/.debug \ > > > ${bindir}/.debug \ > > > - ${libdir}/${PYTHON_DIR}/dist-packages/.debug \ > > > - ${libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \ > > > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \ > > > + ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug > \ > > > " > > > > > > FILES_${PN}-dev = "\ > > > @@ -497,7 +497,7 @@ FILES_${PN}-pygrub = "\ > > > " > > > > > > FILES_${PN}-python = "\ > > > - ${libdir}/${PYTHON_DIR} \ > > > + ${nonarch_libdir}/${PYTHON_DIR} \ > > > " > > > > > > FILES_${PN}-remus = "\ > > > -- > > > 2.17.1 > > > > > > > > > > > > > > > > IMPORTANT NOTICE: The contents of this email and any attachments are > confidential and may also be privileged. If you are not the intended > recipient, please notify the sender immediately and do not disclose the > contents to any other person, use it for any purpose, or store or copy the > information in any medium. Thank you. > > > > > > -- > > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > > - "Use the force Harry" - Gandalf, Star Trek II > > > > IMPORTANT NOTICE: The contents of this email and any attachments are > confidential and may also be privileged. If you are not the intended > recipient, please notify the sender immediately and do not disclose the > contents to any other person, use it for any purpose, or store or copy the > information in any medium. Thank you. > -- - 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: 5280 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-15 14:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-09 12:31 [PATCH] ipxe: Fix gcc10 compilation Bertrand Marquis
2020-10-09 12:31 ` [PATCH] xen: Fix x86_64 xen-tools installation Bertrand Marquis
[not found] ` <163C52E32AF7858D.12576@lists.yoctoproject.org>
2020-10-15 9:28 ` [meta-virtualization] " Bertrand Marquis
2020-10-15 11:44 ` Bruce Ashfield
2020-10-15 11:54 ` Bertrand Marquis
2020-10-15 14:58 ` Bruce Ashfield
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.