Skip to contentSkip to conversation

xen: uprev to 4.13.0

PATCH In review Brendan Kerrigan 3 participants 10 messages Jan 13, 2020 – Jan 17, 2020 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

cover xen: uprev to 4.13.0

From: Brendan Kerrigan <[email protected]>

Uprev xen to 4.13.0 release

Brendan Kerrigan (3):
xen: add flag to ignore warning "address-of-packed-member"
xen: add package for xen-ucode
xen: upgrade to 4.13.0

 ...01-python-pygrub-pass-DISTUTILS-xen.4.13.patch} |  3 +++
 recipes-extended/xen/xen.inc                       |  8 ++++++++
 recipes-extended/xen/xen_4.12.0.bb                 | 12 ------------
 recipes-extended/xen/xen_4.13.0.bb                 | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)
 rename recipes-extended/xen/files/{0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch => 0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch} (96%)
 delete mode 100644 recipes-extended/xen/xen_4.12.0.bb
 create mode 100644 recipes-extended/xen/xen_4.13.0.bb
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 xen: add flag to ignore warning "address-of-packed-member"

From: Brendan Kerrigan <[email protected]>

---
 recipes-extended/xen/xen.inc | 2 ++
 1 file changed, 2 insertions(+)
recipes-extended/xen/xen.inc +2 -0
index 628e52b..a77b0d7 100644
@@ -925,6 +925,8 @@ CC += "${@['', '-gno-record-gcc-switches -Wno-builtin-macro-redefined -D__FILE__
                '-fdebug-prefix-map=${WORKDIR}=${PN}'] \
           [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}"
 
+CC += " -Wno-address-of-packed-member "
+
 # check for XSM in package config to allow XSM_ENABLE to be set
 python () {
     pkgconfig = d.getVar('PACKAGECONFIG')
Signature · 1 line
2.20.1
#2 lore raw

Re: [meta-virtualization] [PATCH 1/3] xen: add flag to ignore warning "address-of-packed-member"

Quoted 13 lines · Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

---
 recipes-extended/xen/xen.inc | 2 ++
 1 file changed, 2 insertions(+)
recipes-extended/xen/xen.inc +0 -0
index 628e52b..a77b0d7 100644

recipes-extended/xen/xen.inc CC += "${@['', '-gno-record-gcc-switches -Wno-builtin-macro-redefined -D__FILE__ · line 929

Quoted 5 lines
recipes-extended/xen/xen.inc +2 -0
@@ -925,6 +925,8 @@ CC += "${@['', '-gno-record-gcc-switches -Wno-builtin-macro-redefined -D__FILE__
                '-fdebug-prefix-map=${WORKDIR}=${PN}'] \
           [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}"
 
+CC += " -Wno-address-of-packed-member "
+

I don't think we should make this addition - it looks like the build issues that I think this is intended to work around have been resolved in a more recent minor version of Xen 4.12.
Please could you replace this commit with one that renames xen_4.12.0.bb to xen_4.12.2.bb, with updated SRC_URI checksums, and verify that it builds correctly?

Christopher

Quoted 7 lines
recipes-extended/xen/xen.inc +0 -1
 # check for XSM in package config to allow XSM_ENABLE to be set
 python () {
     pkgconfig = d.getVar('PACKAGECONFIG')
--

2.20.1

#3 lore raw

PATCH 2/3 xen: add package for xen-ucode

In reply to Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

---
 recipes-extended/xen/xen.inc | 6 ++++++
 1 file changed, 6 insertions(+)
recipes-extended/xen/xen.inc +6 -0
index a77b0d7..ed56e38 100644
@@ -74,6 +74,7 @@ RDEPENDS_${PN}-base = "\
     ${PN}-fsimage \
     ${PN}-scripts-block \
     ${PN}-scripts-network \
+    ${PN}-ucode \
     ${PN}-xen-watchdog \
     ${PN}-xencommons \
     ${PN}-xendomains \
@@ -216,6 +217,7 @@ PACKAGES = "\
     ${PN}-scripts-network \
     ${PN}-shim \
     ${PN}-staticdev \
+    ${PN}-ucode \
     ${PN}-volatiles \
     ${PN}-xcutils \
     ${PN}-xencommons \
@@ -673,6 +675,10 @@ FILES_${PN}-shim = " \
     ${libdir}/xen/boot/xen-shim \
     "
 
+FILES_${PN}-ucode = " \
+    ${sbindir}/xen-ucode \
+    "
+
 FILES_${PN}-volatiles = "\
     ${sysconfdir}/default/volatiles/99_xen \
     ${sysconfdir}/tmpfiles.d/xen.conf \
Signature · 1 line
2.20.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [meta-virtualization] [PATCH 2/3] xen: add package for xen-ucode

Quoted 4 lines · Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

Quoted 39 lines
---
 recipes-extended/xen/xen.inc | 6 ++++++
 1 file changed, 6 insertions(+)
recipes-extended/xen/xen.inc +6 -1
index a77b0d7..ed56e38 100644
@@ -74,6 +74,7 @@ RDEPENDS_${PN}-base = "\
     ${PN}-fsimage \
     ${PN}-scripts-block \
     ${PN}-scripts-network \
+    ${PN}-ucode \
     ${PN}-xen-watchdog \
     ${PN}-xencommons \
     ${PN}-xendomains \
@@ -216,6 +217,7 @@ PACKAGES = "\
     ${PN}-scripts-network \
     ${PN}-shim \
     ${PN}-staticdev \
+    ${PN}-ucode \
     ${PN}-volatiles \
     ${PN}-xcutils \
     ${PN}-xencommons \
@@ -673,6 +675,10 @@ FILES_${PN}-shim = " \
     ${libdir}/xen/boot/xen-shim \
     "
 
+FILES_${PN}-ucode = " \
+    ${sbindir}/xen-ucode \
+    "
+
 FILES_${PN}-volatiles = "\
     ${sysconfdir}/default/volatiles/99_xen \
     ${sysconfdir}/tmpfiles.d/xen.conf \
--

2.20.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw

Re: [meta-virtualization] [PATCH 2/3] xen: add package for xen-ucode

Quoted 37 lines · Christopher Clark via Lists.Yoctoproject.Org
Quoted 4 lines · Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

Quoted 28 lines
---
 recipes-extended/xen/xen.inc | 6 ++++++
 1 file changed, 6 insertions(+)
recipes-extended/xen/xen.inc +2 -0
index a77b0d7..ed56e38 100644
@@ -74,6 +74,7 @@ RDEPENDS_${PN}-base = "\
     ${PN}-fsimage \
     ${PN}-scripts-block \
     ${PN}-scripts-network \
+    ${PN}-ucode \
     ${PN}-xen-watchdog \
     ${PN}-xencommons \
     ${PN}-xendomains \
@@ -216,6 +217,7 @@ PACKAGES = "\
     ${PN}-scripts-network \
     ${PN}-shim \
     ${PN}-staticdev \
+    ${PN}-ucode \
     ${PN}-volatiles \
     ${PN}-xcutils \
     ${PN}-xencommons \
@@ -673,6 +675,10 @@ FILES_${PN}-shim = " \
     ${libdir}/xen/boot/xen-shim \
     "
 
Quoted 9 lines
Quoted 9 lines
recipes-extended/xen/xen.inc +4 -1
+FILES_${PN}-ucode = " \
+    ${sbindir}/xen-ucode \
+    "
+
 FILES_${PN}-volatiles = "\
     ${sysconfdir}/default/volatiles/99_xen \
     ${sysconfdir}/tmpfiles.d/xen.conf \
--

2.20.1

After a bit more testing with this, I think this commit should be
revised: adding the ucode package to RDEPENDS_${PN}-base breaks the compatability of xen.inc with versions of Xen prior to 4.13, where that package is not produced. Adding it instead to RRECOMMENDS_${PN}-base should avoid that, and I think better reflects the status of that tool as recommended but still optional.

Christopher

Quoted 3 lines
Quoted 2 lines
#7 lore raw

PATCH 3/3 xen: upgrade to 4.13.0

In reply to Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

---
 ...01-python-pygrub-pass-DISTUTILS-xen.4.13.patch} |  3 +++
 recipes-extended/xen/xen_4.12.0.bb                 | 12 ------------
 recipes-extended/xen/xen_4.13.0.bb                 | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename recipes-extended/xen/files/{0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch => 0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch} (96%)
 delete mode 100644 recipes-extended/xen/xen_4.12.0.bb
 create mode 100644 recipes-extended/xen/xen_4.13.0.bb
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch renamed from recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch +3 -0
similarity index 96%
rename from recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch
rename to recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch
index 6504d86..630fe05 100644
@@ -13,6 +13,9 @@ Signed-off-by: Maciej Pijanowski <[email protected]>
 Forward-ported to Xen 4.12.0
 Signed-off-by: Christopher Clark <[email protected]>
 
+Forward-ported to Xen 4.13.0
+Signed-off-by: Brendan Kerrigan <[email protected]>
+
 diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
 index 3063c49..513314b 100644
 --- a/tools/pygrub/Makefile
recipes-extended/xen/xen_4.12.0.bb deleted +0 -12
deleted file mode 100644
index 246be7a..0000000
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-require xen.inc
-
-SRC_URI = " \
-    https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz \
-    file://0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch \
-    "
-
-SRC_URI[md5sum] = "7d24d4541e3025421e02384cabc3528b"
-SRC_URI[sha256sum] = "6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64"
-
-S = "${WORKDIR}/xen-${PV}"
recipes-extended/xen/xen_4.13.0.bb new file +14 -0
new file mode 100644
index 0000000..856b3df
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+require xen.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
+
+SRC_URI = " \
+    https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz \
+    file://0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch \
+    "
+
+SRC_URI[md5sum] = "d3b13c4c785601be2f104eaddd7c6a00"
+SRC_URI[sha256sum] = "c69ae21b2ddeaf25532a81a448fcc6a218bc56f93c8907b2d416b2d4339c0afe"
+
+S = "${WORKDIR}/xen-${PV}"
Signature · 1 line
2.20.1
#8 lore raw

Re: [meta-virtualization] [PATCH 3/3] xen: upgrade to 4.13.0

Quoted 4 lines · Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

This patch is good; it will just need a respin when the first patch in the series is updated.

A minor change, given that this adds an updated LIC_FILES_CHKSUM to the versioned Xen recipe file:
I think that the LIC_FILES_CHKSUM line should be removed from xen.inc and one added to xen_git.bb, since it is a version-dependent value now.

With that change: Reviewed-by: Christopher Clark
<[email protected]>

thanks

Christopher

Quoted 68 lines
---
 ...01-python-pygrub-pass-DISTUTILS-xen.4.13.patch} |  3 +++
 recipes-extended/xen/xen_4.12.0.bb                 | 12 ------------
 recipes-extended/xen/xen_4.13.0.bb                 | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename recipes-extended/xen/files/{0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch => 0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch} (96%)
 delete mode 100644 recipes-extended/xen/xen_4.12.0.bb
 create mode 100644 recipes-extended/xen/xen_4.13.0.bb
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch renamed from recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch +3 -0
similarity index 96%
rename from recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch
rename to recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch
index 6504d86..630fe05 100644
@@ -13,6 +13,9 @@ Signed-off-by: Maciej Pijanowski <[email protected]>
 Forward-ported to Xen 4.12.0
 Signed-off-by: Christopher Clark <[email protected]>
 
+Forward-ported to Xen 4.13.0
+Signed-off-by: Brendan Kerrigan <[email protected]>
+
 diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
 index 3063c49..513314b 100644
 --- a/tools/pygrub/Makefile
recipes-extended/xen/xen_4.12.0.bb deleted +0 -12
deleted file mode 100644
index 246be7a..0000000
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-require xen.inc
-
-SRC_URI = " \
-    https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz \
-    file://0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch \
-    "
-
-SRC_URI[md5sum] = "7d24d4541e3025421e02384cabc3528b"
-SRC_URI[sha256sum] = "6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64"
-
-S = "${WORKDIR}/xen-${PV}"
recipes-extended/xen/xen_4.13.0.bb new file +14 -1
new file mode 100644
index 0000000..856b3df
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+require xen.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
+
+SRC_URI = " \
+    https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz \
+    file://0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch \
+    "
+
+SRC_URI[md5sum] = "d3b13c4c785601be2f104eaddd7c6a00"
+SRC_URI[sha256sum] = "c69ae21b2ddeaf25532a81a448fcc6a218bc56f93c8907b2d416b2d4339c0afe"
+
+S = "${WORKDIR}/xen-${PV}"
--

2.20.1

#9 lore raw
In reply to Brendan Kerrigan
Quoted 4 lines · Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

Uprev xen to 4.13.0 release

Thanks, Brendan -- I'm working on a review for this series now.

Christopher

Quoted 19 lines

Brendan Kerrigan (3):
xen: add flag to ignore warning "address-of-packed-member"
xen: add package for xen-ucode
xen: upgrade to 4.13.0

 ...01-python-pygrub-pass-DISTUTILS-xen.4.13.patch} |  3 +++
 recipes-extended/xen/xen.inc                       |  8 ++++++++
 recipes-extended/xen/xen_4.12.0.bb                 | 12 ------------
 recipes-extended/xen/xen_4.13.0.bb                 | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)
 rename recipes-extended/xen/files/{0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch => 0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch} (96%)
 delete mode 100644 recipes-extended/xen/xen_4.12.0.bb
 create mode 100644 recipes-extended/xen/xen_4.13.0.bb

--
2.20.1

#10 lore raw
Quoted 9 lines · Christopher Clark
Quoted 4 lines · Brendan Kerrigan

From: Brendan Kerrigan <[email protected]>

Uprev xen to 4.13.0 release

Thanks, Brendan -- I'm working on a review for this series now.

Given the review comments (thanks!!), I've dropped this series for now, and will wait for a v2.

Bruce

Quoted 22 lines

Christopher

Quoted 19 lines

Brendan Kerrigan (3):
xen: add flag to ignore warning "address-of-packed-member"
xen: add package for xen-ucode
xen: upgrade to 4.13.0

 ...01-python-pygrub-pass-DISTUTILS-xen.4.13.patch} |  3 +++
 recipes-extended/xen/xen.inc                       |  8 ++++++++
 recipes-extended/xen/xen_4.12.0.bb                 | 12 ------------
 recipes-extended/xen/xen_4.13.0.bb                 | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)
 rename recipes-extended/xen/files/{0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch => 0001-python-pygrub-pass-DISTUTILS-xen.4.13.patch} (96%)
 delete mode 100644 recipes-extended/xen/xen_4.12.0.bb
 create mode 100644 recipes-extended/xen/xen_4.13.0.bb

--
2.20.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