summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-01-20 12:29:32 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-01-20 12:29:32 +0100
commit103b4174d11233954a63a16f488b134da0b901b2 (patch)
tree9a26e5e43e11a9ba14c236f083e538dec2b34db4
parent3b80f538d9055f54b125d4f663ca147098674cce (diff)
downloadmeta-openembedded-103b4174d11233954a63a16f488b134da0b901b2.tar.gz
systemd: move kbd RECOMMENDS to vconsole-setup where they belong
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-core/systemd/systemd_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index b779f61d9..334d2d2be 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
14PKGV = "v${GITPKGVTAG}" 14PKGV = "v${GITPKGVTAG}"
15 15
16PV = "git" 16PV = "git"
17PR = "r9" 17PR = "r10"
18 18
19inherit useradd pkgconfig autotools vala perlnative 19inherit useradd pkgconfig autotools vala perlnative
20 20
@@ -76,6 +76,8 @@ FILES_${PN}-vconsole-setup = "${base_libdir}/systemd/systemd-vconsole-setup \
76 ${base_libdir}/systemd/system/systemd-vconsole-setup.service \ 76 ${base_libdir}/systemd/system/systemd-vconsole-setup.service \
77 ${base_libdir}/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service" 77 ${base_libdir}/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service"
78 78
79RRECOMMENDS_$PN}-vconsole-setup = "kbd kbd-consolefonts"
80
79FILES_${PN} += " ${base_bindir}/* \ 81FILES_${PN} += " ${base_bindir}/* \
80 ${datadir}/dbus-1/services \ 82 ${datadir}/dbus-1/services \
81 ${datadir}/dbus-1/system-services \ 83 ${datadir}/dbus-1/system-services \
@@ -102,8 +104,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
102# of blacklist support, so use proper modprobe from module-init-tools 104# of blacklist support, so use proper modprobe from module-init-tools
103# And pull in the kernel modules mentioned in INSTALL 105# And pull in the kernel modules mentioned in INSTALL
104# swapon -p is also not supported by busybox 106# swapon -p is also not supported by busybox
105RRECOMMENDS_${PN} += "kbd kbd-consolefonts \ 107RRECOMMENDS_${PN} += "systemd-serialgetty \
106 systemd-serialgetty \
107 util-linux-agetty \ 108 util-linux-agetty \
108 util-linux-swaponoff \ 109 util-linux-swaponoff \
109 util-linux-fsck e2fsprogs-e2fsck \ 110 util-linux-fsck e2fsprogs-e2fsck \