[oe-commits] Matthieu CRAPET : bash-completion: fix 'files already exist' WARNING message
git at git.openembedded.org
git at git.openembedded.org
Tue Feb 18 08:16:49 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 9df50e609803c8a115d71338d920e762fd566dd6
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9df50e609803c8a115d71338d920e762fd566dd6
Author: Matthieu CRAPET <Matthieu.CRAPET at ingenico.com>
Date: Fri Feb 14 14:32:43 2014 +0100
bash-completion: fix 'files already exist' WARNING message
Some bash completion commands are already provided by util-linux recipe.
Also disable parallel build because "symlinks" rule is buggy (see completions/Makefile.am).
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb b/meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb
index 411b9b7..014d122 100644
--- a/meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb
+++ b/meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb
@@ -5,6 +5,8 @@ BUGTRACKER = "https://alioth.debian.org/projects/bash-completion/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+PR = "r1"
+
SECTION = "console/utils"
SRC_URI="http://bash-completion.alioth.debian.org/files/${BPN}-${PV}.tar.bz2"
@@ -12,11 +14,19 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "0d903f398be8c8f24bc5ffa6f86127f8"
SRC_URI[sha256sum] = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"
+PARALLEL_MAKE = ""
+
inherit allarch autotools
do_install_append() {
install -d ${D}${sysconfdir}/bash_completion.d/
echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion
+
+ # Delete files already provided by util-linux
+ local i
+ for i in cal dmesg hwclock ionice look renice rtcwake; do
+ rm ${D}${datadir}/${BPN}/completions/$i
+ done
}
RDEPENDS_${PN} = "bash"
More information about the Openembedded-commits
mailing list