From 4388e5400bd6ec1558268c61bd84ed876bf599ae Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 23 Apr 2021 09:37:22 -0400 Subject: sysvinit: make all modifications conditional on virtualization distro feature To ensure yocto compatibility, we should not be changing the behaviour of recipes simply when meta-virt is included. As such, we change our sysvinit-inittab changes to only trigger when virtualization is in the distro features. Signed-off-by: Bruce Ashfield --- recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend | 11 +---------- recipes-core/sysvinit/sysvinit-inittab_virtualization.inc | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 recipes-core/sysvinit/sysvinit-inittab_virtualization.inc diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend index 4b3c020b..1705cbc4 100644 --- a/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend +++ b/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend @@ -1,11 +1,2 @@ require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'sysvinit-inittab_xen.inc', '', d)} - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://getty-wrapper" - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper -} -FILES_${PN} += "${base_sbindir}/getty-wrapper" +require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'sysvinit-inittab_virtualization.inc', '', d)} diff --git a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc new file mode 100644 index 00000000..9e796efd --- /dev/null +++ b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://getty-wrapper" + +do_install_append() { + install -d ${D}${base_sbindir} + install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper +} +FILES_${PN} += "${base_sbindir}/getty-wrapper" -- cgit v1.2.3-54-g00ecf