summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-11-08 15:31:32 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 14:58:14 +0000
commit07ee2d7e6b2f571fe405464838e376cf03e5e8e6 (patch)
tree3d4218a330f87e42ce4c52c19d5cd9b58f8e8de7 /meta
parent013eca09c863862cc6b7ee3bc22923bf8fb42956 (diff)
downloadopenembedded-core-07ee2d7e6b2f571fe405464838e376cf03e5e8e6.tar.gz
openembedded-core-07ee2d7e6b2f571fe405464838e376cf03e5e8e6.tar.bz2
openembedded-core-07ee2d7e6b2f571fe405464838e376cf03e5e8e6.zip
shared-mime-info: package runtime data separately
The freedesktop.org.xml is required when updating the mime database but otherwise not much use. Therefore package it separately, rather than removing it completely, so that it can be used as required for on-device updates without adding almost 2MB to every image which hase shared-mime-info. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info.inc9
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb2
2 files changed, 7 insertions, 4 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 c8cab291da..57e829c114 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb"
FILES_${PN} += "${datadir}/mime"
FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
+# freedesktop.org.xml is only required when updating the mime database,
+# package it separately
+PACKAGES += "shared-mime-info-data"
+FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
+RDEPENDS_shared-mime-info-data = "shared-mime-info"
+
do_install () {
autotools_do_install
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 () {
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
index 0c3b01cb9d..bc4a8f70b7 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -1,5 +1,5 @@
require shared-mime-info.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"