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>
This commit is contained in:
parent
55ba8ea863
commit
40a15da9eb
|
@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3
|
|||
file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \
|
||||
file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82"
|
||||
|
||||
inherit autotools gettext pkgconfig
|
||||
inherit autotools gettext pkgconfig systemd
|
||||
DEPENDS = "zlib ncurses"
|
||||
DEPENDS_append_class-native = " lzo-native"
|
||||
|
||||
|
@ -34,7 +34,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
|
|||
util-linux-libmount util-linux-libmount-dev \
|
||||
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
|
||||
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
|
||||
util-linux-mkfs util-linux-mcookie util-linux-reset"
|
||||
util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd"
|
||||
|
||||
EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
|
||||
--disable-makeinstall-chown --enable-elvtune --enable-init \
|
||||
|
@ -46,6 +46,10 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
|
|||
usrsbin_execdir='${sbindir}' \
|
||||
"
|
||||
|
||||
# Respect the systemd feature for uuidd
|
||||
EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)}"
|
||||
EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
|
||||
|
||||
EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
|
||||
|
||||
FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
|
||||
|
@ -61,6 +65,7 @@ FILES_util-linux-mcookie = "${bindir}/mcookie"
|
|||
FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
|
||||
FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}"
|
||||
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
|
||||
FILES_util-linux-uuidd = "${sbindir}/uuidd"
|
||||
FILES_util-linux-reset = "${base_bindir}/reset"
|
||||
|
||||
FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
|
||||
|
@ -88,6 +93,8 @@ RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-l
|
|||
RRECOMMENDS_${PN}_class-native = ""
|
||||
RDEPENDS_${PN}_class-native = ""
|
||||
|
||||
SYSTEMD_PACKAGES = "util-linux-uuidd"
|
||||
SYSTEMD_SERVICE_util-linux-uuidd = "uuidd.service"
|
||||
|
||||
do_compile () {
|
||||
set -e
|
||||
|
|
Loading…
Reference in New Issue