On Thu, Oct 12, 2017 at 10:58:35AM +0200, Martin Jansa wrote:
Thanks for quick merge, I've also noticed that morty branch received this:
commit ec03f5e7877db60518b9255bfc59a00d5c2624a3 Author: Koen Kooi koen.kooi@linaro.org Date: Fri Oct 6 15:18:54 2017 +0200
image-magic 6.9.2: resurrect old version to match python-wand Change-Id: I97552bed63803105826724f01e40f782745f1788 Signed-off-by: Koen Kooi <koen.kooi@linaro.org>Which is fine with me, but why wasn't the same merged to pyro and master? All 3 have the same issue with python-wand.
I'm sorry to be so pedantic :).
I see it was merged to pyro and rocko now, thanks!, but it's still missing in master.
Regards,
On Thu, Oct 12, 2017 at 9:34 AM, Fathi Boudra fathi.boudra@linaro.org wrote:
Thanks Martin. Merged in the 3 branches.
On 12 October 2017 at 05:12, Martin Jansa martin.jansa@gmail.com wrote:
- use SRCREV instead of tag name, so that bitbake doesn't translate tag
to SRCREV
every time it's parsing this recipe
- fix QA issue: ERROR: QA Issue: python-wand: Files/directories were installed but not
shipped in any package:
/usr/share /usr/share/README.rst
- add comment about imagemagick version needed to use python-wand-native otherwise it will use imagemagick from host
Signed-off-by: Martin Jansa Martin.Jansa@gmail.com
This is needed in all 3 branches: [morty][pyro][master] But for pyro you'll need to first backport from master (or forward port
from pyro) the upgrade to 0.4.4 from:
commit 7ed523b06bde259f99b21a15e8c936af4f18c752 Author: Fathi Boudra fathi.boudra@linaro.org Date: Thu Oct 5 22:46:48 2017 +0300
meta-optee: python-wand: upgrade to latest release 0.4.4 Latest python-wand release is from October 2016. Update to latest release: 0.4.4. Change-Id: I23dc1fbb817bbb26357c3ab6dcc86b251eea36e6 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>.../recipes-devtools/python/python-wand_0.4.4.bb | 24
+++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/meta-optee/recipes-devtools/python/python-wand_0.4.4.bb
b/meta-optee/recipes-devtools/python/python-wand_0.4.4.bb
index 1043987..9679b9c 100644 --- a/meta-optee/recipes-devtools/python/python-wand_0.4.4.bb +++ b/meta-optee/recipes-devtools/python/python-wand_0.4.4.bb @@ -6,11 +6,33 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=
170eafd687d4a2b950819cd5e067e6d5"
SRCNAME = "wand"
-SRC_URI = "git://github.com/dahlia/wand.git;tag=${PV}" +SRCREV = "c731c620c3c96c409a194dafab396ffbb97d6702" +SRC_URI = "git://github.com/dahlia/wand.git" S = "${WORKDIR}/git"
inherit setuptools
+# Requires imagemagick-6 while meta-oe morty and newer provides
imagemagick-7 which isn't compatible with wand
+# +# You can import imagemagick-5 from older meta-oe, before this upgrade: +# commit ec660639ecea3fcb6e554b6f1bafc504e8f2fc78 +# Author: Randy MacLeod randy.macleod@windriver.com +# Date: Mon Aug 8 17:41:34 2016 -0400 +# imagemagick: upgrade from 6.9.2 to 7.0.2 +# and add this commit on top of that: +# commit dfcb67af35936a351789044039a55e3fad299c1a +# Author: Andreas Müller schnitzeltony@googlemail.com +# Date: Sun Sep 18 02:47:26 2016 +0200 +# imagemagick: depend on fftw not virtual/fftw +# +# We need this old version becase python-wand-native used here +# depends on older imagemagick-native as discussed here: +# https://stackoverflow.com/questions/37011291/python-
wand-image-is-not-recognized
+# there still isn't newer python-wand supporting 7.* version: +# https://github.com/dahlia/wand/blob/4fe2c6ba9cb0d4105361cea6e9e9e8
3116080473/wand/api.py#L58
DEPENDS += " imagemagick-native"
BBCLASSEXTEND = "native"
+FILES_${PN} += "${datadir}"
2.7.4
OpenEmbedded mailing list OpenEmbedded@lists.linaro.org https://lists.linaro.org/mailman/listinfo/openembedded
-- Fathi Boudra Technical Lead | Builds and Baselines, Release Linaro.org | Open source software for ARM SoCs