[meta-virtualization] [PATCH] sysvinit: fix DISTRO decode

Armin Kuster akuster808 at gmail.com
Mon Apr 16 07:34:41 PDT 2018


the yocto-check-layer failed with:

      Dependency on variable DISTRO_FEATURES_LIBC was added
      Variable do_install value changed:
      @@ -32,3 +32,7 @@
               done
               echo "" >> ${D}${sysconfdir}/inittab
           fi
      +	if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
      +		echo "" >> ${D}${sysconfdir}/inittab
      +		echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
      +	fi

used idea from meta-selinux

Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend | 7 +------
 recipes-core/sysvinit/sysvinit-inittab_xen.inc      | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 recipes-core/sysvinit/sysvinit-inittab_xen.inc

diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
index 1b89aec..8c08832 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
+++ b/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
@@ -1,6 +1 @@
-do_install_append() {
-	if echo "${DISTRO_FEATURES}" | grep -q 'xen'; then
-		echo "" >> ${D}${sysconfdir}/inittab
-		echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
-	fi
-}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'sysvinit-inittab_xen.inc', '', d)}
diff --git a/recipes-core/sysvinit/sysvinit-inittab_xen.inc b/recipes-core/sysvinit/sysvinit-inittab_xen.inc
new file mode 100644
index 0000000..9d0589c
--- /dev/null
+++ b/recipes-core/sysvinit/sysvinit-inittab_xen.inc
@@ -0,0 +1,4 @@
+do_install_append() {
+                echo "" >> ${D}${sysconfdir}/inittab
+                echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> ${D}${sysconfdir}/inittab
+}
-- 
2.7.4



More information about the meta-virtualization mailing list