From 6af6307abbb0ea172cc7ecb301a886908c9a3aa2 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Fri, 19 Jan 2024 13:41:56 -0700 Subject: xen: Rename recipes and inc file to 4.17 version Rename xen recipes and inc file to 4.17 version so that it will be easy to make changes for 4.17 and new version. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../recipes-extended/xen/xen-tools-xilinx.inc | 25 ++++++++++++++++++++ .../recipes-extended/xen/xen-tools_%.bbappend | 27 ---------------------- .../recipes-extended/xen/xen-tools_4.17.bbappend | 2 ++ .../recipes-extended/xen/xen-xilinx.inc | 7 ------ .../recipes-extended/xen/xen-xilinx_4.17.inc | 7 ++++++ .../recipes-extended/xen/xen_%.bbappend | 20 ---------------- .../recipes-extended/xen/xen_4.17.bbappend | 20 ++++++++++++++++ 7 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-tools_%.bbappend create mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx.inc create mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen_%.bbappend create mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc new file mode 100644 index 00000000..e7bc8d7e --- /dev/null +++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc @@ -0,0 +1,25 @@ +# Only include the sysvinit scripts if sysvinit is enabled. +do_install:append () { + if [ -e ${D}/usr/lib/xen/bin/pygrub ]; then + sed -i -e '1c#!/usr/bin/env python3' ${D}/usr/lib/xen/bin/pygrub + fi + + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', '', d)}" != 'sysvinit' ]; then + rm -f ${D}/etc/init.d/xendomains + rm -f ${D}/etc/init.d/xencommons + rm -f ${D}/etc/init.d/xendriverdomain + rm -f ${D}/etc/init.d/xen-watchdog + fi +} + +# If we're in a hybrid configuration, we want to stop the system from +# running any Xen sysvinit scripts +# This has a side effect of, on a hybrid system, if the init manager is +# sysvinit, the user will need to manually enable Xen. +INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '1', '', d)}" + +FILES:${PN} += " \ + ${libdir}/xen/bin/init-dom0less \ + ${libdir}/xen/bin/get_overlay \ + ${libdir}/xen/bin/get_overlay.sh \ + " diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_%.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_%.bbappend deleted file mode 100644 index a9675ce3..00000000 --- a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_%.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -require xen-xilinx.inc - -# Only include the sysvinit scripts if sysvinit is enabled. -do_install:append () { - if [ -e ${D}/usr/lib/xen/bin/pygrub ]; then - sed -i -e '1c#!/usr/bin/env python3' ${D}/usr/lib/xen/bin/pygrub - fi - - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', '', d)}" != 'sysvinit' ]; then - rm -f ${D}/etc/init.d/xendomains - rm -f ${D}/etc/init.d/xencommons - rm -f ${D}/etc/init.d/xendriverdomain - rm -f ${D}/etc/init.d/xen-watchdog - fi -} - -# If we're in a hybrid configuration, we want to stop the system from -# running any Xen sysvinit scripts -# This has a side effect of, on a hybrid system, if the init manager is -# sysvinit, the user will need to manually enable Xen. -INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '1', '', d)}" - -FILES:${PN} += " \ - ${libdir}/xen/bin/init-dom0less \ - ${libdir}/xen/bin/get_overlay \ - ${libdir}/xen/bin/get_overlay.sh \ - " diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend new file mode 100644 index 00000000..d033e1d2 --- /dev/null +++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend @@ -0,0 +1,2 @@ +require xen-xilinx_4.17.inc +require xen-tools-xilinx.inc diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx.inc deleted file mode 100644 index d7810b27..00000000 --- a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx.inc +++ /dev/null @@ -1,7 +0,0 @@ -SRCREV = "38eebc6e5c6f7aa9180672a56d33217bf1ef1ca6" -XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https" -XEN_BRANCH = "xlnx_rebase_4.17" - -PV .= "-xilinx+git${SRCPV}" - -DEFAULT_PREFERENCE = "+1" diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc new file mode 100644 index 00000000..d7810b27 --- /dev/null +++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc @@ -0,0 +1,7 @@ +SRCREV = "38eebc6e5c6f7aa9180672a56d33217bf1ef1ca6" +XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https" +XEN_BRANCH = "xlnx_rebase_4.17" + +PV .= "-xilinx+git${SRCPV}" + +DEFAULT_PREFERENCE = "+1" diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_%.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_%.bbappend deleted file mode 100644 index f0340f1c..00000000 --- a/meta-xilinx-virtualization/recipes-extended/xen/xen_%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -require xen-xilinx.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -RDEPENDS:${PN}-efi += "bash python3" - -do_deploy:append() { - # Mimic older behavior for compatibility - if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then - ln -s xen-${MACHINE} ${DEPLOYDIR}/xen - fi - - if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then - ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz - fi - - if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then - ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi - fi -} diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend new file mode 100644 index 00000000..a569a96d --- /dev/null +++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend @@ -0,0 +1,20 @@ +require xen-xilinx_4.17.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +RDEPENDS:${PN}-efi += "bash python3" + +do_deploy:append() { + # Mimic older behavior for compatibility + if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then + ln -s xen-${MACHINE} ${DEPLOYDIR}/xen + fi + + if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then + ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz + fi + + if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then + ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi + fi +} -- cgit v1.2.3-54-g00ecf