Patchwork [meta-oe] imagemagick: fix unshipped packages

login
register
mail settings
Submitter Andreas Müller
Date Nov. 1, 2011, 11:21 a.m.
Message ID <1320146478-14875-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/14125/
State Accepted
Commit 17f049b0008f61f250069b9f1919b6c3b13d74de
Headers show

Comments

Andreas Müller - Nov. 1, 2011, 11:21 a.m.
on build we receive tons of warnings like

WARNING: For recipe imagemagick, the following files were installed but not shipped in any package:
WARNING:   /usr/lib/ImageMagick-6.4.4/config/type.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/type-solaris.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/locale.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/english.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/type-windows.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/type-ghostscript.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/delegates.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/configure.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/config/francais.xml
WARNING:   /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/analyze.a
WARNING:   /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/analyze.la
WARNING:   /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/analyze.so
WARNING:   /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/.debug/analyze.so
WARNING:   /usr/lib/ImageMagick-6.4.4/modules-Q16/coders/histogram.la
WARNING:   /usr/lib/ImageMagick-6.4.4/modules-Q16/coders/ycbcr.a
...

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../imagemagick/imagemagick_6.4.4.bb               |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb
index c38c644..dd84cb2 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=e1ebcc1358b9f81eba64255fc5da6892"
 # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib"
 
-PR = "r8"
+PR = "r9"
 
 PATCHSET = "1"
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
@@ -20,14 +20,14 @@  inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp"
 
-FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \
-                ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
-                ${libdir}/ImageMagick-${IMVER}/config/ \
-                ${datadir}/ImageMagick-${IMVER}"
+FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
+                ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
+                ${libdir}/ImageMagick-${PV}/config/ \
+                ${datadir}/ImageMagick-${PV}"
 
-FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
+FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a"
 
-FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*"
+FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
 
 BBCLASSEXTEND = "native"