[OE-core] [PATCH 1/3] shared-mime-info: package runtime data separately

[Rainer Koenig]

Am 09.11.2011 01:53, schrieb Joshua Lock:
> 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.

somehow this patch breaks the image creation for systemd-gnome-image.
Famous last words from bitbake:

--------------8<-snip-----------------
| Collected errors:
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies
for task-gnome:
|  *    shared-mime-info-data *         shared-mime-info-data *
|  * opkg_install_cmd: Cannot install package task-gnome.
| ERROR: Function 'do_rootfs' failed (see
/srv/oe/setup-scripts/build/tmp-angstrom_2010_x-eglibc/work/dm814x_evm-angstrom-linux-gnueabi/systemd-gnome-image-1.0-r0/temp/log.do_rootfs.6501
for further information)
NOTE: package systemd-gnome-image-1.0-r0: task do_rootfs: Failed
ERROR: Task 8
(/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb,
do_rootfs) failed with exit code '1'
ERROR:
'/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb'
failed
--------------8<-snip-----------------

And there is no package names shared-mime-info-data*. :-(


> Signed-off-by: Joshua Lock <josh at linux.intel.com>
> ---
>  .../shared-mime-info/shared-mime-info.inc          |    9 ++++++---
>  .../shared-mime-info/shared-mime-info_0.91.bb      |    2 +-
>  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 c8cab29..57e829c 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 0c3b01c..bc4a8f7 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"

Regards
Rainer