From 1b354e1f2a9f6651309c484ed940595edfd3f302 Mon Sep 17 00:00:00 2001 From: Chris Patterson Date: Tue, 22 Dec 2015 14:02:28 -0500 Subject: xen: uprev to 4.6.0 - Update LICENSE checksum. - Drop udev package that has been removed (replaced with xl devd / xendriverdomain) Signed-off-by: Chris Patterson Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen.inc | 13 +--------- recipes-extended/xen/xen_4.5.0.bb | 50 --------------------------------------- recipes-extended/xen/xen_4.6.0.bb | 50 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 62 deletions(-) delete mode 100644 recipes-extended/xen/xen_4.5.0.bb create mode 100644 recipes-extended/xen/xen_4.6.0.bb diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 4833c9e7..6bc85fe5 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://xen.org" LICENSE = "GPLv2" SECTION = "console/tools" -LIC_FILES_CHKSUM = "file://COPYING;md5=e0f0f3ac55608719a82394cc353928df" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6260c12cd5de27e80d89ae18e48d20a" COMPATIBLE_HOST = '(x86_64.*).*-linux|aarch64.*-linux' @@ -69,7 +69,6 @@ RDEPENDS_${PN}-base = "\ ${PN}-fsimage \ ${PN}-scripts-block \ ${PN}-scripts-network \ - ${PN}-udev \ ${PN}-xen-watchdog \ ${PN}-xencommons \ ${PN}-xendomains \ @@ -105,7 +104,6 @@ RDEPENDS_${PN}-remus = "python" RDEPENDS_${PN}-scripts-block = "\ bash \ ${PN}-scripts-common \ - ${PN}-udev \ ${PN}-volatiles \ " @@ -115,12 +113,9 @@ RDEPENDS_${PN}-scripts-network = "\ bash \ bridge-utils \ ${PN}-scripts-common \ - ${PN}-udev \ ${PN}-volatiles \ " -RDEPENDS_${PN}-udev = "udev" - RDEPENDS_${PN}-xencommons = "\ bash \ ${PN}-console \ @@ -188,7 +183,6 @@ PACKAGES = "\ ${PN}-scripts-common \ ${PN}-scripts-network \ ${PN}-staticdev \ - ${PN}-udev \ ${PN}-volatiles \ ${PN}-xcutils \ ${PN}-xencommons \ @@ -522,11 +516,6 @@ FILES_${PN}-scripts-common = " \ ${sysconfdir}/xen/scripts/xen-script-common.sh \ " -FILES_${PN}-udev = "\ - ${sysconfdir}/udev/rules.d/xen-backend.rules \ - ${sysconfdir}/udev/rules.d/xend.rules \ - " - FILES_${PN}-volatiles = "\ ${sysconfdir}/default/volatiles/99_xen \ ${sysconfdir}/tmpfiles.d/xen.conf \ diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb deleted file mode 100644 index 7f791cc1..00000000 --- a/recipes-extended/xen/xen_4.5.0.bb +++ /dev/null @@ -1,50 +0,0 @@ -require xen.inc - -SRC_URI = " \ - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ - file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \ - " - -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 \ - " - -EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.bin" -EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.cirrus.bin" -EXTRA_OEMAKE += "SEABIOS_ROM=${STAGING_DIR_HOST}/usr/share/firmware/bios.bin" -EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.rom" -#EXTRA_OEMAKE += "XENGFX_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios.bin" - -do_configure_prepend() { - # fixup AS/CC/CCP/etc variable within StdGNU.mk - for i in LD CC CPP CXX; 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 - - # libsystemd-daemon -> libsystemd for newer systemd versions - sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure -} - -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 - - if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then - sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \ - ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service - fi -} diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/xen_4.6.0.bb new file mode 100644 index 00000000..92975a08 --- /dev/null +++ b/recipes-extended/xen/xen_4.6.0.bb @@ -0,0 +1,50 @@ +require xen.inc + +SRC_URI = " \ + http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ + file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \ + " + +SRC_URI[md5sum] = "48e232f90927c08326a7b52bb06f49bc" +SRC_URI[sha256sum] = "6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909" + +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 \ + " + +EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.bin" +EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.cirrus.bin" +EXTRA_OEMAKE += "SEABIOS_ROM=${STAGING_DIR_HOST}/usr/share/firmware/bios.bin" +EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.rom" +#EXTRA_OEMAKE += "XENGFX_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios.bin" + +do_configure_prepend() { + # fixup AS/CC/CCP/etc variable within StdGNU.mk + for i in LD CC CPP CXX; 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 + + # libsystemd-daemon -> libsystemd for newer systemd versions + sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure +} + +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 + + if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then + sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \ + ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service + fi +} -- cgit v1.2.3-54-g00ecf