opkg-utils: fix double slash problem in update-alternatives

The following changes since commit 4a888b2ab61662c7f749b5d1e64af92ed613d8eb:

gtk+: drop part of patch adding useless file (2014-11-20 14:08:57 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/update-alternatives-double-slash
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/update-alternatives-double-slash

Chen Qi (1):
opkg-utils: fix double slash problem in update-alternatives

 ...-update-alternatives-avoid-double-slashes.patch | 25 ++++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-avoid-double-slashes.patch

1.9.1

When using update-alternatives, we would get output like the following:
update-alternatives: Linking //usr/bin/sh to /usr/bin/bash

What we really want is:
update-alternatives: Linking /usr/bin/sh to /usr/bin/bash

This patch fixes the above problem.

---
 ...-update-alternatives-avoid-double-slashes.patch | 25 ++++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-avoid-double-slashes.patch

new file mode 100644
index 0000000..a63b26b
@@ -0,0 +1,25 @@
+Upstream-Status: Pending
+
+Subject: update-alternatives: avoid double slashes
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ update-alternatives |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-alternatives b/update-alternatives
+index 8916cbd..ca01d5d 100644
+--- a/update-alternatives
++++ b/update-alternatives
+@@ -97,7 +97,7 @@ find_best_alt() {
+ 	[ $# -lt 1 ] && return 1
+ 	[ ! -f $ad/$name ] && return 0
+ 
+-	link=$OPKG_OFFLINE_ROOT/`head -n 1 $ad/$name`
++	link=$OPKG_OFFLINE_ROOT`head -n 1 $ad/$name`
+ 
+ 	prio=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/ [^ ]*$//'`
+ 	if [ -z "$prio" ]; then
+-- 
+1.7.9.5
+

index 72dc98e..1c9a3b5 100644
@@ -10,7 +10,8 @@ PROVIDES += "virtual/update-alternatives"
 SRCREV = "762d9dadce548108d4204c2113461a7dd6f57e60"
 PV = "0.1.8+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/opkg-utils"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils \
+           file://0001-update-alternatives-avoid-double-slashes.patch"
 
 S = "${WORKDIR}/git"
 

1.9.1

opkg-utils is part of Yocto Project. Could you submit this as a change to opkg-utils itself and then send a SRCREV update for oe-core? Submission guidelines are under "Submitting patches for review" in the CONTRIBUTING file in opkg-utils
(http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/tree/CONTRIBUTING).

The patch looks pretty straightforward so I should be able to give it a quick test and merge it to opkg-utils early next week.

Cheers,

Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk

Hi Paul,

I've followed the link and sent out the patch.
Thanks a lot.

Best Regards,
Chen Qi