[PATCH 1/2] recipes: fix LICENSE fields

[PATCH 1/2] recipes: fix LICENSE fields

[Martin Jansa]

* & 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>
---
 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

[PATCH 2/2] recipes: drop '+' from LICENSE fields

[Martin Jansa]

* '+' is valid folder name, so it does not break distribute_sources like & does,
  but still tmp/deploy/sources/+ folder doesn't make sense at all
* PR was bumped only when white-spaces were removed from LICENSE field causing
  sources to be stored in different folder (classpathx recipes)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/classpathx/gnujaf_1.1.1.bb      |    4 ++--
 recipes/classpathx/gnumail_1.1.2.bb     |    4 ++--
 recipes/classpathx/inetlib_1.1.1.bb     |    4 ++--
 recipes/gpe-themes/gpe-theme-e17_0.1.bb |    2 +-
 recipes/hwdata/hwdata_0.191.bb          |    2 +-
 recipes/sdr/soft66_git.bb               |    2 +-
 recipes/tesseract/tesseract_1.0.bb      |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/recipes/classpathx/gnujaf_1.1.1.bb b/recipes/classpathx/gnujaf_1.1.1.bb
index e0dfd24..94560ea 100644
--- a/recipes/classpathx/gnujaf_1.1.1.bb
+++ b/recipes/classpathx/gnujaf_1.1.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it."
-LICENSE = "GPL + library exception"
+LICENSE = "GPL+libraryexception"
 AUTHOR = "GNU ClasspathX"
 
 SRC_URI = "\
@@ -12,7 +12,7 @@ inherit autotools java-library
 
 S = "${WORKDIR}/activation-${PV}"
 
-PR = "r1"
+PR = "r2"
 
 export JAVAC = "javac"
 
diff --git a/recipes/classpathx/gnumail_1.1.2.bb b/recipes/classpathx/gnumail_1.1.2.bb
index 3eab0f6..0c3afd8 100644
--- a/recipes/classpathx/gnumail_1.1.2.bb
+++ b/recipes/classpathx/gnumail_1.1.2.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GNU's free implementation of the JavaMail API specification"
-LICENSE = "GPL + library exception"
+LICENSE = "GPL+libraryexception"
 AUTHOR = "GNU ClasspathX"
 
 SRC_URI = "\
@@ -14,7 +14,7 @@ S = "${WORKDIR}/mail-${PV}"
 DEPENDS = "fastjar-native gnujaf inetlib"
 DEPENDS_virtclass-native = "fastjar-native gnujaf-native inetlib-native"
 
-PR = "r1"
+PR = "r2"
 
 export JAVAC = "${STAGING_BINDIR_NATIVE}/javac"
 export JAVA = "${STAGING_BINDIR_NATIVE}/java"
diff --git a/recipes/classpathx/inetlib_1.1.1.bb b/recipes/classpathx/inetlib_1.1.1.bb
index 9377d6d..7d8e89d 100644
--- a/recipes/classpathx/inetlib_1.1.1.bb
+++ b/recipes/classpathx/inetlib_1.1.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "A Java library of clients for common internet protocols"
-LICENSE = "GPL + library exception"
+LICENSE = "GPL+libraryexception"
 AUTHOR = "GNU Classpath"
 HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html"
 
@@ -12,7 +12,7 @@ inherit java-library autotools
 
 DEPENDS = "fastjar-native"
 
-PR = "r1"
+PR = "r2"
 
 JPN = "libgnuinet-java"
 
diff --git a/recipes/gpe-themes/gpe-theme-e17_0.1.bb b/recipes/gpe-themes/gpe-theme-e17_0.1.bb
index bf29f9b..9b76007 100644
--- a/recipes/gpe-themes/gpe-theme-e17_0.1.bb
+++ b/recipes/gpe-themes/gpe-theme-e17_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION =	"GTK+ enlightenment theme adjusted for GPE"
-LICENSE = 	"MIT + GPL"
+LICENSE = 	"MIT GPL"
 PR =		"r1"
 
 #it doesn't really depends on it, but it's nice to make OE build it
diff --git a/recipes/hwdata/hwdata_0.191.bb b/recipes/hwdata/hwdata_0.191.bb
index 527efdf..e94d997 100644
--- a/recipes/hwdata/hwdata_0.191.bb
+++ b/recipes/hwdata/hwdata_0.191.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "This package contains various hardware identification and configuration data, such as the pci.ids database, or the XFree86/xorg Cards database. It's needed for the kudzu hardware detection."
-LICENSE = "GPL + X11"
+LICENSE = "GPL X11"
 
 PR = "r1"
 
diff --git a/recipes/sdr/soft66_git.bb b/recipes/sdr/soft66_git.bb
index 8955d1e..7aa827f 100644
--- a/recipes/sdr/soft66_git.bb
+++ b/recipes/sdr/soft66_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Library and tools for Soft66ADD and related SDR radio receivers"
-LICENSE = "GPLv3 + LGPLv3"
+LICENSE = "GPLv3 LGPLv3"
 
 DEPENDS = "libftdi"
 
diff --git a/recipes/tesseract/tesseract_1.0.bb b/recipes/tesseract/tesseract_1.0.bb
index 762eb95..de20403 100644
--- a/recipes/tesseract/tesseract_1.0.bb
+++ b/recipes/tesseract/tesseract_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "A commercial quality OCR engine "
-LICENSE = "APL + others"
+LICENSE = "APL others"
 
 DEPENDS = "tiff"
 
-- 
1.7.5.rc3

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Acked-by: Koen Kooi <koen@dominion.thruhere.net>

On 10-05-11 09:39, Martin Jansa wrote:
> * & 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>
> ---
>  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 \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNyPCxMkyGM64RGpERAt9eAJ4z9eLM+NkO3TV9fpy7EeSW3Pd9SgCgsy1k
c9pg4QSATzX78taQD4K7nWs=
=oxrv
-----END PGP SIGNATURE-----

Re: [PATCH 2/2] recipes: drop '+' from LICENSE fields

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10-05-11 09:39, Martin Jansa wrote:
> * '+' is valid folder name, so it does not break distribute_sources like & does,
>   but still tmp/deploy/sources/+ folder doesn't make sense at all
> * PR was bumped only when white-spaces were removed from LICENSE field causing
>   sources to be stored in different folder (classpathx recipes)
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Acked-by: Koen Kooi <koen@dominion.thruhere.net>

> ---
>  recipes/classpathx/gnujaf_1.1.1.bb      |    4 ++--
>  recipes/classpathx/gnumail_1.1.2.bb     |    4 ++--
>  recipes/classpathx/inetlib_1.1.1.bb     |    4 ++--
>  recipes/gpe-themes/gpe-theme-e17_0.1.bb |    2 +-
>  recipes/hwdata/hwdata_0.191.bb          |    2 +-
>  recipes/sdr/soft66_git.bb               |    2 +-
>  recipes/tesseract/tesseract_1.0.bb      |    2 +-
>  7 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/recipes/classpathx/gnujaf_1.1.1.bb b/recipes/classpathx/gnujaf_1.1.1.bb
> index e0dfd24..94560ea 100644
> --- a/recipes/classpathx/gnujaf_1.1.1.bb
> +++ b/recipes/classpathx/gnujaf_1.1.1.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "Provides a mean to type data and locate components suitable for performing various kinds of action on it."
> -LICENSE = "GPL + library exception"
> +LICENSE = "GPL+libraryexception"
>  AUTHOR = "GNU ClasspathX"
>  
>  SRC_URI = "\
> @@ -12,7 +12,7 @@ inherit autotools java-library
>  
>  S = "${WORKDIR}/activation-${PV}"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  export JAVAC = "javac"
>  
> diff --git a/recipes/classpathx/gnumail_1.1.2.bb b/recipes/classpathx/gnumail_1.1.2.bb
> index 3eab0f6..0c3afd8 100644
> --- a/recipes/classpathx/gnumail_1.1.2.bb
> +++ b/recipes/classpathx/gnumail_1.1.2.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "GNU's free implementation of the JavaMail API specification"
> -LICENSE = "GPL + library exception"
> +LICENSE = "GPL+libraryexception"
>  AUTHOR = "GNU ClasspathX"
>  
>  SRC_URI = "\
> @@ -14,7 +14,7 @@ S = "${WORKDIR}/mail-${PV}"
>  DEPENDS = "fastjar-native gnujaf inetlib"
>  DEPENDS_virtclass-native = "fastjar-native gnujaf-native inetlib-native"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  export JAVAC = "${STAGING_BINDIR_NATIVE}/javac"
>  export JAVA = "${STAGING_BINDIR_NATIVE}/java"
> diff --git a/recipes/classpathx/inetlib_1.1.1.bb b/recipes/classpathx/inetlib_1.1.1.bb
> index 9377d6d..7d8e89d 100644
> --- a/recipes/classpathx/inetlib_1.1.1.bb
> +++ b/recipes/classpathx/inetlib_1.1.1.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "A Java library of clients for common internet protocols"
> -LICENSE = "GPL + library exception"
> +LICENSE = "GPL+libraryexception"
>  AUTHOR = "GNU Classpath"
>  HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html"
>  
> @@ -12,7 +12,7 @@ inherit java-library autotools
>  
>  DEPENDS = "fastjar-native"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  JPN = "libgnuinet-java"
>  
> diff --git a/recipes/gpe-themes/gpe-theme-e17_0.1.bb b/recipes/gpe-themes/gpe-theme-e17_0.1.bb
> index bf29f9b..9b76007 100644
> --- a/recipes/gpe-themes/gpe-theme-e17_0.1.bb
> +++ b/recipes/gpe-themes/gpe-theme-e17_0.1.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION =	"GTK+ enlightenment theme adjusted for GPE"
> -LICENSE = 	"MIT + GPL"
> +LICENSE = 	"MIT GPL"
>  PR =		"r1"
>  
>  #it doesn't really depends on it, but it's nice to make OE build it
> diff --git a/recipes/hwdata/hwdata_0.191.bb b/recipes/hwdata/hwdata_0.191.bb
> index 527efdf..e94d997 100644
> --- a/recipes/hwdata/hwdata_0.191.bb
> +++ b/recipes/hwdata/hwdata_0.191.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "This package contains various hardware identification and configuration data, such as the pci.ids database, or the XFree86/xorg Cards database. It's needed for the kudzu hardware detection."
> -LICENSE = "GPL + X11"
> +LICENSE = "GPL X11"
>  
>  PR = "r1"
>  
> diff --git a/recipes/sdr/soft66_git.bb b/recipes/sdr/soft66_git.bb
> index 8955d1e..7aa827f 100644
> --- a/recipes/sdr/soft66_git.bb
> +++ b/recipes/sdr/soft66_git.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "Library and tools for Soft66ADD and related SDR radio receivers"
> -LICENSE = "GPLv3 + LGPLv3"
> +LICENSE = "GPLv3 LGPLv3"
>  
>  DEPENDS = "libftdi"
>  
> diff --git a/recipes/tesseract/tesseract_1.0.bb b/recipes/tesseract/tesseract_1.0.bb
> index 762eb95..de20403 100644
> --- a/recipes/tesseract/tesseract_1.0.bb
> +++ b/recipes/tesseract/tesseract_1.0.bb
> @@ -1,5 +1,5 @@
>  DESCRIPTION = "A commercial quality OCR engine "
> -LICENSE = "APL + others"
> +LICENSE = "APL others"
>  
>  DEPENDS = "tiff"
>  

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNyPC9MkyGM64RGpERApcpAKCpHvFEqaG50Z9dIMxzHwm6ccY6GQCdEESy
GHutDfOjxispdcit8ypbqDk=
=Uz9S
-----END PGP SIGNATURE-----

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Phil Blundell]

On Tue, 2011-05-10 at 09:39 +0200, Martin Jansa wrote:
>   | /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

If '&' in ${LICENSE} is breaking SRC_DISTRIBUTECOMMAND then that
suggests there is a bug in that code (probably some sort of missing
quotes).  Removing the &s might be a fine thing to do anyway, but it
would also be a good idea to track down and fix the underlying bug.

p.

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

On Tue, May 10, 2011 at 10:28:15AM +0100, Phil Blundell wrote:
> On Tue, 2011-05-10 at 09:39 +0200, Martin Jansa wrote:
> >   | /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
> 
> If '&' in ${LICENSE} is breaking SRC_DISTRIBUTECOMMAND then that
> suggests there is a bug in that code (probably some sort of missing
> quotes).  Removing the &s might be a fine thing to do anyway, but it
> would also be a good idea to track down and fix the underlying bug.

it calls cd tmp/deploy/sources/$license/pixman
where with $license == '&' (because LICENSE field is splitted by ' ' and
then '|'), it ends doing cd on background and then complaing about /pixman

Directory named & even when created with right backslash
is still hard to use, so I think it would be better to have QA check 
that LICENSE field has sane value, even better when we have list of
possible values etc.

Regards,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Phil Blundell]

On Tue, 2011-05-10 at 11:36 +0200, Martin Jansa wrote:
> it calls cd tmp/deploy/sources/$license/pixman
> where with $license == '&' (because LICENSE field is splitted by ' ' and
> then '|'), it ends doing cd on background and then complaing about /pixman

Right, so that is a bug.  The argument to cd should be quoted.  (There
is no need for backslashes as your mail implied.)

> Directory named & even when created with right backslash
> is still hard to use, so I think it would be better to have QA check 
> that LICENSE field has sane value, even better when we have list of
> possible values etc.

Yes, agreed, but I think the quoting bug should also be fixed.

p.

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Denys Dmytriyenko]

On Tue, May 10, 2011 at 11:36:16AM +0200, Martin Jansa wrote:
> On Tue, May 10, 2011 at 10:28:15AM +0100, Phil Blundell wrote:
> > On Tue, 2011-05-10 at 09:39 +0200, Martin Jansa wrote:
> > >   | /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
> > 
> > If '&' in ${LICENSE} is breaking SRC_DISTRIBUTECOMMAND then that
> > suggests there is a bug in that code (probably some sort of missing
> > quotes).  Removing the &s might be a fine thing to do anyway, but it
> > would also be a good idea to track down and fix the underlying bug.
> 
> it calls cd tmp/deploy/sources/$license/pixman
> where with $license == '&' (because LICENSE field is splitted by ' ' and
> then '|'), it ends doing cd on background and then complaing about /pixman
> 
> Directory named & even when created with right backslash
> is still hard to use, so I think it would be better to have QA check 
> that LICENSE field has sane value, even better when we have list of
> possible values etc.

I would agree with Phil that fixing distribute_sources is required, but I'd go 
even further as to say that the current implementation of distribute_sources 
is quite bad. It splits the LICENSE field into tokens based on the wrong 
assumptions that all the whitespaces are used to separate multiple licenses. 
In other words, "Public Domain" is a valid license and shouldn't be replaced 
with "PD". What are you going to do with "GPLv2+ w/ GCC RLE"? Which stands for 
"GPL version 2 (or later) with GCC Runtime Library Exception" and is a valid 
license with an exception... Sorry, but "GPL+libraryexception" is just bogus 
(and it's not a personal remark - I do understand your constrains, see below).

I understand that distribute_sources is quite important and useful. So, maybe 
the correct way is to adopt a proper and stricter syntax for the LICENSE 
field, which uses some other characters to separate multiple licenses. Say, 
something like ":" or "|" should work. Using "," would be even better, but I'm 
afraid it can easily be used inside the license name on its own... Basically, 
something along the lines of "GPL:MIT:Public Domain:Texas A&M Proprietary" etc.

Any comments or objections?

-- 
Denys

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3094 bytes --]

On Thu, May 12, 2011 at 12:39:19PM -0400, Denys Dmytriyenko wrote:
> On Tue, May 10, 2011 at 11:36:16AM +0200, Martin Jansa wrote:
> > On Tue, May 10, 2011 at 10:28:15AM +0100, Phil Blundell wrote:
> > > On Tue, 2011-05-10 at 09:39 +0200, Martin Jansa wrote:
> > > >   | /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
> > > 
> > > If '&' in ${LICENSE} is breaking SRC_DISTRIBUTECOMMAND then that
> > > suggests there is a bug in that code (probably some sort of missing
> > > quotes).  Removing the &s might be a fine thing to do anyway, but it
> > > would also be a good idea to track down and fix the underlying bug.
> > 
> > it calls cd tmp/deploy/sources/$license/pixman
> > where with $license == '&' (because LICENSE field is splitted by ' ' and
> > then '|'), it ends doing cd on background and then complaing about /pixman
> > 
> > Directory named & even when created with right backslash
> > is still hard to use, so I think it would be better to have QA check 
> > that LICENSE field has sane value, even better when we have list of
> > possible values etc.
> 
> I would agree with Phil that fixing distribute_sources is required, but I'd go 
> even further as to say that the current implementation of distribute_sources 
> is quite bad. It splits the LICENSE field into tokens based on the wrong 
> assumptions that all the whitespaces are used to separate multiple licenses. 
> In other words, "Public Domain" is a valid license and shouldn't be replaced 
> with "PD". What are you going to do with "GPLv2+ w/ GCC RLE"? Which stands for 
> "GPL version 2 (or later) with GCC Runtime Library Exception" and is a valid 

> license with an exception... Sorry, but "GPL+libraryexception" is just bogus 
> (and it's not a personal remark - I do understand your constrains, see below).

Agreed, but do you find
LICENSE = "GPL + library exception"
better?

> I understand that distribute_sources is quite important and useful. So, maybe 
> the correct way is to adopt a proper and stricter syntax for the LICENSE 
> field, which uses some other characters to separate multiple licenses. Say, 
> something like ":" or "|" should work. Using "," would be even better, but I'm 

'|' is alredy used for split in distribute_sources, but I'm not sure if
my interpretation that it means logical OR in LICENSE context is right
(and space as logical AND).

> afraid it can easily be used inside the license name on its own... Basically, 
> something along the lines of "GPL:MIT:Public Domain:Texas A&M Proprietary" etc.
> 
> Any comments or objections?

oe-core does more with LICENSEs (like LIC_FILES_CHKSUMs and keeping
common licenses in
/OE/shr-core/openembedded-core/meta/files/common-licenses which could be
used for QA check on LICENSE field) so I think it should be discussed on
oe-core ML first and then use the same syntax in oe.dev or just switch
to oe-core..

Regards,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]

Re: [oe] [PATCH 1/2] recipes: fix LICENSE fields

[Denys Dmytriyenko]

On Thu, May 12, 2011 at 08:21:58PM +0200, Martin Jansa wrote:
> On Thu, May 12, 2011 at 12:39:19PM -0400, Denys Dmytriyenko wrote:
> > On Tue, May 10, 2011 at 11:36:16AM +0200, Martin Jansa wrote:
> > > On Tue, May 10, 2011 at 10:28:15AM +0100, Phil Blundell wrote:
> > > > On Tue, 2011-05-10 at 09:39 +0200, Martin Jansa wrote:
> > > > >   | /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
> > > > 
> > > > If '&' in ${LICENSE} is breaking SRC_DISTRIBUTECOMMAND then that
> > > > suggests there is a bug in that code (probably some sort of missing
> > > > quotes).  Removing the &s might be a fine thing to do anyway, but it
> > > > would also be a good idea to track down and fix the underlying bug.
> > > 
> > > it calls cd tmp/deploy/sources/$license/pixman
> > > where with $license == '&' (because LICENSE field is splitted by ' ' and
> > > then '|'), it ends doing cd on background and then complaing about /pixman
> > > 
> > > Directory named & even when created with right backslash
> > > is still hard to use, so I think it would be better to have QA check 
> > > that LICENSE field has sane value, even better when we have list of
> > > possible values etc.
> > 
> > I would agree with Phil that fixing distribute_sources is required, but I'd go 
> > even further as to say that the current implementation of distribute_sources 
> > is quite bad. It splits the LICENSE field into tokens based on the wrong 
> > assumptions that all the whitespaces are used to separate multiple licenses. 
> > In other words, "Public Domain" is a valid license and shouldn't be replaced 
> > with "PD". What are you going to do with "GPLv2+ w/ GCC RLE"? Which stands for 
> > "GPL version 2 (or later) with GCC Runtime Library Exception" and is a valid 
> 
> > license with an exception... Sorry, but "GPL+libraryexception" is just bogus 
> > (and it's not a personal remark - I do understand your constrains, see below).
> 
> Agreed, but do you find
> LICENSE = "GPL + library exception"

LICENSE = "GPL w/ library exception"

> better?
> 
> > I understand that distribute_sources is quite important and useful. So, maybe 
> > the correct way is to adopt a proper and stricter syntax for the LICENSE 
> > field, which uses some other characters to separate multiple licenses. Say, 
> > something like ":" or "|" should work. Using "," would be even better, but I'm 
> 
> '|' is alredy used for split in distribute_sources, but I'm not sure if
> my interpretation that it means logical OR in LICENSE context is right
> (and space as logical AND).

Yes, I had already previously suggested using Debian's syntax for the license 
field, which allows complex combinations, such as OR/AND:

http://thread.gmane.org/gmane.comp.handhelds.openembedded/38585/focus=38590

> > afraid it can easily be used inside the license name on its own... Basically, 
> > something along the lines of "GPL:MIT:Public Domain:Texas A&M Proprietary" etc.
> > 
> > Any comments or objections?
> 
> oe-core does more with LICENSEs (like LIC_FILES_CHKSUMs and keeping
> common licenses in
> /OE/shr-core/openembedded-core/meta/files/common-licenses which could be
> used for QA check on LICENSE field) so I think it should be discussed on
> oe-core ML first and then use the same syntax in oe.dev or just switch
> to oe-core..

Yes, I'm quite aware of Yocto/oe-core handling of licenses and checksum 
verification mechanism for them, but unfortunately we don't have that in 
mainline classic OE... We could try backporting it from oe-core to classic OE 
or just wait until with switch to oe-core completely. In that case I'd suggest 
avoid mangling license fields just to satisfy broken distribute_sources...

-- 
Denys

Re: [PATCH 1/2] recipes: fix LICENSE fields

[Denys Dmytriyenko]

On Thu, May 12, 2011 at 08:21:58PM +0200, Martin Jansa wrote:
> On Thu, May 12, 2011 at 12:39:19PM -0400, Denys Dmytriyenko wrote:
> > On Tue, May 10, 2011 at 11:36:16AM +0200, Martin Jansa wrote:
> > > On Tue, May 10, 2011 at 10:28:15AM +0100, Phil Blundell wrote:
> > > > On Tue, 2011-05-10 at 09:39 +0200, Martin Jansa wrote:
> > > > >   | /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
> > > > 
> > > > If '&' in ${LICENSE} is breaking SRC_DISTRIBUTECOMMAND then that
> > > > suggests there is a bug in that code (probably some sort of missing
> > > > quotes).  Removing the &s might be a fine thing to do anyway, but it
> > > > would also be a good idea to track down and fix the underlying bug.
> > > 
> > > it calls cd tmp/deploy/sources/$license/pixman
> > > where with $license == '&' (because LICENSE field is splitted by ' ' and
> > > then '|'), it ends doing cd on background and then complaing about /pixman
> > > 
> > > Directory named & even when created with right backslash
> > > is still hard to use, so I think it would be better to have QA check 
> > > that LICENSE field has sane value, even better when we have list of
> > > possible values etc.
> > 
> > I would agree with Phil that fixing distribute_sources is required, but I'd go 
> > even further as to say that the current implementation of distribute_sources 
> > is quite bad. It splits the LICENSE field into tokens based on the wrong 
> > assumptions that all the whitespaces are used to separate multiple licenses. 
> > In other words, "Public Domain" is a valid license and shouldn't be replaced 
> > with "PD". What are you going to do with "GPLv2+ w/ GCC RLE"? Which stands for 
> > "GPL version 2 (or later) with GCC Runtime Library Exception" and is a valid 
> 
> > license with an exception... Sorry, but "GPL+libraryexception" is just bogus 
> > (and it's not a personal remark - I do understand your constrains, see below).
> 
> Agreed, but do you find
> LICENSE = "GPL + library exception"

LICENSE = "GPL w/ library exception"

> better?
> 
> > I understand that distribute_sources is quite important and useful. So, maybe 
> > the correct way is to adopt a proper and stricter syntax for the LICENSE 
> > field, which uses some other characters to separate multiple licenses. Say, 
> > something like ":" or "|" should work. Using "," would be even better, but I'm 
> 
> '|' is alredy used for split in distribute_sources, but I'm not sure if
> my interpretation that it means logical OR in LICENSE context is right
> (and space as logical AND).

Yes, I had already previously suggested using Debian's syntax for the license 
field, which allows complex combinations, such as OR/AND:

http://thread.gmane.org/gmane.comp.handhelds.openembedded/38585/focus=38590

> > afraid it can easily be used inside the license name on its own... Basically, 
> > something along the lines of "GPL:MIT:Public Domain:Texas A&M Proprietary" etc.
> > 
> > Any comments or objections?
> 
> oe-core does more with LICENSEs (like LIC_FILES_CHKSUMs and keeping
> common licenses in
> /OE/shr-core/openembedded-core/meta/files/common-licenses which could be
> used for QA check on LICENSE field) so I think it should be discussed on
> oe-core ML first and then use the same syntax in oe.dev or just switch
> to oe-core..

Yes, I'm quite aware of Yocto/oe-core handling of licenses and checksum 
verification mechanism for them, but unfortunately we don't have that in 
mainline classic OE... We could try backporting it from oe-core to classic OE 
or just wait until with switch to oe-core completely. In that case I'd suggest 
avoid mangling license fields just to satisfy broken distribute_sources...

-- 
Denys

Re: [oe] [PATCH 1/2] recipes: fix LICENSE fields

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

On Thu, May 12, 2011 at 04:32:36PM -0400, Denys Dmytriyenko wrote:
> Yes, I'm quite aware of Yocto/oe-core handling of licenses and checksum 
> verification mechanism for them, but unfortunately we don't have that in 
> mainline classic OE... We could try backporting it from oe-core to classic OE 
> or just wait until with switch to oe-core completely. In that case I'd suggest 
> avoid mangling license fields just to satisfy broken distribute_sources...

OK, those & were breaking my image build because I have
distribute_sources enabled.. but next time I won't push anything
changing LICENSE fields to oe.dev..

Cheers,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [OE-core] [PATCH 1/2] recipes: fix LICENSE fields

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

On Thu, May 12, 2011 at 04:32:36PM -0400, Denys Dmytriyenko wrote:
> Yes, I'm quite aware of Yocto/oe-core handling of licenses and checksum 
> verification mechanism for them, but unfortunately we don't have that in 
> mainline classic OE... We could try backporting it from oe-core to classic OE 
> or just wait until with switch to oe-core completely. In that case I'd suggest 
> avoid mangling license fields just to satisfy broken distribute_sources...

OK, those & were breaking my image build because I have
distribute_sources enabled.. but next time I won't push anything
changing LICENSE fields to oe.dev..

Cheers,
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]