aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2017-03-29 11:07:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-31 12:24:53 +0100
commit396e9dcf308a2a6660a84eb36c5ff29f8a0d08de (patch)
treea9b79b1e2427536962bfcd4e9e533dfbd32808f7 /meta/recipes-core/systemd
parent8413e26164644230615f4503ca9488b5b4021aeb (diff)
downloadopenembedded-core-contrib-396e9dcf308a2a6660a84eb36c5ff29f8a0d08de.tar.gz
systemd: make vconsole a PACKAGECONFIG option
Allowing to remove the systemd-vconsole-setup package without specifying the --disable-vconsole configure option for systemd will make the system boot with the failure prompt | systemd-udevd[142]: failed to execute '/lib/systemd/systemd-vconsole-setup' '/lib/systemd/systemd-vconsole-setup': No such file or directory | systemd-udevd[96]: Process '/lib/systemd/systemd-vconsole-setup' failed with exit code 2. as the 90-vconsole.rules will still be installed with having a RUN+="/lib/systemd/systemd-vconsole-setup" in it that attempts to execute a non-existing binary. Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index fa6a6a817f..398cb46f0d 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -47,6 +47,7 @@ PACKAGECONFIG ??= "xz \
randomseed \
machined \
backlight \
+ vconsole \
quotacheck \
hostnamed \
${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers', '', d)} \
@@ -79,6 +80,7 @@ PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved"
PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
PACKAGECONFIG[machined] = "--enable-machined,--disable-machined"
PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight"
+PACKAGECONFIG[vconsole] = "--enable-vconsole,--disable-vconsole,,${PN}-vconsole-setup"
PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck"
PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed"
PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname"
@@ -475,7 +477,6 @@ RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})"
RDEPENDS_${PN} += "volatile-binds update-rc.d"
RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)} \
- systemd-vconsole-setup \
systemd-extra-utils \
systemd-compat-units udev-hwdb \
util-linux-agetty util-linux-fsck e2fsprogs-e2fsck \