summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-06-18 10:08:53 +0800
committerChen Qi <Qi.Chen@windriver.com>2014-06-18 10:34:57 +0800
commit0aebf56af290030b4d763dc248d9a3208cf11c1a (patch)
tree8d03ae7afb5c0d67a23ccd24f252067229862397
parent3ebd3ff83d9683478295f2c187e6fceb2ab7d698 (diff)
downloadopenembedded-core-contrib-0aebf56af290030b4d763dc248d9a3208cf11c1a.tar.gz
openembedded-core-contrib-0aebf56af290030b4d763dc248d9a3208cf11c1a.tar.bz2
openembedded-core-contrib-0aebf56af290030b4d763dc248d9a3208cf11c1a.zip
systemd: remove udev-utils, move 'udevadm' to udev package
The udev package RDEPENDS on the udev-utils package, and the actually udev-utils package relies on the udev package because if there's no udev daemon, 'udevadm' command doesn't make much sense. Now that we have removed udev-utils package and moved 'udevadm' to the udev package in the older udev recipe, we should do the same for systemd. Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--meta/recipes-core/systemd/systemd_213.bb9
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_213.bb
index 279cf23097..28cc4cb0d9 100644
--- a/meta/recipes-core/systemd/systemd_213.bb
+++ b/meta/recipes-core/systemd/systemd_213.bb
@@ -250,16 +250,13 @@ RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units \
kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
"
-PACKAGES =+ "udev-dbg udev udev-utils udev-hwdb"
+PACKAGES =+ "udev-dbg udev udev-hwdb"
FILES_udev-dbg += "/lib/udev/.debug"
-RDEPENDS_udev += "udev-utils"
RPROVIDES_udev = "hotplug"
RRECOMMENDS_udev += "udev-hwdb"
-RDEPENDS_udev-hwdb += "udev-utils"
-
FILES_udev += "${base_sbindir}/udevd \
${rootlibexecdir}/systemd/systemd-udevd \
${rootlibexecdir}/udev/accelerometer \
@@ -285,10 +282,10 @@ FILES_udev += "${base_sbindir}/udevd \
${sysconfdir}/init.d/systemd-udevd \
${systemd_unitdir}/system/*udev* \
${systemd_unitdir}/system/*.wants/*udev* \
+ ${base_bindir}/udevadm \
+ ${datadir}/bash-completion/completions/udevadm \
"
-FILES_udev-utils = "${base_bindir}/udevadm ${datadir}/bash-completion/completions/udevadm"
-
FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d"
INITSCRIPT_PACKAGES = "udev"