From: Kai Kang <[email protected]> update-alternatives is used to handle install file conflicts of multilib packages in multilib_script.bbclass. And the default priority is used for the alternatives which causes QA warning:
| WARNING: core-image-minimal-1.0-r0 do_rootfs: [log_check] core-image-minimal: found 1 warning message in the logfile | [log_check] Warn: update-alternatives: libtool has multiple providers with the same priority, please check | .../core-image-minimal/1.0-r0/rootfs/usr/lib/opkg/alternatives/libtool for details The same priorities of alternatives are by design, so eliminate the warning for alternatives from multilib packages. Signed-off-by: Kai Kang <[email protected]> --- ...ot-warn-same-priorities-for-multilib.patch | 30 +++++++++++++++++++ .../opkg-utils/opkg-utils_0.3.6.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-not-warn-same-priorities-for-multilib.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-not-warn-same-priorities-for-multilib.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-not-warn-same-priorities-for-multilib.patch new file mode 100644 index 0000000000..19eb89259d --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-not-warn-same-priorities-for-multilib.patch @@ -0,0 +1,30 @@ +From 5d9ab3a3575267517c3c8fd9847b68f5987a4820 Mon Sep 17 00:00:00 2001 +From: Kai Kang <[email protected]> +Date: Tue, 18 Sep 2018 04:35:54 -0400 +Subject: [PATCH] update-alternatives: not warn same priorities for multilib + +Signed-off-by: Kai Kang <[email protected]> +--- + update-alternatives | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/update-alternatives b/update-alternatives +index 89a440b..61b7ef5 100644 +--- a/update-alternatives ++++ b/update-alternatives +@@ -94,7 +94,11 @@ add_alt() { + 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" ++ target=`head -1 $ad/$name` ++ # not warn same priorities from multilib packages ++ if grep -w "$priority" $ad/$name | grep -qv "^$target"; then ++ echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details" ++ fi + fi + echo "$path $priority" >> $ad/$name + } +-- +2.19.0.rc2 + diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb index 0487c5f305..ee002845a5 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb @@ -12,6 +12,7 @@ SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV file://0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch \ file://0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch \ file://threaded-xz.patch \ + file://update-alternatives-not-warn-same-priorities-for-multilib.patch \ " SRC_URI_append_class-native = " file://tar_ignore_error.patch" UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/"; -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
