diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2014-10-01 09:33:28 +0200 |
|---|---|---|
| committer | Andreas Müller <schnitzeltony@googlemail.com> | 2014-10-01 10:11:37 +0200 |
| commit | 3cf69539452c1be30a3b9547a51112f78897ca74 (patch) | |
| tree | 714dd45948647754a018593b0ffa66486e1c61ed /meta-oe/recipes-support | |
| parent | 3dc901f989f4f1c9a0d1e959f670864689df4066 (diff) | |
| download | meta-openembedded-3cf69539452c1be30a3b9547a51112f78897ca74.tar.gz | |
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@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb | 5 |
1 files changed, 4 insertions, 1 deletions
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" |