Skip to contentSkip to conversation

xen-tools: Fix build with GCC 12

PATCH In review Khem Raj 2 participants 4 messages May 9, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 xen-tools: Fix build with GCC 12

Cc Bruce Ashfield <[email protected]>
---
 recipes-extended/xen/xen-tools_4.16.bb | 1 +
 1 file changed, 1 insertion(+)
recipes-extended/xen/xen-tools_4.16.bb +1 -0
index ae1ae8a..be27cf7 100644
@@ -7,6 +7,7 @@ XEN_BRANCH ?= "stable-${XEN_REL}"
 SRC_URI = " \
     git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
     file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+    file://xen-fix-gcc12-build-issues.patch \
     "
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
Signature · 1 line
2.36.1
author
#1 lore raw

PATCH 2/2 seabios: Upgrade to 1.16 release

Pin to use gcc as compiler always

Cc Bruce Ashfield <[email protected]>
---
 .../seabios/{seabios_1.14.0.bb => seabios_1.16.0.bb}       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename recipes-extended/seabios/{seabios_1.14.0.bb => seabios_1.16.0.bb} (87%)
recipes-extended/seabios/seabios_1.16.0.bb renamed from recipes-extended/seabios/seabios_1.14.0.bb +4 -3
similarity index 87%
rename from recipes-extended/seabios/seabios_1.14.0.bb
rename to recipes-extended/seabios/seabios_1.16.0.bb
index a090756..ebab54b 100644
@@ -15,9 +15,7 @@ S = "${WORKDIR}/${PN}-${PV}"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
                     file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
                     "
-
-SRC_URI[md5sum] = "9df3b7de6376850d09161137e7a9b61f"
-SRC_URI[sha256sum] = "eb70cc62b29aa83e10a653233acebf4bb154d00d0c87dc2a2c6e2da75e5e81fd"
+SRC_URI[sha256sum] = "d44d8e97ad56f3fd23ed3076077a770d37a5e7bae22daa59656ff41c3334fb34"
 
 FILES:${PN} = "/usr/share/firmware"
 
@@ -27,6 +25,9 @@ TUNE_CCARGS = ""
 EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
 EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
 
+# Can not yet compile with clang e.g.
+TOOLCHAIN = "gcc"
+
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 
 do_configure() {
Signature · 1 line
2.36.1
#2 lore raw

Re: [meta-virtualization][PATCH 2/2] seabios: Upgrade to 1.16 release

merged.

Bruce

Quoted 41 lines · Khem Raj

Pin to use gcc as compiler always

Cc Bruce Ashfield <[email protected]>
---
 .../seabios/{seabios_1.14.0.bb => seabios_1.16.0.bb}       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename recipes-extended/seabios/{seabios_1.14.0.bb => seabios_1.16.0.bb} (87%)
recipes-extended/seabios/seabios_1.16.0.bb renamed from recipes-extended/seabios/seabios_1.14.0.bb +4 -4
similarity index 87%
rename from recipes-extended/seabios/seabios_1.14.0.bb
rename to recipes-extended/seabios/seabios_1.16.0.bb
index a090756..ebab54b 100644
@@ -15,9 +15,7 @@ S = "${WORKDIR}/${PN}-${PV}"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
                     file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
                     "
-
-SRC_URI[md5sum] = "9df3b7de6376850d09161137e7a9b61f"
-SRC_URI[sha256sum] = "eb70cc62b29aa83e10a653233acebf4bb154d00d0c87dc2a2c6e2da75e5e81fd"
+SRC_URI[sha256sum] = "d44d8e97ad56f3fd23ed3076077a770d37a5e7bae22daa59656ff41c3334fb34"
 
 FILES:${PN} = "/usr/share/firmware"
 
@@ -27,6 +25,9 @@ TUNE_CCARGS = ""
 EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
 EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
 
+# Can not yet compile with clang e.g.
+TOOLCHAIN = "gcc"
+
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 
 do_configure() {
--

2.36.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw
In reply to Khem Raj

It built fine here.

merged

Bruce

Quoted 22 lines · Khem Raj
Cc Bruce Ashfield <[email protected]>
---
 recipes-extended/xen/xen-tools_4.16.bb | 1 +
 1 file changed, 1 insertion(+)
recipes-extended/xen/xen-tools_4.16.bb +1 -1
index ae1ae8a..be27cf7 100644
@@ -7,6 +7,7 @@ XEN_BRANCH ?= "stable-${XEN_REL}"
 SRC_URI = " \
     git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
     file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+    file://xen-fix-gcc12-build-issues.patch \
     "
 
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
--

2.36.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II