license.bbclass fixes

PATCH Applied Elizabeth Flanagan 3 participants 9 messages Sep 26, 2012 – Sep 28, 2012

lore

Share & tools

lore

Elizabeth Flanagan

author

2012-09-26 22:04 UTC #0 lore raw

cover license.bbclass fixes

[YOCTO #3118]

license.conf hasn't been being parsed. This commit series ensures that license.conf is parsed, that it contains useful variables that should be in a global conf file and that those variables are not kept within license.bbclass.

This also fixes an discreprancy between the documentation of LICENSE_PATH (which is what we tell people to use) and what we were using "LICENSE_DIR". This ensures that when the end user needs to add additional licenses, that they use LICENSE_PATH += "path/to/additional/licenses" and that it works.

The following changes since commit 0b09e50810162a07ef0aecee91ee32b4a36334a3:

busybox: Fix misplaced quote (2012-09-26 18:28:36 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/LICENSE_PATH
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/LICENSE_PATH

Elizabeth Flanagan (3):
license.bbclass: Variable standardization bitbake.conf: parse license config license.conf/bbclass: Move globals to license.conf

 meta/classes/license.bbclass |   67 +-----------------------------------------
 meta/conf/bitbake.conf       |    1 +
 meta/conf/licenses.conf      |   64 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 66 deletions(-)

Signature · 1 line

1.7.5.4

Elizabeth Flanagan

author

2012-09-26 22:04 UTC #1 lore raw

PATCH 1/3 license.bbclass: Variable standardization

The variable mentioned in license.conf is LICENSE_PATH. The variable used in license.bbclass is LICENSE_DIR. Conforming to what is in license.conf

Signed-off-by Elizabeth Flanagan <[email protected]>

---
 meta/classes/license.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/classes/license.bbclass +1 -1

index ffcaf93..ad543f6 100644
@@ -186,7 +186,7 @@ python do_populate_lic() {
     license_source_dirs = []
     license_source_dirs.append(generic_directory)
     try:
-        additional_lic_dirs = d.getVar('LICENSE_DIR', True).split()
+        additional_lic_dirs = d.getVar('LICENSE_PATH', True).split()
         for lic_dir in additional_lic_dirs:
             license_source_dirs.append(lic_dir)
     except:

Signature · 1 line

1.7.5.4

Elizabeth Flanagan

author

2012-09-26 22:04 UTC #2 lore raw

PATCH 2/3 bitbake.conf: parse license config

license.conf hasn't been being parsed. It probably should be.

Signed-off-by Elizabeth Flanagan <[email protected]>

---
 meta/conf/bitbake.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

meta/conf/bitbake.conf +1 -0

index 3496d2b..e168ef1 100644
@@ -683,6 +683,7 @@ include conf/machine-sdk/${SDKMACHINE}.conf
 include conf/distro/${DISTRO}.conf
 include conf/distro/defaultsetup.conf
 include conf/documentation.conf
+include conf/licenses.conf
 require conf/sanity.conf
 
 ##################################################################

Signature · 1 line

1.7.5.4

Elizabeth Flanagan

author

2012-09-26 22:04 UTC #3 lore raw

PATCH 3/3 license.conf/bbclass: Move globals to license.conf

In reply to Elizabeth Flanagan

This requires the changes to bitbake.conf that allow parsing of license.conf.

As we should now be parsing license.conf, we can move some globals out of license.bblcass and into the conf file.

Signed-off-by Elizabeth Flanagan <[email protected]>

---
 meta/classes/license.bbclass |   65 ------------------------------------------
 meta/conf/licenses.conf      |   64 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 65 deletions(-)

meta/classes/license.bbclass +0 ~~-65~~

index ad543f6..a66933f 100644
@@ -10,71 +10,6 @@ addtask populate_lic after do_patch before do_package
 do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}"
 do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
 
-# Standards are great! Everyone has their own. In an effort to standardize licensing
-# names, common-licenses will use the SPDX standard license names. In order to not
-# break the non-standardized license names that we find in LICENSE, we'll set
-# up a bunch of VarFlags to accomodate non-SPDX license names.
-#
-# We should really discuss standardizing this field, but that's a longer term goal.
-# For now, we can do this and it should grab the most common LICENSE naming variations.
-#
-# We should NEVER have a GPL/LGPL without a version!!!!
-# Any mapping to MPL/LGPL/GPL should be fixed
-# see: https://wiki.yoctoproject.org/wiki/License_Audit
-
-# GPL variations
-SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
-SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
-SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
-SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
-SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
-SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
-SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
-SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
-SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
-
-#LGPL variations
-SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
-SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
-SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
-SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
-SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
-
-#MPL variations
-SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
-SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
-SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
-SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
-
-#MIT variations
-SPDXLICENSEMAP[MIT-X] = "MIT"
-SPDXLICENSEMAP[MIT-style] = "MIT"
-
-#Openssl variations
-SPDXLICENSEMAP[openssl] = "OpenSSL"
-
-#Python variations
-SPDXLICENSEMAP[PSF] = "Python-2.0"
-SPDXLICENSEMAP[PSFv2] = "Python-2.0"
-SPDXLICENSEMAP[Python-2] = "Python-2.0"
-
-#Apache variations
-SPDXLICENSEMAP[Apachev2] = "Apache-2.0"
-SPDXLICENSEMAP[Apache-2] = "Apache-2.0"
-
-#Artistic variations
-SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0"
-SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0"
-
-#Academic variations
-SPDXLICENSEMAP[AFL-2] = "AFL-2.0"
-SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
-SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
-SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
-
-#Other variations
-SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
-
 license_create_manifest() {
 	mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
 	# Get list of installed packages

meta/conf/licenses.conf +64 -0

70 lines not on this page · raw message

Signature · 1 line

1.7.5.4

Saul Wold

2012-09-27 17:08 UTC #4 lore raw

Re: [PATCH 1/3] license.bbclass: Variable standardization

In reply to Elizabeth Flanagan

Quoted 14 lines · Elizabeth Flanagan

The variable mentioned in license.conf is LICENSE_PATH. The variable used in license.bbclass is LICENSE_DIR. Conforming to what is in license.conf
Signed-off-by Elizabeth Flanagan <[email protected]>
---
  meta/classes/license.bbclass |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/license.bbclass +0 -0
index ffcaf93..ad543f6 100644

meta/classes/license.bbclass python do_populate_lic() { · line 189

Quoted 5 lines

meta/classes/license.bbclass +1 -1

@@ -186,7 +186,7 @@ python do_populate_lic() {
      license_source_dirs = []
      license_source_dirs.append(generic_directory)
      try:
-        additional_lic_dirs = d.getVar('LICENSE_DIR', True).split()
+        additional_lic_dirs = d.getVar('LICENSE_PATH', True).split()

Beth, I found that we also have LICENSE_DIRECTORY, so the intent here is to be a multiple directory (such as a search PATH) for licenses?

There is also some documentation that needs to be changed, should not prevent this patch from being pulled.

Sau!

Quoted 4 lines

meta/classes/license.bbclass +0 -0

          for lic_dir in additional_lic_dirs:
              license_source_dirs.append(lic_dir)
      except:

Saul Wold

2012-09-27 17:21 UTC #5 lore raw

In reply to Elizabeth Flanagan

Quoted 7 lines · Elizabeth Flanagan

[YOCTO #3118]
license.conf hasn't been being parsed. This commit series ensures that license.conf is parsed, that it contains useful variables that should be in a global conf file and that those variables are not kept within license.bbclass.

So where is the inherit license bbclass?

Sau!

Quoted 24 lines

This also fixes an discreprancy between the documentation of LICENSE_PATH (which is what we tell people to use) and what we were using "LICENSE_DIR". This ensures that when the end user needs to add additional licenses, that they use LICENSE_PATH += "path/to/additional/licenses" and that it works.
The following changes since commit 0b09e50810162a07ef0aecee91ee32b4a36334a3:
   busybox: Fix misplaced quote (2012-09-26 18:28:36 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/LICENSE_PATH
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/LICENSE_PATH
Elizabeth Flanagan (3):
license.bbclass: Variable standardization bitbake.conf: parse license config license.conf/bbclass: Move globals to license.conf
  meta/classes/license.bbclass |   67 +-----------------------------------------
  meta/conf/bitbake.conf       |    1 +
  meta/conf/licenses.conf      |   64 ++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+), 66 deletions(-)

Flanagan, Elizabeth

author

2012-09-28 00:04 UTC #6 lore raw

Quoted 10 lines · Saul Wold

Quoted 8 lines · Elizabeth Flanagan
[YOCTO #3118]
license.conf hasn't been being parsed. This commit series ensures that license.conf is parsed, that it contains useful variables that should be in a global conf file and that those variables are not kept within license.bbclass.
So where is the inherit license bbclass?

For the yocto project it's an INHERIT += within poky.conf. meta-angstrom does not inherit it within conf/distro/include/angstrom.inc.

-b

Quoted 35 lines

Sau!
Quoted 30 lines
This also fixes an discreprancy between the documentation of LICENSE_PATH (which
is what we tell people to use) and what we were using "LICENSE_DIR". This ensures
that when the end user needs to add additional licenses, that they use LICENSE_PATH += "path/to/additional/licenses" and that it works.
The following changes since commit
0b09e50810162a07ef0aecee91ee32b4a36334a3:
   busybox: Fix misplaced quote (2012-09-26 18:28:36 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/LICENSE_PATH
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/LICENSE_PATH
Elizabeth Flanagan (3):
license.bbclass: Variable standardization bitbake.conf: parse license config license.conf/bbclass: Move globals to license.conf
  meta/classes/license.bbclass |   67
+-----------------------------------------
  meta/conf/bitbake.conf       |    1 +
  meta/conf/licenses.conf      |   64
++++++++++++++++++++++++++++++++++++++++
  3 files changed, 66 insertions(+), 66 deletions(-)

Signature · 3 lines

Elizabeth Flanagan
Yocto Project
Build and Release

Saul Wold

Acked-by

2012-09-28 00:09 UTC #7 lore raw

Quoted 10 lines · Elizabeth

Quoted 9 lines · Saul Wold
Quoted 8 lines · Elizabeth Flanagan
[YOCTO #3118]
license.conf hasn't been being parsed. This commit series ensures that license.conf is parsed, that it contains useful variables that should be in a global conf file and that those variables are not kept within license.bbclass.

Quoted 8 lines

Quoted 1 line
So where is the inherit license bbclass?
For the yocto project it's an INHERIT += within poky.conf. meta-angstrom does not inherit it within conf/distro/include/angstrom.inc.
-b

Acked-by Saul Wold <[email protected]?>

Quoted 38 lines

Quoted 35 lines
Sau!
Quoted 30 lines
This also fixes an discreprancy between the documentation of LICENSE_PATH (which
is what we tell people to use) and what we were using "LICENSE_DIR". This ensures
that when the end user needs to add additional licenses, that they use LICENSE_PATH += "path/to/additional/licenses" and that it works.
The following changes since commit
0b09e50810162a07ef0aecee91ee32b4a36334a3:
    busybox: Fix misplaced quote (2012-09-26 18:28:36 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/LICENSE_PATH
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/LICENSE_PATH
Elizabeth Flanagan (3):
license.bbclass: Variable standardization bitbake.conf: parse license config license.conf/bbclass: Move globals to license.conf
   meta/classes/license.bbclass |   67
+-----------------------------------------
   meta/conf/bitbake.conf       |    1 +
   meta/conf/licenses.conf      |   64
++++++++++++++++++++++++++++++++++++++++
   3 files changed, 66 insertions(+), 66 deletions(-)

Richard Purdie

Applied

2012-09-28 10:33 UTC #8 lore raw

In reply to Elizabeth Flanagan

Quoted 16 lines · Elizabeth Flanagan

[YOCTO #3118]
license.conf hasn't been being parsed. This commit series ensures that license.conf is parsed, that it contains useful variables that should be in a global conf file and that those variables are not kept within license.bbclass.
This also fixes an discreprancy between the documentation of LICENSE_PATH (which is what we tell people to use) and what we were using "LICENSE_DIR". This ensures that when the end user needs to add additional licenses, that they use LICENSE_PATH += "path/to/additional/licenses" and that it works.
The following changes since commit 0b09e50810162a07ef0aecee91ee32b4a36334a3:
busybox: Fix misplaced quote (2012-09-26 18:28:36 +0100)

Quoted 8 lines

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/LICENSE_PATH
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/LICENSE_PATH
Elizabeth Flanagan (3):
license.bbclass: Variable standardization bitbake.conf: parse license config license.conf/bbclass: Move globals to license.conf

Merged to master, thanks.

Richard