[oe-commits] Christopher Larson : opkg-native: obey virtual/update-alternatives-native

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 1f9d979ca60eca2277f53f24dc59f9ab18e81195
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1f9d979ca60eca2277f53f24dc59f9ab18e81195

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Fri Dec 28 22:19:24 2012 -0700

opkg-native: obey virtual/update-alternatives-native

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-devtools/opkg/opkg.inc |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index f157188..47458ff 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
 
 PE = "1"
-INC_PR = "r11"
+INC_PR = "r12"
 
 # Werror gives all kinds bounds issuses with gcc 4.3.3
 do_configure_prepend() {
@@ -43,11 +43,17 @@ FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so"
 FILES_libopkg-staticdev = "${libdir}/*.a"
 FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
 
-# We need to create the lock directory
 do_install_append() {
+	# We need to create the lock directory
 	install -d ${D}${localstatedir}/lib/opkg
 }
 
+do_install_append_class-native() {
+	if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then
+		rm ${D}${bindir}/update-alternatives
+	fi
+}
+
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then