summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2016-01-14 14:56:34 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-29 18:14:55 +0000
commita6776e2ac597a70cb6105740eed1cf1b28204ad7 (patch)
treecbf368c41220a80520092698ca491bf2dfb9a0cb
parenta88ec53670a311d30d90a919e11a181f5fa77529 (diff)
downloadopenembedded-core-contrib-a6776e2ac597a70cb6105740eed1cf1b28204ad7.tar.gz
openembedded-core-contrib-a6776e2ac597a70cb6105740eed1cf1b28204ad7.tar.bz2
openembedded-core-contrib-a6776e2ac597a70cb6105740eed1cf1b28204ad7.zip
util-linux: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
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
file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
-inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest
+inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest bash-completion
DEPENDS = "zlib ncurses"
DEPENDS_append_class-native = " lzo-native"
DEPENDS_append_class-nativesdk = " lzo-native"
@@ -31,7 +31,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
util-linux-mkfs util-linux-mcookie util-linux-reset \
util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
- util-linux-partx ${PN}-bash-completion util-linux-hwclock \
+ util-linux-partx util-linux-hwclock \
util-linux-findfs util-linux-getopt util-linux-sulogin"
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
@@ -65,7 +65,6 @@ PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python
# Readline support
PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
-FILES_${PN}-bash-completion += "${datadir}/bash-completion"
FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la"