[PATCH v2 2/3] xen: Add recipes for stable Xen 4.17 release and update master


Orzel, Michal
 

Add recipes for xen and tools for the newly released 4.17 version and
take the opportunity to update master recipes.

Reflect 4.17 tools changes in xen-tools.inc:
- add test-paging-mempool to test package,
- add init-dom0less script to xl package,
- add localstatedir to xencommons package (this is needed as from 4.17
onwards, there is no /var/lib/xenstored resulting in /var being
installed but not shipped in any package).

Signed-off-by: Michal Orzel <michal.orzel@...>
---
Changes in v2:
- add init-dom0less to xl package
- add localstatedir to xencommons package
---
recipes-extended/xen/xen-tools.inc | 3 +++
recipes-extended/xen/xen-tools_4.17.bb | 19 +++++++++++++++++++
recipes-extended/xen/xen-tools_git.bb | 8 ++++----
recipes-extended/xen/xen_4.17.bb | 19 +++++++++++++++++++
recipes-extended/xen/xen_git.bb | 8 ++++----
5 files changed, 49 insertions(+), 8 deletions(-)
create mode 100644 recipes-extended/xen/xen-tools_4.17.bb
create mode 100644 recipes-extended/xen/xen_4.17.bb

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index d47309a72b1c..95da2bfbb6ce 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -616,6 +616,7 @@ FILES:${PN}-xl = "\
${libdir}/xen/bin/libxl-save-helper \
${sbindir}/xl \
${libdir}/xen/bin/xen-init-dom0 \
+ ${libdir}/xen/bin/init-dom0less \
"

FILES:${PN}-xl-examples = "\
@@ -658,6 +659,7 @@ FILES:${PN}-xencommons += "\
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-init-dom0.service', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenstored.service', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/var-lib-xenstored.mount', '', d)} \
+ ${localstatedir} \
"

FILES:${PN}-xend += " \
@@ -688,6 +690,7 @@ FILES:${PN}-test += "\
${libdir}/xen/bin/test-resource \
${libdir}/xen/bin/test-cpu-policy \
${libdir}/xen/bin/test-tsx \
+ ${libdir}/xen/bin/test-paging-mempool \
"

# test-xenstore and test-resource currently only exist in 4.16
diff --git a/recipes-extended/xen/xen-tools_4.17.bb b/recipes-extended/xen/xen-tools_4.17.bb
new file mode 100644
index 000000000000..0f323cb32aac
--- /dev/null
+++ b/recipes-extended/xen/xen-tools_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_REL ?= "4.17"
+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 \
+ "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index a450a7d6574a..fd42cf2963b4 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-04-05
-SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
+# master status on 2022-12-29
+SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"

-XEN_REL ?= "4.17"
+XEN_REL ?= "4.18"
XEN_BRANCH ?= "master"

SRC_URI = " \
@@ -9,7 +9,7 @@ SRC_URI = " \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
"

-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

PV = "${XEN_REL}+git${SRCPV}"

diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb
new file mode 100644
index 000000000000..f35689d4120f
--- /dev/null
+++ b/recipes-extended/xen/xen_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+ "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index ebd1b76ff420..2138424406f9 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-04-05
-SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
+# master status on 2022-12-29
+SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"

-XEN_REL ?= "4.17"
+XEN_REL ?= "4.18"
XEN_BRANCH ?= "master"

SRC_URI = " \
@@ -9,7 +9,7 @@ SRC_URI = " \
file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
"

-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

PV = "${XEN_REL}+git${SRCPV}"

--
2.25.1


Christopher Clark
 



On Fri, Jan 6, 2023 at 6:46 AM Michal Orzel <michal.orzel@...> wrote:
Add recipes for xen and tools for the newly released 4.17 version and
take the opportunity to update master recipes.

Reflect 4.17 tools changes in xen-tools.inc:
 - add test-paging-mempool to test package,
 - add init-dom0less script to xl package,
 - add localstatedir to xencommons package (this is needed as from 4.17
   onwards, there is no /var/lib/xenstored resulting in /var being
   installed but not shipped in any package).

Signed-off-by: Michal Orzel <michal.orzel@...>

Reviewed-by: Christopher Clark <christopher.w.clark@...>

thanks
Christopher


 
---
Changes in v2:
 - add init-dom0less to xl package
 - add localstatedir to xencommons package
---
 recipes-extended/xen/xen-tools.inc     |  3 +++
 recipes-extended/xen/xen-tools_4.17.bb | 19 +++++++++++++++++++
 recipes-extended/xen/xen-tools_git.bb  |  8 ++++----
 recipes-extended/xen/xen_4.17.bb       | 19 +++++++++++++++++++
 recipes-extended/xen/xen_git.bb        |  8 ++++----
 5 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 recipes-extended/xen/xen-tools_4.17.bb
 create mode 100644 recipes-extended/xen/xen_4.17.bb

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index d47309a72b1c..95da2bfbb6ce 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -616,6 +616,7 @@ FILES:${PN}-xl = "\
     ${libdir}/xen/bin/libxl-save-helper \
     ${sbindir}/xl \
     ${libdir}/xen/bin/xen-init-dom0 \
+    ${libdir}/xen/bin/init-dom0less \
     "

 FILES:${PN}-xl-examples = "\
@@ -658,6 +659,7 @@ FILES:${PN}-xencommons += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-init-dom0.service', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenstored.service', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/var-lib-xenstored.mount', '', d)} \
+    ${localstatedir} \
     "

 FILES:${PN}-xend += " \
@@ -688,6 +690,7 @@ FILES:${PN}-test += "\
     ${libdir}/xen/bin/test-resource \
     ${libdir}/xen/bin/test-cpu-policy \
     ${libdir}/xen/bin/test-tsx \
+    ${libdir}/xen/bin/test-paging-mempool \
     "

 # test-xenstore and test-resource currently only exist in 4.16
diff --git a/recipes-extended/xen/xen-tools_4.17.bb b/recipes-extended/xen/xen-tools_4.17.bb
new file mode 100644
index 000000000000..0f323cb32aac
--- /dev/null
+++ b/recipes-extended/xen/xen-tools_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_REL ?= "4.17"
+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 \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index a450a7d6574a..fd42cf2963b4 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-04-05
-SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
+# master status on 2022-12-29
+SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"

-XEN_REL ?= "4.17"
+XEN_REL ?= "4.18"
 XEN_BRANCH ?= "master"

 SRC_URI = " \
@@ -9,7 +9,7 @@ SRC_URI = " \
     file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
     "

-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

 PV = "${XEN_REL}+git${SRCPV}"

diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb
new file mode 100644
index 000000000000..f35689d4120f
--- /dev/null
+++ b/recipes-extended/xen/xen_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index ebd1b76ff420..2138424406f9 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-04-05
-SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
+# master status on 2022-12-29
+SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"

-XEN_REL ?= "4.17"
+XEN_REL ?= "4.18"
 XEN_BRANCH ?= "master"

 SRC_URI = " \
@@ -9,7 +9,7 @@ SRC_URI = " \
     file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
     "

-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

 PV = "${XEN_REL}+git${SRCPV}"

--
2.25.1


Bruce Ashfield
 

On Fri, Jan 6, 2023 at 9:46 AM Michal Orzel <michal.orzel@...> wrote:

Add recipes for xen and tools for the newly released 4.17 version and
take the opportunity to update master recipes.

Reflect 4.17 tools changes in xen-tools.inc:
- add test-paging-mempool to test package,
- add init-dom0less script to xl package,
- add localstatedir to xencommons package (this is needed as from 4.17
onwards, there is no /var/lib/xenstored resulting in /var being
installed but not shipped in any package).
It looks like not a whole lot of folks are building 4.17 with systemd
as the init system.

I ran into a packaging area with the xenstored.mount packaging (it
isn't present in 4.17 as you noted in this commit).

I've moved that systemd package to the 4.16 versioned recipe and
pushed it to master.

Bruce


Signed-off-by: Michal Orzel <michal.orzel@...>
---
Changes in v2:
- add init-dom0less to xl package
- add localstatedir to xencommons package
---
recipes-extended/xen/xen-tools.inc | 3 +++
recipes-extended/xen/xen-tools_4.17.bb | 19 +++++++++++++++++++
recipes-extended/xen/xen-tools_git.bb | 8 ++++----
recipes-extended/xen/xen_4.17.bb | 19 +++++++++++++++++++
recipes-extended/xen/xen_git.bb | 8 ++++----
5 files changed, 49 insertions(+), 8 deletions(-)
create mode 100644 recipes-extended/xen/xen-tools_4.17.bb
create mode 100644 recipes-extended/xen/xen_4.17.bb

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index d47309a72b1c..95da2bfbb6ce 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -616,6 +616,7 @@ FILES:${PN}-xl = "\
${libdir}/xen/bin/libxl-save-helper \
${sbindir}/xl \
${libdir}/xen/bin/xen-init-dom0 \
+ ${libdir}/xen/bin/init-dom0less \
"

FILES:${PN}-xl-examples = "\
@@ -658,6 +659,7 @@ FILES:${PN}-xencommons += "\
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-init-dom0.service', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenstored.service', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/var-lib-xenstored.mount', '', d)} \
+ ${localstatedir} \
"

FILES:${PN}-xend += " \
@@ -688,6 +690,7 @@ FILES:${PN}-test += "\
${libdir}/xen/bin/test-resource \
${libdir}/xen/bin/test-cpu-policy \
${libdir}/xen/bin/test-tsx \
+ ${libdir}/xen/bin/test-paging-mempool \
"

# test-xenstore and test-resource currently only exist in 4.16
diff --git a/recipes-extended/xen/xen-tools_4.17.bb b/recipes-extended/xen/xen-tools_4.17.bb
new file mode 100644
index 000000000000..0f323cb32aac
--- /dev/null
+++ b/recipes-extended/xen/xen-tools_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_REL ?= "4.17"
+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 \
+ "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index a450a7d6574a..fd42cf2963b4 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-04-05
-SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
+# master status on 2022-12-29
+SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"

-XEN_REL ?= "4.17"
+XEN_REL ?= "4.18"
XEN_BRANCH ?= "master"

SRC_URI = " \
@@ -9,7 +9,7 @@ SRC_URI = " \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
"

-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

PV = "${XEN_REL}+git${SRCPV}"

diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb
new file mode 100644
index 000000000000..f35689d4120f
--- /dev/null
+++ b/recipes-extended/xen/xen_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+ "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index ebd1b76ff420..2138424406f9 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-04-05
-SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
+# master status on 2022-12-29
+SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"

-XEN_REL ?= "4.17"
+XEN_REL ?= "4.18"
XEN_BRANCH ?= "master"

SRC_URI = " \
@@ -9,7 +9,7 @@ SRC_URI = " \
file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
"

-LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

PV = "${XEN_REL}+git${SRCPV}"

--
2.25.1

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