summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-04 16:56:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:03 +0000
commit40a15da9eb98e76aadf00f734d98123735589894 (patch)
treea89e796bd9d7b1f1b327e1943f8dad4b9d3076ad /meta/recipes-core
parent55ba8ea8636bd4401aaad3d3e3441872cc974596 (diff)
downloadpoky-40a15da9eb98e76aadf00f734d98123735589894.tar.gz
util-linux: split uuidd into it's own package, and enable for systemd
(From OE-Core rev: cd3c8c9cea560a584178ed831bfc3c014b6663e6) 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/util-linux/util-linux.inc11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 41a5471132..46daab7fec 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3
17 file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \ 17 file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \
18 file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82" 18 file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82"
19 19
20inherit autotools gettext pkgconfig 20inherit autotools gettext pkgconfig systemd
21DEPENDS = "zlib ncurses" 21DEPENDS = "zlib ncurses"
22DEPENDS_append_class-native = " lzo-native" 22DEPENDS_append_class-native = " lzo-native"
23 23
@@ -34,7 +34,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
34 util-linux-libmount util-linux-libmount-dev \ 34 util-linux-libmount util-linux-libmount-dev \
35 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ 35 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
36 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 36 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
37 util-linux-mkfs util-linux-mcookie util-linux-reset" 37 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd"
38 38
39EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ 39EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
40 --disable-makeinstall-chown --enable-elvtune --enable-init \ 40 --disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -46,6 +46,10 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
46 usrsbin_execdir='${sbindir}' \ 46 usrsbin_execdir='${sbindir}' \
47" 47"
48 48
49# Respect the systemd feature for uuidd
50EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}"
51EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
52
49EXTRA_OECONF_append_class-native = " --disable-login --disable-su" 53EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
50 54
51FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 55FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
@@ -61,6 +65,7 @@ FILES_util-linux-mcookie = "${bindir}/mcookie"
61FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" 65FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
62FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" 66FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}"
63FILES_util-linux-uuidgen = "${bindir}/uuidgen" 67FILES_util-linux-uuidgen = "${bindir}/uuidgen"
68FILES_util-linux-uuidd = "${sbindir}/uuidd"
64FILES_util-linux-reset = "${base_bindir}/reset" 69FILES_util-linux-reset = "${base_bindir}/reset"
65 70
66FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 71FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
@@ -88,6 +93,8 @@ RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-l
88RRECOMMENDS_${PN}_class-native = "" 93RRECOMMENDS_${PN}_class-native = ""
89RDEPENDS_${PN}_class-native = "" 94RDEPENDS_${PN}_class-native = ""
90 95
96SYSTEMD_PACKAGES = "util-linux-uuidd"
97SYSTEMD_SERVICE_util-linux-uuidd = "uuidd.service"
91 98
92do_compile () { 99do_compile () {
93 set -e 100 set -e