Skip to contentSkip to conversation

bash-completion: fix 'files already exist' WARNING message

PATCH New Martin Jansa 1 participant 2 messages Mar 20, 2014

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/2 bash-completion: fix 'files already exist' WARNING message

From: Matthieu CRAPET <[email protected]>

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 <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb +10 -0
index 411b9b7..014d122 100644
@@ -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"
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 bash-completion: update to version 2.1

From: Matthieu CRAPET <[email protected]>

Notes:
- PARALLEL_MAKE is still required
- inherit allarch is not present because of runtime dependency with bash (TUNE_PKGARCH)

Signed-off-by Matthieu Crapet <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 .../{bash-completion_2.0.bb => bash-completion_2.1.bb}        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/bash-completion/{bash-completion_2.0.bb => bash-completion_2.1.bb} (77%)
meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb renamed from meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb +5 -6
similarity index 77%
rename from meta-oe/recipes-support/bash-completion/bash-completion_2.0.bb
rename to meta-oe/recipes-support/bash-completion/bash-completion_2.1.bb
index 014d122..bafe32d 100644
@@ -5,26 +5,25 @@ 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"
 
-SRC_URI[md5sum] = "0d903f398be8c8f24bc5ffa6f86127f8"
-SRC_URI[sha256sum] = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"
+SRC_URI[md5sum] = "4e2a9f11a4042a38ee79ddcd048e8b9e"
+SRC_URI[sha256sum] = "2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f"
 
 PARALLEL_MAKE = ""
 
-inherit allarch autotools
+inherit autotools
 
 do_install_append() {
+	# compatdir
 	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
+	for i in cal dmesg eject hexdump hwclock ionice look renice rtcwake; do
 		rm ${D}${datadir}/${BPN}/completions/$i
 	done
 }
Signature · 1 line
1.9.1