diff options
| author | George McCollister <george.mccollister@gmail.com> | 2016-01-14 14:56:34 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-30 11:37:02 +0000 |
| commit | 9d2066139f628df041d476ea55899709f5eca020 (patch) | |
| tree | fd140c7f19a9293283ff29aa06f8922e7a6a1ef1 /meta | |
| parent | 0e5b0bfefd61101559d6d2e8c918e7dc45e40a17 (diff) | |
| download | poky-9d2066139f628df041d476ea55899709f5eca020.tar.gz | |
util-linux: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions.
(From OE-Core rev: a6776e2ac597a70cb6105740eed1cf1b28204ad7)
Signed-off-by: George McCollister <george.mccollister@gmail.com>
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/util-linux/util-linux.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e7e32e8366..f57284bfce 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=1715f5ee3e01203ca1e1e0b9ee65918c | |||
| 17 | file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ | 17 | file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ |
| 18 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" | 18 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" |
| 19 | 19 | ||
| 20 | inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest | 20 | inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest bash-completion |
| 21 | DEPENDS = "zlib ncurses" | 21 | DEPENDS = "zlib ncurses" |
| 22 | DEPENDS_append_class-native = " lzo-native" | 22 | DEPENDS_append_class-native = " lzo-native" |
| 23 | DEPENDS_append_class-nativesdk = " lzo-native" | 23 | DEPENDS_append_class-nativesdk = " lzo-native" |
| @@ -31,7 +31,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
| 31 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ | 31 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ |
| 32 | util-linux-mkfs util-linux-mcookie util-linux-reset \ | 32 | util-linux-mkfs util-linux-mcookie util-linux-reset \ |
| 33 | util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ | 33 | util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ |
| 34 | util-linux-partx ${PN}-bash-completion util-linux-hwclock \ | 34 | util-linux-partx util-linux-hwclock \ |
| 35 | util-linux-findfs util-linux-getopt util-linux-sulogin" | 35 | util-linux-findfs util-linux-getopt util-linux-sulogin" |
| 36 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" | 36 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" |
| 37 | PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" | 37 | PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" |
| @@ -65,7 +65,6 @@ PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python | |||
| 65 | # Readline support | 65 | # Readline support |
| 66 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | 66 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" |
| 67 | 67 | ||
| 68 | FILES_${PN}-bash-completion += "${datadir}/bash-completion" | ||
| 69 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 68 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
| 70 | 69 | ||
| 71 | FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la" | 70 | FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la" |