diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-15 16:30:41 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-15 16:30:41 +0100 |
| commit | 20b4aa30c9104ed2ffb585cb3a669efae25df8f2 (patch) | |
| tree | d7c2e1550d8e436ed30079742bee2e82209e8550 | |
| parent | 80eba26fb101cc07fc21b0ddec724999b3161ea9 (diff) | |
| download | poky-20b4aa30c9104ed2ffb585cb3a669efae25df8f2.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info.inc | 16 |
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 c2e5487019..3ad38b47cf 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" | |||
| 7 | 7 | ||
| 8 | DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" | 8 | DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" |
| 9 | DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native" | 9 | DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native" |
| 10 | PR = "r0" | 10 | PR = "r1" |
| 11 | 11 | ||
| 12 | SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2" | 12 | SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2" |
| 13 | 13 | ||
| @@ -18,11 +18,17 @@ EXTRA_OECONF = "--disable-update-mimedb" | |||
| 18 | FILES_${PN} += "${datadir}/mime" | 18 | FILES_${PN} += "${datadir}/mime" |
| 19 | FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" | 19 | FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" |
| 20 | 20 | ||
| 21 | do_install_append() { | 21 | do_install () { |
| 22 | update-mime-database ${D}${datadir}/mime | 22 | autotools_do_install |
| 23 | 23 | ||
| 24 | # we do not need it on device and it is huge | 24 | update-mime-database ${D}${datadir}/mime |
| 25 | rm ${D}${datadir}/mime/packages/freedesktop.org.xml | 25 | |
| 26 | # we do not need it on device and it is huge | ||
| 27 | rm ${D}${datadir}/mime/packages/freedesktop.org.xml | ||
| 28 | } | ||
| 29 | |||
| 30 | do_install_virtclass-native () { | ||
| 31 | autotools_do_install | ||
| 26 | } | 32 | } |
| 27 | 33 | ||
| 28 | BBCLASSEXTEND = "native" | 34 | BBCLASSEXTEND = "native" |
