summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-12 17:24:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:02 +0000
commit850278783ca3f48c86f5223ea04827224c59f3be (patch)
tree09ad2d1556bcc0e827c8cbbf73f48940e8629dc7 /meta/recipes-core
parent123e3c2fba6b1d13c738f9592719b92588fe6a44 (diff)
downloadpoky-850278783ca3f48c86f5223ea04827224c59f3be.tar.gz
systemd: merge udev-systemd into udev
Merge the contents of udev-systemd, which is just the service files, into udev itself. This split wasn't intended to ever happen in oe-core. (From OE-Core rev: c54970c5ce85a6155ed00cbb4044e1830f9538bc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd_197.bb9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index dc54f366f7..9a66a4e9ab 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -173,7 +173,7 @@ FILES_${PN} = " ${base_bindir}/* \
173FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" 173FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
174FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" 174FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
175 175
176RDEPENDS_${PN} += "dbus udev-systemd" 176RDEPENDS_${PN} += "dbus"
177 177
178RRECOMMENDS_${PN} += "systemd-serialgetty \ 178RRECOMMENDS_${PN} += "systemd-serialgetty \
179 util-linux-agetty \ 179 util-linux-agetty \
@@ -181,7 +181,7 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \
181 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ 181 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
182" 182"
183 183
184PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd" 184PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils"
185 185
186FILES_udev-dbg += "/lib/udev/.debug" 186FILES_udev-dbg += "/lib/udev/.debug"
187 187
@@ -212,6 +212,8 @@ FILES_udev += "${base_sbindir}/udevd \
212 /lib/udev/rules.d/95*.rules \ 212 /lib/udev/rules.d/95*.rules \
213 ${base_libdir}/udev/hwdb.d \ 213 ${base_libdir}/udev/hwdb.d \
214 ${sysconfdir}/udev \ 214 ${sysconfdir}/udev \
215 ${systemd_unitdir}/system/*udev* \
216 ${systemd_unitdir}/system/*.wants/*udev* \
215 " 217 "
216 218
217FILES_udev-consolekit += "/lib/ConsoleKit" 219FILES_udev-consolekit += "/lib/ConsoleKit"
@@ -219,9 +221,6 @@ RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'console
219 221
220FILES_udev-utils = "${bindir}/udevadm" 222FILES_udev-utils = "${bindir}/udevadm"
221 223
222FILES_udev-systemd = "${systemd_unitdir}/system/*udev* ${systemd_unitdir}/system/*.wants/*udev*"
223RDEPENDS_udev-systemd = "udev"
224
225# TODO: 224# TODO:
226# u-a for runlevel and telinit 225# u-a for runlevel and telinit
227 226