From 663463da0c29e1f22b0740335d193f637174c104 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 26 Jan 2016 13:09:22 -0600 Subject: xen: merge do_install_append to do_install The do_install_append is necessary for the git build as well so just merge that into the main include. Signed-off-by: Doug Goldstein Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen.inc | 8 ++++++++ recipes-extended/xen/xen_4.6.0.bb | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index a46421b8..beb255c1 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -828,6 +828,14 @@ do_install() { echo "d $i 0755 root root - -" >> ${D}${sysconfdir}/tmpfiles.d/xen.conf done fi + + # 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 } pkg_postinst_${PN}-volatiles() { diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/xen_4.6.0.bb index 93c6d2ef..0391dbd8 100644 --- a/recipes-extended/xen/xen_4.6.0.bb +++ b/recipes-extended/xen/xen_4.6.0.bb @@ -9,13 +9,3 @@ SRC_URI[md5sum] = "48e232f90927c08326a7b52bb06f49bc" SRC_URI[sha256sum] = "6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909" S = "${WORKDIR}/xen-${PV}" - -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