From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-fx0-f47.google.com ([209.85.161.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QJha2-0004G2-LG for openembedded-devel@lists.openembedded.org; Tue, 10 May 2011 09:42:06 +0200 Received: by fxm19 with SMTP id 19so4633355fxm.6 for ; Tue, 10 May 2011 00:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=Q0nqZwUvB6agdWn5Mfkw7DPCVHPaCKgf3ILTXAaRrac=; b=YIpPVKbrjazJ9DHcRHgnD2WGeRdYKoAyK2D4wTSjtBOLAwA+lXOuAyEGgxWw6UoZqJ SBioCLcxHXCOhFIWn7HbDlPc5vNZWgbhF1dJFfaQfe/d4WgNhDResn4loWESSQAyKf/y hcKO+c1DOW0kTVGHZL/QfQlO5NKwfOJliae1w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=FaeXUn/WdiHJ+Yvp5uU7lhOVRfRtjTz1JOsEXZxN576+Hh/+cK2MyK6X2Ugswxzhbm ZTqayjnohcD7NQ9O/XDmIQPDZxAogJiaHKCjmX6uaIrI+OQR8rzFXsqvJdQg/uGTtP+R PX2W9nJdz5rPJEHq3p8VpWruSEigC3DnuIEfU= Received: by 10.223.127.210 with SMTP id h18mr2125083fas.79.1305013161130; Tue, 10 May 2011 00:39:21 -0700 (PDT) Received: from localhost ([94.230.152.115]) by mx.google.com with ESMTPS id g5sm2257833faa.2.2011.05.10.00.39.19 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 May 2011 00:39:19 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Date: Tue, 10 May 2011 09:39:10 +0200 Message-Id: <1305013151-17485-1-git-send-email-Martin.Jansa@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 Subject: [PATCH 1/2] recipes: fix LICENSE fields X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2011 07:42:06 -0000 * & 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 --- recipes/antlr/antlr_2.7.7.bb | 4 +++- recipes/dt/dt.inc | 4 ++-- recipes/efl1/embryo.inc | 7 ++++--- recipes/efl1/epdf_svn.bb | 10 ++++++---- recipes/gtk+/composite-pixbuf_0.0.bb | 3 ++- recipes/mesa/mesa-demos_8.0.1.bb | 4 ++-- recipes/nrlolsr/nrlolsr_7.8.1.bb | 4 +++- recipes/xml-commons/jaxp1.3_1.3.04.bb | 4 +++- recipes/xorg-lib/pixman_0.22.0.bb | 4 ++-- 9 files changed, 27 insertions(+), 17 deletions(-) diff --git a/recipes/antlr/antlr_2.7.7.bb b/recipes/antlr/antlr_2.7.7.bb index 3dbcea7..ea921b5 100644 --- a/recipes/antlr/antlr_2.7.7.bb +++ b/recipes/antlr/antlr_2.7.7.bb @@ -1,8 +1,10 @@ DESCRIPTION = "Framework for constructing recognizers, interpreters, compilers, and translators" # see http://www.antlr2.org/license.html -LICENSE = "Public Domain" +LICENSE = "PD" HOMEPAGE = "http://www.antlr2.org" +PR = "r1" + SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz" inherit java-library diff --git a/recipes/dt/dt.inc b/recipes/dt/dt.inc index 31f3402..fbf5df5 100644 --- a/recipes/dt/dt.inc +++ b/recipes/dt/dt.inc @@ -3,8 +3,8 @@ operation of peripherals, file systems, device drivers, or any data stream suppo operating system." SECTION = "console/tests" HOMEPAGE = "http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/dt.html" -LICENSE = "Public domain" -INC_PR = "r0" +LICENSE = "PD" +INC_PR = "r1" SRC_URI = "http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/dt/dt-source.tar.gz" S = "${WORKDIR}/dt.d" diff --git a/recipes/efl1/embryo.inc b/recipes/efl1/embryo.inc index ab02905..8bb8b6f 100644 --- a/recipes/efl1/embryo.inc +++ b/recipes/efl1/embryo.inc @@ -1,11 +1,12 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje" -LICENSE = "MIT BSD & CompuPhase" -LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875" inherit efl +LICENSE = "MIT BSD CompuPhase" +LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875" + BBCLASSEXTEND = "native" -INC_PR = "r0" +INC_PR = "r1" # Some upgrade path tweaking AUTO_LIBNAME_PKGS = "" diff --git a/recipes/efl1/epdf_svn.bb b/recipes/efl1/epdf_svn.bb index 1f37629..490b3ce 100644 --- a/recipes/efl1/epdf_svn.bb +++ b/recipes/efl1/epdf_svn.bb @@ -1,8 +1,4 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" -LICENSE = "GPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \ -" DEPENDS = "poppler evas ecore" PV = "0.1.0+svnr${SRCPV}" @@ -10,6 +6,12 @@ PR = "r4" SRCREV = "${EFL_SRCREV}" inherit efl + +LICENSE = "GPLv2 LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \ +" + SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep" S = "${WORKDIR}/${SRCNAME}" diff --git a/recipes/gtk+/composite-pixbuf_0.0.bb b/recipes/gtk+/composite-pixbuf_0.0.bb index 29e329a..4c0479f 100644 --- a/recipes/gtk+/composite-pixbuf_0.0.bb +++ b/recipes/gtk+/composite-pixbuf_0.0.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Pixbuf performance test" -LICENSE = "Public domain" +LICENSE = "PD" DEPENDS = "gtk+" +PR = "r1" SRC_URI = "http://amelang.net/composite_pixbuf.c" diff --git a/recipes/mesa/mesa-demos_8.0.1.bb b/recipes/mesa/mesa-demos_8.0.1.bb index 0314342..3632761 100644 --- a/recipes/mesa/mesa-demos_8.0.1.bb +++ b/recipes/mesa/mesa-demos_8.0.1.bb @@ -2,11 +2,11 @@ DESCRIPTION = "mesa demo applications" HOMEPAGE = "http://mesa3d.org" SECTION = "x11" -LICENSE = "MIT & PD" +LICENSE = "MIT PD" DEPENDS = "virtual/libx11 virtual/libgl libglew" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2" diff --git a/recipes/nrlolsr/nrlolsr_7.8.1.bb b/recipes/nrlolsr/nrlolsr_7.8.1.bb index 3a748b9..bb3c1a8 100644 --- a/recipes/nrlolsr/nrlolsr_7.8.1.bb +++ b/recipes/nrlolsr/nrlolsr_7.8.1.bb @@ -1,6 +1,8 @@ DESCRIPTION = "NRL OLSR - added to OE to support the Maniac Challenge (http://www.maniacchallenge.org/)" SECTION = "applications" -LICENSE = "Public Domain" +LICENSE = "PD" + +PR = "r1" S="${WORKDIR}/nrlolsr/" diff --git a/recipes/xml-commons/jaxp1.3_1.3.04.bb b/recipes/xml-commons/jaxp1.3_1.3.04.bb index 1875fa7..8daa80f 100644 --- a/recipes/xml-commons/jaxp1.3_1.3.04.bb +++ b/recipes/xml-commons/jaxp1.3_1.3.04.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)" -LICENSES = "AL2.0 W3C Public Domain" +LICENSES = "AL2.0 W3C PD" AUTHOR = "Apache Software Foundation" +PR = "r1" + SRC_URI = "http://archive.apache.org/dist/xml/commons/source/xml-commons-external-${PV}-src.tar.gz;subdir=${BPN}-${PV}" inherit java-library diff --git a/recipes/xorg-lib/pixman_0.22.0.bb b/recipes/xorg-lib/pixman_0.22.0.bb index d256e68..ee18681 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 \ -- 1.7.5.rc3