diff options
| author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-03-14 23:09:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:26 +0000 |
| commit | 6129d8655d513f20df4563162f5efb82aa904e50 (patch) | |
| tree | a14ed5ca66499ddfef1a97357912d1485fbfcfbc | |
| parent | 9aa27fe001d34e491235273f454c38b9ba1c60a4 (diff) | |
| download | poky-6129d8655d513f20df4563162f5efb82aa904e50.tar.gz | |
eudev: split eudev-hwdb from eudev
The eudev recipe included the hwdb.d directory by default,
which ended up making the eudev package a lot heavier than
the old udev, this patch splits the eudev-hwdb package to
avoid using unecessary space when required
(From OE-Core rev: 20038e0e13685ebc6fcbbbb2d96695670e33e3e3)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/udev/eudev_3.1.5.bb | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/meta/recipes-core/udev/eudev_3.1.5.bb b/meta/recipes-core/udev/eudev_3.1.5.bb index e94e0dc33d..ea19ec4138 100644 --- a/meta/recipes-core/udev/eudev_3.1.5.bb +++ b/meta/recipes-core/udev/eudev_3.1.5.bb | |||
| @@ -23,7 +23,7 @@ UPSTREAM_CHECK_URI = "https://github.com/gentoo/eudev/releases" | |||
| 23 | SRC_URI[md5sum] = "e130f892d8744e292cb855db79935f68" | 23 | SRC_URI[md5sum] = "e130f892d8744e292cb855db79935f68" |
| 24 | SRC_URI[sha256sum] = "ce9d5fa91e3a42c7eb95512ca0fa2a631e89833053066bb6cdf42046b2a88553" | 24 | SRC_URI[sha256sum] = "ce9d5fa91e3a42c7eb95512ca0fa2a631e89833053066bb6cdf42046b2a88553" |
| 25 | 25 | ||
| 26 | inherit autotools update-rc.d | 26 | inherit autotools update-rc.d qemu |
| 27 | 27 | ||
| 28 | EXTRA_OECONF = " \ | 28 | EXTRA_OECONF = " \ |
| 29 | --sbindir=${base_sbindir} \ | 29 | --sbindir=${base_sbindir} \ |
| @@ -69,6 +69,8 @@ INITSCRIPT_PARAMS_udev-cache = "start 36 S ." | |||
| 69 | 69 | ||
| 70 | PACKAGES =+ "libudev" | 70 | PACKAGES =+ "libudev" |
| 71 | PACKAGES =+ "udev-cache" | 71 | PACKAGES =+ "udev-cache" |
| 72 | PACKAGES =+ "eudev-hwdb" | ||
| 73 | |||
| 72 | 74 | ||
| 73 | FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" | 75 | FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" |
| 74 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | 76 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ |
| @@ -77,12 +79,29 @@ FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | |||
| 77 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" | 79 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" |
| 78 | FILES_libudev = "${base_libdir}/libudev.so.*" | 80 | FILES_libudev = "${base_libdir}/libudev.so.*" |
| 79 | FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" | 81 | FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" |
| 82 | FILES_eudev-hwdb = "${sysconfdir}/udev/hwdb.d" | ||
| 83 | |||
| 84 | RDEPENDS_eudev-hwdb += "eudev" | ||
| 85 | |||
| 86 | RRECOMMENDS_${PN} += "udev-cache eudev-hwdb" | ||
| 87 | |||
| 88 | RPROVIDES_${PN} = "hotplug udev" | ||
| 80 | 89 | ||
| 81 | python () { | 90 | python () { |
| 82 | if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): | 91 | if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): |
| 83 | raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") | 92 | raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") |
| 84 | } | 93 | } |
| 85 | 94 | ||
| 86 | RRECOMMENDS_${PN} += "udev-cache" | 95 | pkg_postinst_eudev-hwdb () { |
| 96 | if test -n "$D"; then | ||
| 97 | ${@qemu_run_binary(d, '$D', '${bindir}/udevadm')} hwdb --update --root $D | ||
| 98 | chown root:root $D${sysconfdir}/udev/hwdb.bin | ||
| 99 | else | ||
| 100 | udevadm hwdb --update | ||
| 101 | fi | ||
| 102 | } | ||
| 103 | |||
| 104 | pkg_prerm_eudev-hwdb () { | ||
| 105 | rm -f $D${sysconfdir}/udev/hwdb.bin | ||
| 106 | } | ||
| 87 | 107 | ||
| 88 | RPROVIDES_${PN} = "hotplug udev" | ||
