On 6/23/16 4:02 PM, Chris Patterson wrote: > From: Chris Patterson <[email protected]> > > - update packages and add additional ones for new binaries > (cpuid and livepatch) > - update xen_git to point to 4.7, make branch= fully variable, > and remove assumed .0 from release version. > > Signed-off-by: Chris Patterson <[email protected]> > --- > recipes-extended/xen/xen.inc | 15 +++++++++++++++ > recipes-extended/xen/xen_4.6.1.bb | 10 ---------- > recipes-extended/xen/xen_4.7.0.bb | 10 ++++++++++ > recipes-extended/xen/xen_git.bb | 9 +++++---- > 4 files changed, 30 insertions(+), 14 deletions(-) > delete mode 100644 recipes-extended/xen/xen_4.6.1.bb > create mode 100644 recipes-extended/xen/xen_4.7.0.bb > > diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc > index de8c168..ff502ff 100644 > --- a/recipes-extended/xen/xen.inc > +++ b/recipes-extended/xen/xen.inc > @@ -151,6 +151,7 @@ PACKAGES = "\ > ${PN}-base \ > ${PN}-blktap \ > ${PN}-console \ > + ${PN}-cpuid \ > ${PN}-dbg \ > ${PN}-dev \ > ${PN}-devd \ > @@ -196,6 +197,7 @@ PACKAGES = "\ > ${PN}-libxenvchan-dev \ > ${PN}-libxlutil \ > ${PN}-libxlutil-dev \ > + ${PN}-livepatch \ > ${PN}-misc \ > ${PN}-pygrub \ > ${PN}-python \ > @@ -369,6 +371,10 @@ FILES_${PN}-console = "\ > ${sbindir}/xenconsoled \ > " > > +FILES_${PN}-cpuid = "\ > + ${bindir}/xen-cpuid \ > + " > + > FILES_${PN}-devd = "\ > ${sysconfdir}/init.d/xendriverdomain \ > " > @@ -399,6 +405,10 @@ FILES_${PN}-kdd = "\ > ${sbindir}/kdd \ > " > > +FILES_${PN}-livepatch += " \ > + ${sbindir}/xen-livepatch \ > + " > + > FILES_${PN}-misc = "\ > ${bindir}/xencons \ > ${bindir}/xencov_split \ > @@ -527,6 +537,7 @@ FILES_${PN}-remus = "\ > " > > FILES_${PN}-scripts-network = " \ > + ${sysconfdir}/xen/scripts/colo-proxy-setup \ > ${sysconfdir}/xen/scripts/network-bridge \ > ${sysconfdir}/xen/scripts/network-nat \ > ${sysconfdir}/xen/scripts/network-route \ > @@ -544,6 +555,7 @@ FILES_${PN}-scripts-block = " \ > ${sysconfdir}/xen/scripts/blktap \ > ${sysconfdir}/xen/scripts/block \ > ${sysconfdir}/xen/scripts/block-common.sh \ > + ${sysconfdir}/xen/scripts/block-dummy \ > ${sysconfdir}/xen/scripts/block-enbd \ > ${sysconfdir}/xen/scripts/block-iscsi \ > ${sysconfdir}/xen/scripts/block-nbd \ > @@ -837,6 +849,9 @@ do_configure() { > } > > do_compile() { > + # workaround for build bug when CFLAGS is exported > + # https://www.mail-archive.com/[email protected]/msg67822.html > + unset CFLAGS
You'll actually also need:
export HOSTCXX="${BUILD_CXX}"
export HOSTCC="${BUILD_CC}"
for things to compile properly for cross compiles as well. You'll need
that added to do_install() as well.
> oe_runmake
> }
>
> diff --git a/recipes-extended/xen/xen_4.6.1.bb
> b/recipes-extended/xen/xen_4.6.1.bb
> deleted file mode 100644
> index 0adf8ad..0000000
> --- a/recipes-extended/xen/xen_4.6.1.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -require xen.inc
> -
> -SRC_URI = " \
> - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
> - "
> -
> -SRC_URI[md5sum] = "df2d854c3c90ffeefaf71e7f868fb326"
> -SRC_URI[sha256sum] =
> "44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589"
> -
> -S = "${WORKDIR}/xen-${PV}"
> diff --git a/recipes-extended/xen/xen_4.7.0.bb
> b/recipes-extended/xen/xen_4.7.0.bb
> new file mode 100644
> index 0000000..0565596
> --- /dev/null
> +++ b/recipes-extended/xen/xen_4.7.0.bb
> @@ -0,0 +1,10 @@
> +require xen.inc
> +
> +SRC_URI = " \
> + http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
> + "
> +
> +SRC_URI[md5sum] = "3aa4e01bf37a3a5bc8572907cb88e649"
> +SRC_URI[sha256sum] =
> "be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623"
> +
> +S = "${WORKDIR}/xen-${PV}"
> diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
> index a86a501..391b47e 100644
> --- a/recipes-extended/xen/xen_git.bb
> +++ b/recipes-extended/xen/xen_git.bb
> @@ -1,15 +1,16 @@
> require xen.inc
>
> -SRCREV = "1fd615aa0108490ffc558d27627f509183cbfdaf"
> +SRCREV = "9a6cc4f5c14b3d7542b7523f88a1b65464733d3a"
If you're going to make the branch variable then I don't think you can
set this since someone setting the branch will find that this revision
isn't necessarily in that branch. Granted this was already broken in a
way due to the ability to change the release.
I'd personally just make this ${AUTOREV} to compensate for that fact.
>
> -XEN_REL="4.6"
> +XEN_REL ?= "4.7"
> +XEN_BRANCH ?= "staging-${XEN_REL}"
>
> -PV = "${XEN_REL}.0+git${SRCPV}"
> +PV = "${XEN_REL}+git${SRCPV}"
>
> S = "${WORKDIR}/git"
>
> SRC_URI = " \
> - git://xenbits.xen.org/xen.git;branch=staging-${XEN_REL} \
> + git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
> "
>
> DEFAULT_PREFERENCE = "-1"
>
--
Doug Goldstein
signature.asc
Description: OpenPGP digital signature
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
