[meta-virtualization] [PATCH 07/14] xen: Update recipe to 4.5.0

Bruce Ashfield bruce.ashfield at gmail.com
Mon Feb 16 20:55:43 PST 2015


I have no objections to the series. I'll let this soak for another day or two,
and then do the merge.

Cheers,

Bruce

On Mon, Feb 16, 2015 at 3:41 AM, Nathan Rossi <nathan.rossi at xilinx.com> wrote:
> * Added configure step to fix handling of the CC, AS, etc. variables
>   within the xen build scripts.
> * Add configure options for handling of system config directories for
>   cross building
> * Use the qemu provided by oe instead of the xen built version for
>   consistency as well as to remove the need to have two seperate flows
>   for building qemu
> * Disable building of SeaBIOS
> * Removed no longer needed patches
>
> Signed-off-by: Nathan Rossi <nathan.rossi at xilinx.com>
> ---
> Sorry, minor mistake I overlooked. Removed 'squish' from commit message.
> ---
>  ...lask-avoid-installing-policy-file-as-boot.patch | 26 ----------------
>  recipes-extended/xen/xen_4.3.1.bb                  | 24 ---------------
>  recipes-extended/xen/xen_4.5.0.bb                  | 36 ++++++++++++++++++++++
>  3 files changed, 36 insertions(+), 50 deletions(-)
>  delete mode 100644 recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
>  delete mode 100644 recipes-extended/xen/xen_4.3.1.bb
>  create mode 100644 recipes-extended/xen/xen_4.5.0.bb
>
> diff --git a/recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch b/recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
> deleted file mode 100644
> index d980807..0000000
> --- a/recipes-extended/xen/files/flask-avoid-installing-policy-file-as-boot.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From 8bff3edead4318bfebc487f929f833d11922c238 Mon Sep 17 00:00:00 2001
> -From: "Vadim A. Misbakh-Soloviov" <mva at mva.name>
> -Date: Tue, 30 Jul 2013 16:34:38 +0400
> -Subject: [PATCH] flask: avoid installing policy file as '/boot'
> -
> -Signed-off-by: Vadim A. Misbakh-Soloviov <mva at mva.name>
> -Acked-by: Daniel De Graaf <dgdegra at tycho.nsa.gov>
> ----
> - tools/flask/policy/Makefile |    1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
> -index e666f3e..df1e8f3 100644
> ---- a/tools/flask/policy/Makefile
> -+++ b/tools/flask/policy/Makefile
> -@@ -103,6 +103,7 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
> - all: $(POLICY_FILENAME)
> -
> - install: $(POLICY_FILENAME)
> -+      $(INSTALL_DIR) $(POLICY_LOADPATH)
> -       $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
> -
> - $(POLICY_FILENAME): policy.conf
> ---
> -1.7.10.4
> -
> diff --git a/recipes-extended/xen/xen_4.3.1.bb b/recipes-extended/xen/xen_4.3.1.bb
> deleted file mode 100644
> index 2c9806b..0000000
> --- a/recipes-extended/xen/xen_4.3.1.bb
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -require xen.inc
> -
> -SRC_URI = " \
> -    http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
> -    file://flask-avoid-installing-policy-file-as-boot.patch \
> -    "
> -
> -SRC_URI[md5sum] = "7616b8704e1ab89c81f011f0e3703bc8"
> -SRC_URI[sha256sum] = "3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd"
> -
> -S = "${WORKDIR}/xen-${PV}"
> -
> -RDEPENDS_${PN}-base += "\
> -    ${PN}-libblktap \
> -    ${PN}-flask \
> -    "
> -
> -do_configure_prepend() {
> -    # fixup qemu-xen-traditional pciutils check hardcoded to test /usr/include/pci
> -    sed -i 's/\/usr\/include\/pci/$(STAGING_INCDIR)\/pci/g' ${S}/tools/qemu-xen-traditional/xen-hooks.mak
> -
> -    # fixup for qemu to cross compile
> -    sed -i 's/configure --d/configure --cross-prefix=${TARGET_PREFIX} --d/g' ${S}/tools/qemu-xen-traditional/xen-setup
> -}
> diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
> new file mode 100644
> index 0000000..62d1d87
> --- /dev/null
> +++ b/recipes-extended/xen/xen_4.5.0.bb
> @@ -0,0 +1,36 @@
> +require xen.inc
> +
> +SRC_URI = " \
> +    http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
> +    "
> +
> +SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
> +SRC_URI[sha256sum] = "5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b"
> +
> +S = "${WORKDIR}/xen-${PV}"
> +
> +# Xen suffixes the libexecdir within its configure scripts, prevent the nested xen/xen/
> +libexecdir = "${libdir}"
> +
> +# These options override detected values from the build.
> +EXTRA_OECONF_append += " \
> +    --with-initddir=${INIT_D_DIR} \
> +    --with-sysconfig-leaf-dir=default \
> +    --with-system-qemu=/usr/bin/qemu-system-i386 \
> +    --disable-qemu-traditional \
> +    --disable-seabios \
> +    "
> +
> +do_configure_prepend() {
> +    # fixup AS/CC/CCP/etc variable within StdGNU.mk
> +    for i in AS LD CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP; do
> +        sed -i "s/^\($i\s\s*\).*=/\1?=/" ${S}/config/StdGNU.mk
> +    done
> +    # fixup environment passing in some makefiles
> +    sed -i 's#\(\w*\)=\(\$.\w*.\)#\1="\2"#' ${S}/tools/firmware/Makefile
> +}
> +
> +do_install_append() {
> +    # fixup default path to qemu-system-i386
> +    sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
> +}
> --
> 2.1.1
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"


More information about the meta-virtualization mailing list