summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-04-23 09:37:22 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-04-26 11:17:14 -0400
commit4388e5400bd6ec1558268c61bd84ed876bf599ae (patch)
tree5f3d8f9ba7565727fc1897076439b0f140d599ea /recipes-core
parent9f359865c4512771f914dab99fe22f7da2fe029a (diff)
downloadmeta-virtualization-4388e5400bd6ec1558268c61bd84ed876bf599ae.tar.gz
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 <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend11
-rw-r--r--recipes-core/sysvinit/sysvinit-inittab_virtualization.inc9
2 files changed, 10 insertions, 10 deletions
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 @@
1require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'sysvinit-inittab_xen.inc', '', d)} 1require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'sysvinit-inittab_xen.inc', '', d)}
2 2require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'sysvinit-inittab_virtualization.inc', '', d)}
3FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4
5SRC_URI += "file://getty-wrapper"
6
7do_install_append() {
8 install -d ${D}${base_sbindir}
9 install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
10}
11FILES_${PN} += "${base_sbindir}/getty-wrapper"
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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2
3SRC_URI += "file://getty-wrapper"
4
5do_install_append() {
6 install -d ${D}${base_sbindir}
7 install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
8}
9FILES_${PN} += "${base_sbindir}/getty-wrapper"