[oe-commits] =?UTF-8?Q?Andreas=20M=C3=BCller=20?=: bash-completion: resolve sysroot conflicts for util-linux and networkmanager
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 3 22:36:33 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 3cf69539452c1be30a3b9547a51112f78897ca74
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3cf69539452c1be30a3b9547a51112f78897ca74
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Wed Oct 1 09:33:28 2014 +0200
bash-completion: resolve sysroot conflicts for util-linux and networkmanager
* 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 <schnitzeltony at googlemail.com>
---
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 9a0ff35..fbe4278 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"
More information about the Openembedded-commits
mailing list