diff options
| author | Matthieu CRAPET <Matthieu.CRAPET@ingenico.com> | 2014-02-14 14:32:43 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-21 17:06:59 +0100 |
| commit | 0477432cce69eef73744e46855b0449bd56b3297 (patch) | |
| tree | 9b8bd50962c463b6526eb3fa583b9d437a7325a0 | |
| parent | dfa33ddb23ba4a6cba2884091e6fa6808c051f37 (diff) | |
| download | meta-openembedded-0477432cce69eef73744e46855b0449bd56b3297.tar.gz | |
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: Matthieu CRAPET <Matthieu.CRAPET@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb | 10 |
1 files changed, 10 insertions, 0 deletions
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 411b9b7e17..014d122cb6 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/" | |||
| 5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
| 7 | 7 | ||
| 8 | PR = "r1" | ||
| 9 | |||
| 8 | SECTION = "console/utils" | 10 | SECTION = "console/utils" |
| 9 | 11 | ||
| 10 | SRC_URI="http://bash-completion.alioth.debian.org/files/${BPN}-${PV}.tar.bz2" | 12 | 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" | |||
| 12 | SRC_URI[md5sum] = "0d903f398be8c8f24bc5ffa6f86127f8" | 14 | SRC_URI[md5sum] = "0d903f398be8c8f24bc5ffa6f86127f8" |
| 13 | SRC_URI[sha256sum] = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804" | 15 | SRC_URI[sha256sum] = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804" |
| 14 | 16 | ||
| 17 | PARALLEL_MAKE = "" | ||
| 18 | |||
| 15 | inherit allarch autotools | 19 | inherit allarch autotools |
| 16 | 20 | ||
| 17 | do_install_append() { | 21 | do_install_append() { |
| 18 | install -d ${D}${sysconfdir}/bash_completion.d/ | 22 | install -d ${D}${sysconfdir}/bash_completion.d/ |
| 19 | echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion | 23 | echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion |
| 24 | |||
| 25 | # Delete files already provided by util-linux | ||
| 26 | local i | ||
| 27 | for i in cal dmesg hwclock ionice look renice rtcwake; do | ||
| 28 | rm ${D}${datadir}/${BPN}/completions/$i | ||
| 29 | done | ||
| 20 | } | 30 | } |
| 21 | 31 | ||
| 22 | RDEPENDS_${PN} = "bash" | 32 | RDEPENDS_${PN} = "bash" |
