From 3cf69539452c1be30a3b9547a51112f78897ca74 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 1 Oct 2014 09:33:28 +0200 Subject: bash-completion: resolve sysroot conflicts for util-linux and networkmanager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * continue the priority for packages shipping bash-completion * oe-core's latest changes turn sysroot conflicts into critical error ERROR: The recipe bash-completion is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /home/a.mueller/tmp/oe-core-glibc/sysroots/overo/usr/share/bash-completion/completions/nmcli Matched in manifest-overo-networkmanager.populate_sysroot /home/a.mueller/tmp/oe-core-glibc/sysroots/overo/usr/share/bash-completion/completions/su Matched in manifest-overo-util-linux.populate_sysroot Signed-off-by: Andreas Müller --- meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb b/meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb index 9a0ff352d0..fbe4278d7f 100644 --- a/meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb +++ b/meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb @@ -23,9 +23,12 @@ do_install_append() { # Delete files already provided by util-linux local i - for i in cal dmesg eject hexdump hwclock ionice look renice rtcwake; do + for i in cal dmesg eject hexdump hwclock ionice look renice rtcwake su; do rm ${D}${datadir}/${BPN}/completions/$i done + + # Delete files for networkmanager + rm ${D}${datadir}/${BPN}/completions/nmcli } RDEPENDS_${PN} = "bash" -- cgit v1.2.3-54-g00ecf