]> code.ossystems Code Review - openembedded-core.git/commitdiff
shared-mime-info: Don't run the util for the native version of the package
authorRichard Purdie <rpurdie@linux.intel.com>
Fri, 15 Oct 2010 15:30:41 +0000 (16:30 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Fri, 15 Oct 2010 15:30:41 +0000 (16:30 +0100)
The whole point of building a native version of this package is
to provide the share-mime-info binary so using it in do_install
of the native package is incorrect. Add a modified do_install for
the native version of the package to avoid this.

[BUGID #466]

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/recipes-support/shared-mime-info/shared-mime-info.inc

index c2e54870191b47519782e3f9cc7d36df6b13d460..3ad38b47cfb144f776c03ac7ef67e150edb979c6 100644 (file)
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native"
 DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
 
@@ -18,11 +18,17 @@ EXTRA_OECONF = "--disable-update-mimedb"
 FILES_${PN} += "${datadir}/mime"
 FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
 
-do_install_append() {
-    update-mime-database ${D}${datadir}/mime
+do_install () {
+       autotools_do_install
 
-    # we do not need it on device and it is huge
-    rm ${D}${datadir}/mime/packages/freedesktop.org.xml
+       update-mime-database ${D}${datadir}/mime
+
+       # we do not need it on device and it is huge
+       rm ${D}${datadir}/mime/packages/freedesktop.org.xml
+}
+
+do_install_virtclass-native () {
+       autotools_do_install
 }
 
 BBCLASSEXTEND = "native"