summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-21 16:41:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:03 +0000
commit88cea759d51913f2f764740cc110389b218e6d32 (patch)
treec5013cc3c781907ebcacad2099edddd558b72e96 /meta
parentb5975394f709e1d170534b3244561922c1b35fe1 (diff)
downloadpoky-88cea759d51913f2f764740cc110389b218e6d32.tar.gz
systemd: split out the hwdb data
The hardware databases are not essential and also quite large, so split them out into udev-hwdb. (From OE-Core rev: 3e8da06c1faeb7884689a8af959cd9fa5bdf4e4f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_197.bb22
1 files changed, 19 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 56ced66b01..a006ec8e92 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -180,13 +180,13 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \
180 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ 180 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
181" 181"
182 182
183PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils" 183PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-hwdb"
184 184
185FILES_udev-dbg += "/lib/udev/.debug" 185FILES_udev-dbg += "/lib/udev/.debug"
186 186
187RDEPENDS_udev += "udev-utils" 187RDEPENDS_udev += "udev-utils"
188RPROVIDES_udev = "hotplug" 188RPROVIDES_udev = "hotplug"
189RRECOMMENDS_udev += "udev-extraconf" 189RRECOMMENDS_udev += "udev-extraconf udev-hwdb"
190 190
191FILES_udev += "${base_sbindir}/udevd \ 191FILES_udev += "${base_sbindir}/udevd \
192 ${base_libdir}/systemd/systemd-udevd \ 192 ${base_libdir}/systemd/systemd-udevd \
@@ -209,7 +209,6 @@ FILES_udev += "${base_sbindir}/udevd \
209 /lib/udev/rules.d/78*.rules \ 209 /lib/udev/rules.d/78*.rules \
210 /lib/udev/rules.d/8*.rules \ 210 /lib/udev/rules.d/8*.rules \
211 /lib/udev/rules.d/95*.rules \ 211 /lib/udev/rules.d/95*.rules \
212 ${base_libdir}/udev/hwdb.d \
213 ${sysconfdir}/udev \ 212 ${sysconfdir}/udev \
214 ${systemd_unitdir}/system/*udev* \ 213 ${systemd_unitdir}/system/*udev* \
215 ${systemd_unitdir}/system/*.wants/*udev* \ 214 ${systemd_unitdir}/system/*.wants/*udev* \
@@ -220,6 +219,8 @@ RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'console
220 219
221FILES_udev-utils = "${bindir}/udevadm" 220FILES_udev-utils = "${bindir}/udevadm"
222 221
222FILES_udev-hwdb = "${base_libdir}/udev/hwdb.d"
223
223# TODO: 224# TODO:
224# u-a for runlevel and telinit 225# u-a for runlevel and telinit
225 226
@@ -239,6 +240,21 @@ update-alternatives --remove shutdown ${base_bindir}/systemctl
239update-alternatives --remove poweroff ${base_bindir}/systemctl 240update-alternatives --remove poweroff ${base_bindir}/systemctl
240} 241}
241 242
243pkg_postinst_udev-hwdb () {
244 if test -n "$D"; then
245 exit 1
246 fi
247
248 udevadm hwdb --update
249}
250
251pkg_prerm_udev-hwdb () {
252 if test -n "$D"; then
253 exit 1
254 fi
255
256 rm -f ${sysconfdir}/udev/hwdb.bin
257}
242 258
243# As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try 259# As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try
244# building udev and systemd in world builds. 260# building udev and systemd in world builds.