Patchwork [[RFC] 0/4] license.bbclass: License Manifest Stage 1

login
register
mail settings
Submitter Elizabeth Flanagan
Date Dec. 4, 2011, 3:42 a.m.
Message ID <cover.1322969413.git.elizabeth.flanagan@intel.com>
Download mbox
Permalink /patch/16151/
State Not Applicable
Headers show

Pull-request

git://git.yoctoproject.org/poky-contrib eflanagan/license_m1

Comments

Elizabeth Flanagan - Dec. 4, 2011, 3:42 a.m.
Please see commit messages for full description:
This RFC includes:

- License manifest implementation in preparation for SPDX manifests.
- fixes to how licenses are collected. We now can support accurate licenses
  during a parallel bitbake.
- optional addition of license manifest to the generated image.
- optional addition of full common-license directory to the generated image.
- additional licenses, more SPDX mappings.
- ability to add custom license directories instead of adding license files
  to common-licenses.
- some recipe fixes to fix LICENSE fields.
- removal of license functionality of base-files as it's now redundant.

These patches require the included commits by Paul Eggleton in order to 
function. Specifically, it requires list_installed_packages in rootfs_*.

Please note. License manifest does not work with .deb packaging yet. When 
list_installed_packages is working in rootfs_deb, I'll patch include deb.

The following changes since commit 9be6d59b78510443d0944513503d515df13caa45:

  dpkg-native: Fix perl path (2011-12-02 15:31:08 +0000)

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

Elizabeth Flanagan (2):
  [YOCTO #1776] license: manifest and license path
  OECore license fixes: meta/*

Paul Eggleton (2):
  classes/buildhistory: add new output history collection class
  classes/buildhistory: merge in package history functionality

 meta/classes/buildhistory.bbclass                  |  354 ++++++++++
 meta/classes/license.bbclass                       |  227 +++++--
 meta/classes/package.bbclass                       |    1 +
 meta/classes/rootfs_ipk.bbclass                    |   30 +-
 meta/classes/rootfs_rpm.bbclass                    |   44 ++-
 meta/conf/licenses.conf                            |   54 ++-
 meta/files/common-licenses/AFL-1                   |   92 ---
 meta/files/common-licenses/AFL-2                   |  155 -----
 meta/files/common-licenses/AGPL-3                  |  213 ------
 meta/files/common-licenses/APL-1                   |  327 ----------
 meta/files/common-licenses/APSL-1                  |  334 ----------
 meta/files/common-licenses/APSL-2                  |  337 ----------
 meta/files/common-licenses/Adobe                   |   14 +
 meta/files/common-licenses/Apache-1                |   59 --
 meta/files/common-licenses/Apache-2                |  203 ------
 meta/files/common-licenses/Artistic                |  131 ----
 meta/files/common-licenses/Artistic-1              |   97 ---
 meta/files/common-licenses/Artistic-2              |  202 ------
 meta/files/common-licenses/BSL-1                   |   25 -
 meta/files/common-licenses/BitstreamVera           |  160 +++++
 meta/files/common-licenses/CATOSL-1                |  335 ----------
 meta/files/common-licenses/CC-BY-1                 |  185 ------
 meta/files/common-licenses/CC-BY-2                 |  205 ------
 meta/files/common-licenses/CC-BY-3                 |  283 --------
 meta/files/common-licenses/CC-BY-NC-1              |  194 ------
 meta/files/common-licenses/CC-BY-NC-2              |  220 -------
 meta/files/common-licenses/CC-BY-NC-3              |  297 ---------
 meta/files/common-licenses/CC-BY-NC-ND-1           |  146 -----
 meta/files/common-licenses/CC-BY-NC-ND-2           |  209 ------
 meta/files/common-licenses/CC-BY-NC-ND-3           |  272 --------
 meta/files/common-licenses/CC-BY-NC-SA-1           |  209 ------
 meta/files/common-licenses/CC-BY-NC-SA-2           |  242 -------
 meta/files/common-licenses/CC-BY-NC-SA-3           |  320 ---------
 meta/files/common-licenses/CC-BY-ND-2              |  194 ------
 meta/files/common-licenses/CC-BY-ND-3              |  259 --------
 meta/files/common-licenses/CC-BY-SA-1              |  201 ------
 meta/files/common-licenses/CC-BY-SA-2              |  227 -------
 meta/files/common-licenses/CC-BY-SA-3              |  319 ---------
 meta/files/common-licenses/CDDL-1                  |  313 ---------
 meta/files/common-licenses/CECILL-1                |  462 -------------
 meta/files/common-licenses/CECILL-2                |  451 -------------
 meta/files/common-licenses/CPAL-1                  |  435 -------------
 meta/files/common-licenses/CPL-1                   |  250 --------
 meta/files/common-licenses/CUA-OPL-1               |  482 --------------
 meta/files/common-licenses/DSSSL                   |   49 ++
 meta/files/common-licenses/ECL-1                   |   61 --
 meta/files/common-licenses/ECL-2                   |  218 -------
 meta/files/common-licenses/EDL-1.0                 |   13 +
 meta/files/common-licenses/EFL-1                   |   30 -
 meta/files/common-licenses/EFL-2                   |   27 -
 meta/files/common-licenses/EPL-1                   |  204 ------
 meta/files/common-licenses/EUPL-1                  |  302 ---------
 meta/files/common-licenses/Elfutils-Exception      |   12 +
 meta/files/common-licenses/ErlPL-1                 |  293 ---------
 meta/files/common-licenses/Frameworx-1             |  181 ------
 meta/files/common-licenses/FreeType                |  170 +++++
 meta/files/common-licenses/GPL-1                   |  259 --------
 meta/files/common-licenses/GPL-1.0+                |  252 --------
 meta/files/common-licenses/GPL-2                   |   23 -
 .../common-licenses/GPL-2,0-with-GCC-exception     |   17 -
 .../common-licenses/GPL-2,0-with-font-exception    |   18 -
 meta/files/common-licenses/GPL-2.0+                |  132 ----
 .../common-licenses/GPL-2.0-with-GCC-exception     |   13 +-
 .../common-licenses/GPL-2.0-with-font-exception    |   14 +-
 meta/files/common-licenses/GPL-3                   |   70 --
 meta/files/common-licenses/GPL-3.0                 |  224 +++++++-
 meta/files/common-licenses/GPL-3.0+                |    3 -
 meta/files/common-licenses/IPL-1                   |  222 -------
 meta/files/common-licenses/LGPL-2                  |  461 -------------
 meta/files/common-licenses/LGPL-2.0                |  189 ++++++-
 meta/files/common-licenses/LGPL-2.0+               |  173 -----
 meta/files/common-licenses/LGPL-2.1+               |  176 -----
 meta/files/common-licenses/LGPL-3                  |  147 -----
 meta/files/common-licenses/LGPL-3.0                |   53 +-
 meta/files/common-licenses/LGPL-3.0+               |   66 --
 meta/files/common-licenses/LPL-1                   |  213 ------
 meta/files/common-licenses/LPPL-1                  |  422 ------------
 meta/files/common-licenses/MIT-style               |    1 -
 meta/files/common-licenses/MPL-1                   |  433 -------------
 meta/files/common-licenses/NASA-1                  |  246 -------
 meta/files/common-licenses/NPOSL-3                 |  206 ------
 meta/files/common-licenses/OASIS                   |   13 +
 meta/files/common-licenses/OCLC-2                  |  207 ------
 meta/files/common-licenses/OFL-1                   |   96 ---
 meta/files/common-licenses/OLDAP-2                 |   54 --
 meta/files/common-licenses/OSL-1                   |  172 -----
 meta/files/common-licenses/OSL-1.0                 |    2 +-
 meta/files/common-licenses/OSL-2                   |  171 -----
 meta/files/common-licenses/OSL-3                   |  157 -----
 meta/files/common-licenses/PHP-3                   |   70 --
 meta/files/common-licenses/Proprietary             |    1 +
 meta/files/common-licenses/Python-2                |  192 ------
 meta/files/common-licenses/QPL-1                   |   96 ---
 meta/files/common-licenses/RPL-1                   |  582 -----------------
 meta/files/common-licenses/RPSL-1                  |  535 ----------------
 meta/files/common-licenses/SPL                     |  519 ---------------
 meta/files/common-licenses/Simple-2                |   53 --
 meta/files/common-licenses/UCB                     |   26 +
 meta/files/common-licenses/VSL-1                   |   54 --
 meta/files/common-licenses/Watcom-1                |  389 -----------
 meta/files/common-licenses/XFree86-1               |   50 --
 meta/files/common-licenses/YPL-1                   |  140 ----
 meta/files/common-licenses/ZPL-1                   |   60 --
 meta/files/common-licenses/ZPL-2                   |   44 --
 meta/files/common-licenses/Zimbra-1                |  140 ----
 meta/files/common-licenses/eCos-2                  |   38 --
 .../base-files/base-files/licenses/Artistic        |  131 ----
 .../base-files/base-files/licenses/BSD             |   26 -
 .../base-files/base-files/licenses/GFDL-1.2        |  397 ------------
 .../base-files/base-files/licenses/GPL-3           |  676 --------------------
 .../base-files/base-files/licenses/LGPL-2          |  481 --------------
 .../base-files/base-files/licenses/LGPL-2.1        |  510 ---------------
 .../base-files/base-files/licenses/LGPL-3          |  165 -----
 meta/recipes-core/base-files/base-files_3.0.14.bb  |   24 +-
 meta/recipes-core/busybox/busybox.inc              |   13 +-
 meta/recipes-core/busybox/busybox_1.19.3.bb        |    2 +-
 .../gettext/gettext-minimal-native_0.18.1.1.bb     |    4 +-
 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |    4 +-
 meta/recipes-core/jpeg/jpeg_8c.bb                  |    4 +-
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    4 +-
 meta/recipes-devtools/python/python-pyrex_0.9.9.bb |    4 +-
 .../squashfs-tools/squashfs-tools_4.2.bb           |    4 +-
 meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb   |    4 +-
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb          |    4 +-
 .../transfig/transfig-native_3.2.5d.bb             |    4 +-
 meta/recipes-extended/byacc/byacc_20110908.bb      |   10 +-
 meta/recipes-extended/bzip2/bzip2_1.0.6.bb         |    4 +-
 meta/recipes-extended/less/less_444.bb             |    7 +-
 .../tcp-wrappers/tcp-wrappers_7.6.bb               |    4 +-
 meta/recipes-extended/unzip/unzip_6.0.bb           |    4 +-
 meta/recipes-extended/xinetd/xinetd_2.3.14.bb      |    5 +-
 meta/recipes-extended/zip/zip.inc                  |    2 +-
 meta/recipes-extended/zip/zip_3.0.bb               |    2 +-
 .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb |    4 +-
 meta/recipes-graphics/clutter/clutter-box2d.inc    |    2 +-
 meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
 meta/recipes-graphics/freetype/freetype_2.4.6.bb   |    4 +-
 .../ttf-fonts/ttf-bitstream-vera_1.10.bb           |    4 +-
 meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb     |    4 +-
 .../recipes-graphics/xorg-font/font-alias_1.0.3.bb |    4 +-
 meta/recipes-graphics/xorg-font/font-util_1.2.0.bb |    5 +-
 .../linux-firmware/linux-firmware_git.bb           |    5 +
 meta/recipes-multimedia/libtiff/tiff_3.9.5.bb      |    4 +-
 .../matchbox-theme-sato/matchbox-theme-sato.inc    |    2 +-
 .../matchbox-theme-sato/matchbox-theme-sato_0.1.bb |    2 +-
 .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
 .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
 meta/recipes-support/boost/boost.inc               |    4 +-
 148 files changed, 1636 insertions(+), 20136 deletions(-)
 create mode 100644 meta/classes/buildhistory.bbclass
 delete mode 100644 meta/files/common-licenses/AFL-1
 delete mode 100644 meta/files/common-licenses/AFL-2
 delete mode 100644 meta/files/common-licenses/AGPL-3
 delete mode 100644 meta/files/common-licenses/APL-1
 delete mode 100644 meta/files/common-licenses/APSL-1
 delete mode 100644 meta/files/common-licenses/APSL-2
 create mode 100644 meta/files/common-licenses/Adobe
 delete mode 100644 meta/files/common-licenses/Apache-1
 delete mode 100644 meta/files/common-licenses/Apache-2
 delete mode 100644 meta/files/common-licenses/Artistic
 delete mode 100644 meta/files/common-licenses/Artistic-1
 delete mode 100644 meta/files/common-licenses/Artistic-2
 delete mode 100644 meta/files/common-licenses/BSL-1
 create mode 100644 meta/files/common-licenses/BitstreamVera
 delete mode 100644 meta/files/common-licenses/CATOSL-1
 delete mode 100644 meta/files/common-licenses/CC-BY-1
 delete mode 100644 meta/files/common-licenses/CC-BY-2
 delete mode 100644 meta/files/common-licenses/CC-BY-3
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-1
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-2
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-3
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-ND-1
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-ND-2
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-ND-3
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-SA-1
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-SA-2
 delete mode 100644 meta/files/common-licenses/CC-BY-NC-SA-3
 delete mode 100644 meta/files/common-licenses/CC-BY-ND-1
 delete mode 100644 meta/files/common-licenses/CC-BY-ND-2
 delete mode 100644 meta/files/common-licenses/CC-BY-ND-3
 delete mode 100644 meta/files/common-licenses/CC-BY-SA-1
 delete mode 100644 meta/files/common-licenses/CC-BY-SA-2
 delete mode 100644 meta/files/common-licenses/CC-BY-SA-3
 delete mode 100644 meta/files/common-licenses/CDDL-1
 delete mode 100644 meta/files/common-licenses/CECILL-1
 delete mode 100644 meta/files/common-licenses/CECILL-2
 delete mode 100644 meta/files/common-licenses/CPAL-1
 delete mode 100644 meta/files/common-licenses/CPL-1
 delete mode 100644 meta/files/common-licenses/CUA-OPL-1
 create mode 100644 meta/files/common-licenses/DSSSL
 delete mode 100644 meta/files/common-licenses/ECL-1
 delete mode 100644 meta/files/common-licenses/ECL-2
 create mode 100644 meta/files/common-licenses/EDL-1.0
 delete mode 100644 meta/files/common-licenses/EFL-1
 delete mode 100644 meta/files/common-licenses/EFL-2
 delete mode 100644 meta/files/common-licenses/EPL-1
 delete mode 100644 meta/files/common-licenses/EUPL-1
 create mode 100644 meta/files/common-licenses/Elfutils-Exception
 delete mode 100644 meta/files/common-licenses/ErlPL-1
 delete mode 100644 meta/files/common-licenses/Frameworx-1
 create mode 100644 meta/files/common-licenses/FreeType
 delete mode 100644 meta/files/common-licenses/GPL-1
 delete mode 100644 meta/files/common-licenses/GPL-1.0+
 delete mode 100644 meta/files/common-licenses/GPL-2
 delete mode 100644 meta/files/common-licenses/GPL-2,0-with-GCC-exception
 delete mode 100644 meta/files/common-licenses/GPL-2,0-with-font-exception
 delete mode 100644 meta/files/common-licenses/GPL-2.0+
 delete mode 100644 meta/files/common-licenses/GPL-3
 delete mode 100644 meta/files/common-licenses/GPL-3.0+
 delete mode 100644 meta/files/common-licenses/IPL-1
 delete mode 100644 meta/files/common-licenses/LGPL-2
 delete mode 100644 meta/files/common-licenses/LGPL-2.0+
 delete mode 100644 meta/files/common-licenses/LGPL-2.1+
 delete mode 100644 meta/files/common-licenses/LGPL-3
 delete mode 100644 meta/files/common-licenses/LGPL-3.0+
 delete mode 100644 meta/files/common-licenses/LPL-1
 delete mode 100644 meta/files/common-licenses/LPPL-1
 delete mode 120000 meta/files/common-licenses/MIT-style
 delete mode 100644 meta/files/common-licenses/MPL-1
 delete mode 100644 meta/files/common-licenses/NASA-1
 delete mode 100644 meta/files/common-licenses/NPOSL-3
 create mode 100644 meta/files/common-licenses/OASIS
 delete mode 100644 meta/files/common-licenses/OCLC-2
 delete mode 100644 meta/files/common-licenses/OFL-1
 delete mode 100644 meta/files/common-licenses/OLDAP-2
 delete mode 100644 meta/files/common-licenses/OSL-1
 delete mode 100644 meta/files/common-licenses/OSL-2
 delete mode 100644 meta/files/common-licenses/OSL-3
 delete mode 100644 meta/files/common-licenses/PHP-3
 create mode 100644 meta/files/common-licenses/Proprietary
 delete mode 100644 meta/files/common-licenses/Python-2
 delete mode 100644 meta/files/common-licenses/QPL-1
 delete mode 100644 meta/files/common-licenses/RPL-1
 delete mode 100644 meta/files/common-licenses/RPSL-1
 delete mode 100644 meta/files/common-licenses/SPL
 delete mode 100644 meta/files/common-licenses/Simple-2
 create mode 100644 meta/files/common-licenses/UCB
 delete mode 100644 meta/files/common-licenses/VSL-1
 delete mode 100644 meta/files/common-licenses/Watcom-1
 delete mode 100644 meta/files/common-licenses/XFree86-1
 delete mode 100644 meta/files/common-licenses/YPL-1
 delete mode 100644 meta/files/common-licenses/ZPL-1
 delete mode 100644 meta/files/common-licenses/ZPL-2
 delete mode 100644 meta/files/common-licenses/Zimbra-1
 delete mode 100644 meta/files/common-licenses/eCos-2
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/Artistic
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/BSD
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/GFDL-1.2
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/GPL-3
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/LGPL-2
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/LGPL-2.1
 delete mode 100644 meta/recipes-core/base-files/base-files/licenses/LGPL-3
Chris Larson - Dec. 4, 2011, 4:46 p.m.
On Sat, Dec 3, 2011 at 8:42 PM, Beth Flanagan
<elizabeth.flanagan@intel.com> wrote:
> Please see commit messages for full description:
> This RFC includes:
>
> - License manifest implementation in preparation for SPDX manifests.
> - fixes to how licenses are collected. We now can support accurate licenses
>  during a parallel bitbake.
> - optional addition of license manifest to the generated image.
> - optional addition of full common-license directory to the generated image.
> - additional licenses, more SPDX mappings.
> - ability to add custom license directories instead of adding license files
>  to common-licenses.
> - some recipe fixes to fix LICENSE fields.
> - removal of license functionality of base-files as it's now redundant.
>
> These patches require the included commits by Paul Eggleton in order to
> function. Specifically, it requires list_installed_packages in rootfs_*.
>
> Please note. License manifest does not work with .deb packaging yet. When
> list_installed_packages is working in rootfs_deb, I'll patch include deb.
>
> The following changes since commit 9be6d59b78510443d0944513503d515df13caa45:
>
>  dpkg-native: Fix perl path (2011-12-02 15:31:08 +0000)
>
> are available in the git repository at:
>  git://git.yoctoproject.org/poky-contrib eflanagan/license_m1
>  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_m1

Nice work on all of this :) Small nits:

- 74efa4d: you revert the bb.data.getVar -> d.getVar change to busybox.inc.
- e1a3bfe: license_create_manifest uses a combination of space and tab
indentation. please pick one :)
- e1a3bfe: license_create_manifest uses a more complex pipeline with
more execs of sed than is necessary. This will do it:

    pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
    pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g;
s/  */ /g; p }' ${filename})"
Koen Kooi - Dec. 4, 2011, 6:02 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 04-12-11 04:42, Beth Flanagan schreef:
> Please see commit messages for full description: This RFC includes:
> 
> - License manifest implementation in preparation for SPDX manifests. -
> fixes to how licenses are collected. We now can support accurate
> licenses during a parallel bitbake. - optional addition of license
> manifest to the generated image. - optional addition of full
> common-license directory to the generated image. - additional licenses,
> more SPDX mappings. - ability to add custom license directories instead
> of adding license files to common-licenses. - some recipe fixes to fix
> LICENSE fields. - removal of license functionality of base-files as it's
> now redundant.
> 
> These patches require the included commits by Paul Eggleton in order to 
> function. Specifically, it requires list_installed_packages in rootfs_*.
> 
> Please note. License manifest does not work with .deb packaging yet. When
>  list_installed_packages is working in rootfs_deb, I'll patch include
> deb.
> 
> The following changes since commit
> 9be6d59b78510443d0944513503d515df13caa45:
> 
> dpkg-native: Fix perl path (2011-12-02 15:31:08 +0000)
> 
> are available in the git repository at: 
> git://git.yoctoproject.org/poky-contrib eflanagan/license_m1 
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_m1

Do
> 
you have a version that is actually again OE so people can test it?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7btacACgkQMkyGM64RGpE0uwCgroPmuq0cAQXy/V5suGRxwR6q
k3AAn2czaaK4EWcDacN1foA+VkWibZZV
=I2Tj
-----END PGP SIGNATURE-----
Elizabeth Flanagan - Dec. 4, 2011, 7:19 p.m.
On Sun, Dec 4, 2011 at 8:46 AM, Chris Larson <clarson@kergoth.com> wrote:

> On Sat, Dec 3, 2011 at 8:42 PM, Beth Flanagan
> <elizabeth.flanagan@intel.com> wrote:
> > Please see commit messages for full description:
> > This RFC includes:
> >
> > - License manifest implementation in preparation for SPDX manifests.
> > - fixes to how licenses are collected. We now can support accurate
> licenses
> >  during a parallel bitbake.
> > - optional addition of license manifest to the generated image.
> > - optional addition of full common-license directory to the generated
> image.
> > - additional licenses, more SPDX mappings.
> > - ability to add custom license directories instead of adding license
> files
> >  to common-licenses.
> > - some recipe fixes to fix LICENSE fields.
> > - removal of license functionality of base-files as it's now redundant.
> >
> > These patches require the included commits by Paul Eggleton in order to
> > function. Specifically, it requires list_installed_packages in rootfs_*.
> >
> > Please note. License manifest does not work with .deb packaging yet. When
> > list_installed_packages is working in rootfs_deb, I'll patch include deb.
> >
> > The following changes since commit
> 9be6d59b78510443d0944513503d515df13caa45:
> >
> >  dpkg-native: Fix perl path (2011-12-02 15:31:08 +0000)
> >
> > are available in the git repository at:
> >  git://git.yoctoproject.org/poky-contrib eflanagan/license_m1
> >
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_m1
>
> Nice work on all of this :) Small nits:
>
> - 74efa4d: you revert the bb.data.getVar -> d.getVar change to
> busybox.inc.
>
- e1a3bfe: license_create_manifest uses a combination of space and tab
> indentation. please pick one :)
>

argh. I thought I had fixed those. my bad.


> - e1a3bfe: license_create_manifest uses a more complex pipeline with
> more execs of sed than is necessary. This will do it:
>
>    pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
>    pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g;
> s/  */ /g; p }' ${filename})"
>

Ahh, yes. I was being lazy with my sed lines. Good catch.

Fixed and repushed



> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Elizabeth Flanagan - Dec. 4, 2011, 7:27 p.m.
On Sun, Dec 4, 2011 at 10:02 AM, Koen Kooi <koen@dominion.thruhere.net>wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 04-12-11 04:42, Beth Flanagan schreef:
> > Please see commit messages for full description: This RFC includes:
> >
> > - License manifest implementation in preparation for SPDX manifests. -
> > fixes to how licenses are collected. We now can support accurate
> > licenses during a parallel bitbake. - optional addition of license
> > manifest to the generated image. - optional addition of full
> > common-license directory to the generated image. - additional licenses,
> > more SPDX mappings. - ability to add custom license directories instead
> > of adding license files to common-licenses. - some recipe fixes to fix
> > LICENSE fields. - removal of license functionality of base-files as it's
> > now redundant.
> >
> > These patches require the included commits by Paul Eggleton in order to
> > function. Specifically, it requires list_installed_packages in rootfs_*.
> >
> > Please note. License manifest does not work with .deb packaging yet. When
> >  list_installed_packages is working in rootfs_deb, I'll patch include
> > deb.
> >
> > The following changes since commit
> > 9be6d59b78510443d0944513503d515df13caa45:
> >
> > dpkg-native: Fix perl path (2011-12-02 15:31:08 +0000)
> >
> > are available in the git repository at:
> > git://git.yoctoproject.org/poky-contrib eflanagan/license_m1
> >
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_m1
>
> Do
> >
> you have a version that is actually again OE so people can test it?
>

All the changes should work against OE-Core (since all the changes are to
that layer only).
I'll pull the latest OE master and test against it though to verify.


> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iEYEARECAAYFAk7btacACgkQMkyGM64RGpE0uwCgroPmuq0cAQXy/V5suGRxwR6q
> k3AAn2czaaK4EWcDacN1foA+VkWibZZV
> =I2Tj
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Elizabeth Flanagan - Dec. 4, 2011, 9:41 p.m.
On Sun, Dec 4, 2011 at 11:27 AM, Flanagan, Elizabeth <
elizabeth.flanagan@intel.com> wrote:

>
>
> On Sun, Dec 4, 2011 at 10:02 AM, Koen Kooi <koen@dominion.thruhere.net>wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Op 04-12-11 04:42, Beth Flanagan schreef:
>> > Please see commit messages for full description: This RFC includes:
>> >
>> > - License manifest implementation in preparation for SPDX manifests. -
>> > fixes to how licenses are collected. We now can support accurate
>> > licenses during a parallel bitbake. - optional addition of license
>> > manifest to the generated image. - optional addition of full
>> > common-license directory to the generated image. - additional licenses,
>> > more SPDX mappings. - ability to add custom license directories instead
>> > of adding license files to common-licenses. - some recipe fixes to fix
>> > LICENSE fields. - removal of license functionality of base-files as it's
>> > now redundant.
>> >
>> > These patches require the included commits by Paul Eggleton in order to
>> > function. Specifically, it requires list_installed_packages in rootfs_*.
>> >
>> > Please note. License manifest does not work with .deb packaging yet.
>> When
>> >  list_installed_packages is working in rootfs_deb, I'll patch include
>> > deb.
>> >
>> > The following changes since commit
>> > 9be6d59b78510443d0944513503d515df13caa45:
>> >
>> > dpkg-native: Fix perl path (2011-12-02 15:31:08 +0000)
>> >
>> > are available in the git repository at:
>> > git://git.yoctoproject.org/poky-contrib eflanagan/license_m1
>> >
>> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/license_m1
>>
>> Do
>> >
>> you have a version that is actually again OE so people can test it?
>>
>
> All the changes should work against OE-Core (since all the changes are to
> that layer only).
> I'll pull the latest OE master and test against it though to verify.
>

Against OE-Core master, with those 4 commits cherry-picked I was able to
build core-image-minimal with what looks like the correct manifest:

http://pastebin.com/FpH1zUNP

I did have to fix a few things as I had pushed a bad branch (hence some of
the formatting issues Chris picked up on that I had thought I had fixed),
however, it all seems good now.

-b


>
>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.11 (Darwin)
>> Comment: GPGTools - http://gpgtools.org
>>
>> iEYEARECAAYFAk7btacACgkQMkyGM64RGpE0uwCgroPmuq0cAQXy/V5suGRxwR6q
>> k3AAn2czaaK4EWcDacN1foA+VkWibZZV
>> =I2Tj
>> -----END PGP SIGNATURE-----
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
>
>
>
> --
> Elizabeth Flanagan
> Yocto Project
> Build and Release
>