On Thu, Jan 5, 2023 at 5:54 AM Michal Orzel <[email protected]> wrote:
> Add recipes for xen and tools for the newly released 4.17 version and > take the opportunity to update master recipes. > Thanks for taking this on, Michal. > > Reflect 4.17 tools changes in xen-tools.inc: > - add test-paging-mempool to test package, > - add a new package init-dom0less that contains init-dom0less script, > This tool requires control domain privileges and it depends upon several Xen libraries including libxl, so would it be better to just include in the standard xl package, alongside the existing xen-init-dom0? If it does belong in a new separate package, would it make sense for any of the existing packages to RRECOMMEND it, to ensure that it gets installed where it is expected to be present? > - add localstatedir to dev package. > (I've replied to your comment about localstatedir below.) > > Signed-off-by: Michal Orzel <[email protected]> > --- > Adding localstatedir to dev package is a little quirk just to keep the old > behavior unchanged and silence Yocto installed-but-not-shipped error. > The reason being, 4.17 onwards removed /var/lib/xenstored as it is mostly > unused. This leaves the build with empty /var and /var/lib. There are other > possible ways to handle this problem. We could remove the complete > localstatedir > while removing installed volatiles or add some checks for the version. > Suggestions are welcomed. > In the same xen-tools.inc file, there is a reference to var-lib-xenstored in the SYSTEMD_SERVICE declaration for the xencommons package, so: would it make more sense to add localstatedir to xencommons, which is typically installed in the control domain, rather than the dev package, which is not? That should handle the case where there does happen to be a runtime dependency in the Xen tools on the presence of a /var/lib directory. > --- > recipes-extended/xen/xen-tools.inc | 8 ++++++++ > 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, 54 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..1a422255014e 100644 > --- a/recipes-extended/xen/xen-tools.inc > +++ b/recipes-extended/xen/xen-tools.inc > @@ -212,6 +212,7 @@ PACKAGES = " \ > ${PN}-test \ > ${PN}-xen-vmtrace \ > ${PN}-xen-mceinj \ > + ${PN}-init-dom0less \ > " > > PROVIDES =+ " \ > @@ -245,6 +246,7 @@ FILES:${PN}-dbg += "\ > > FILES:${PN}-dev = "\ > ${includedir} \ > + ${localstatedir} \ > " > > FILES:${PN}-doc = "\ > @@ -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 > @@ -708,6 +711,11 @@ FILES:${PN}-xen-vmtrace +="\ > # xen-vmtrace is only built for x86 4.16, so allow empty package > ALLOW_EMPTY:${PN}-xen-vmtrace = "1" > > +FILES:${PN}-init-dom0less += "${libdir}/xen/bin/init-dom0less" > All the existing FILES:${PN} definitions are sorted alphabetically, so when adding a new one, please could you insert it at the correct point -- which would be after FILES:${PN}-hvmloader in this case. thanks, Christopher > + > +# init-dom0less is only built for Arm 4.17, so allow empty package > +ALLOW_EMPTY:${PN}-init-dom0less = "1" > + > INSANE_SKIP:${PN} = "already-stripped" > > # configure init.d scripts > 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} > <http://xenbits.xen.org/xen.git;branch=$%7BXEN_BRANCH%7D> \ > + 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} > <http://xenbits.xen.org/xen.git;branch=$%7BXEN_BRANCH%7D> \ > + > 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 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7794): https://lists.yoctoproject.org/g/meta-virtualization/message/7794 Mute This Topic: https://lists.yoctoproject.org/mt/96071918/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
