summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-15 16:30:41 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-15 16:30:41 +0100
commit20b4aa30c9104ed2ffb585cb3a669efae25df8f2 (patch)
treed7c2e1550d8e436ed30079742bee2e82209e8550 /meta
parent80eba26fb101cc07fc21b0ddec724999b3161ea9 (diff)
downloadopenembedded-core-20b4aa30c9104ed2ffb585cb3a669efae25df8f2.tar.gz
openembedded-core-20b4aa30c9104ed2ffb585cb3a669efae25df8f2.tar.bz2
openembedded-core-20b4aa30c9104ed2ffb585cb3a669efae25df8f2.tar.xz
openembedded-core-20b4aa30c9104ed2ffb585cb3a669efae25df8f2.zip
shared-mime-info: Don't run the util for the native version of the package
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info.inc16
1 files changed, 11 insertions, 5 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index c2e548701..3ad38b47c 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -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"