[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3927/8267] opkg-utils: warn if update-alternatives finds priority conflict

[Emmanuele Bassi <ebassi src gnome org>]

commit 41137c212cbc47e382dae5ce3de4f8217c2b5c4c
Author: Chen Qi <Qi Chen windriver com>
Date:   Wed Dec 21 12:32:47 2016 +0800

    opkg-utils: warn if update-alternatives finds priority conflict
    
    If multiple providers for a utility have the same alternatives priority,
    which one would be chosen is determined by which one is installed later.
    Our alternatives system should be able to detect such problem and warn users
    so that potential problems could be avoided.
    
    Modify update-alternatives to warn users when detecting multiple providers
    with the same priority.
    
    [YOCTO #8314]
    
    (From OE-Core rev: 06cf956e3441868d69f81d6c034778d855ce1c98)
    
    (From OE-Core rev: 0b413d502868c89b7ddbe50a978317ffa774b3cc)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...rnatives-warn-when-multiple-providers-hav.patch |   26 ++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git 
a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch 
b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
new file mode 100644
index 0000000..afce1e1
--- /dev/null
+++ 
b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
@@ -0,0 +1,26 @@
+Subject: update-alternatives: warn when multiple providers have the same priority
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <Qi Chen windriver com>
+---
+ update-alternatives | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/update-alternatives b/update-alternatives
+index ca01d5d..ffad853 100644
+--- a/update-alternatives
++++ b/update-alternatives
+@@ -90,6 +90,9 @@ add_alt() {
+       local path="$2"
+       local priority="$3"
+       remove_alt $name $path
++      if grep -qw "$priority" $ad/$name; then
++              echo "Warn: update-alternatives: $name has multiple providers with the same priority, please 
check $ad/$name for details"
++      fi
+       echo "$path $priority" >> $ad/$name
+ }
+ 
+-- 
+2.8.3
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb 
b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 19a852e..7b01bfc 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -10,7 +10,8 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu
 SRCREV = "3ffece9bf19a844edacc563aa092fd1fbfcffeee"
 PV = "0.3.2+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/opkg-utils"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils \
+           file://0001-update-alternatives-warn-when-multiple-providers-hav.patch"
 SRC_URI_append_class-native = " file://tar_ignore_error.patch"
 
 S = "${WORKDIR}/git"