aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-lib
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-05-10 15:39:10 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2011-05-10 10:33:17 +0200
commit819fa4c451ea5a811b8dd78bbcbb38dc38c68aa4 (patch)
treed979c53a82547be33b077b60da44b10fdcea8d46 /recipes/xorg-lib
parent465521a22a064ccfe50d769a3c39f93f59095a80 (diff)
downloadopenembedded-819fa4c451ea5a811b8dd78bbcbb38dc38c68aa4.tar.gz
recipes: fix LICENSE fields
* & in LICENSE breaks distribute_sources ERROR: Function 'SRC_DISTRIBUTECOMMAND' failed (see /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/pixman-0.22.0-r5.0/temp/log.do_distribute_sources.17340 for further information) ERROR: Logfile of failure stored in: /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/pixman-0.22.0-r5.0/temp/log.do_distribute_sources.17340 Log data follows: | WARNING: LICENSE: 'PublicDomain & MIT & MIT-style' | WARNING: licenses: ['PublicDomain', '&', 'MIT', '&', 'MIT-style'] | WARNING: license: PublicDomain | WARNING: license: & | ERROR: Function 'SRC_DISTRIBUTECOMMAND' failed (see /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/pixman-0.22.0-r5.0/temp/log.do_distribute_sources.17340 for further information) | + cd /OE/tmpdir-shr/deploy/sources/PublicDomain/pixman | + SRC_DISTRIBUTECOMMAND | + test -e /OE/pixman-0.22.0.tar.gz.md5 | + ln -sf /OE/pixman-0.22.0.tar.gz . | + /pixman | + cd /OE/tmpdir-shr/deploy/sources/ | /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/pixman-0.22.0-r5.0/temp/run.SRC_DISTRIBUTECOMMAND.17340: line 95: /pixman: No such file or directory NOTE: package pixman-0.22.0-r5.0: task do_distribute_sources: Failed * "Public Domain" causes sources distributed from "Public" and "Domain" folders which is not expected, so use PD as in other recipes * embryo and epdf had LICENSE defined before inherit efl which overwrites it (that's why distribute_sources wasn't failing on their & Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes/xorg-lib')
-rw-r--r--recipes/xorg-lib/pixman_0.22.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/xorg-lib/pixman_0.22.0.bb b/recipes/xorg-lib/pixman_0.22.0.bb
index d256e6812e..ee1868178a 100644
--- a/recipes/xorg-lib/pixman_0.22.0.bb
+++ b/recipes/xorg-lib/pixman_0.22.0.bb
@@ -1,12 +1,12 @@
require pixman.inc
-LICENSE = "MIT & MIT-style & Public Domain"
+LICENSE = "MIT MIT-style PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3\
file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
file://pixman/pixman-x64-mmx-emulation.h;beginline=4;endline=9;md5=4e32716f2efaa6c4659222667c339bb8"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/${BPN}-${PV}.tar.gz \
file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \