From 95643e3c862b04090093f9806cbd0486ace51013 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 21 Dec 2016 10:15:35 +0800 Subject: 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] Signed-off-by: Chen Qi --- ...rnatives-warn-when-multiple-providers-hav.patch | 26 ++++++++++++++++++++++ meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch 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 0000000000..afce1e1cc2 --- /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 +--- + 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 19a852ec62..7b01bfc346 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" -- cgit 1.2.3-korg