I have cooked a patch for meta-openembedded repos. On Wed, Feb 17, 2021 at 9:26 PM Khem Raj <[email protected]> wrote: > > this ends with considerable fallout in meta-openembedded > > https://errors.yoctoproject.org/Errors/Build/117091/ > > On Wed, Feb 17, 2021 at 8:34 AM Meh Mbeh Ida Delphine <[email protected]> > wrote: > > > > Okay. Thanks you. > > > > Cheers, > > Ida. > > > > On Wed, 17 Feb 2021, 12:17 pm Richard Purdie, > > <[email protected]> wrote: > >> > >> On Thu, 2020-10-15 at 21:45 +0100, Meh Mbeh Ida Delphine wrote: > >> > Updated mappings of license fields of meta/conf/licenses.conf to match > >> > latest SPDX naming. > >> > Added missing mappings. > >> > Renamed license files that were added in license mappings eg from > >> > GPL-2.0 to GPL-2.0-only. > >> > Added "or later" versions of license mappings > >> > Added "or later" versions of common license files eg GPL-2.0-or-later > >> > > >> > Fixes: [YOCTO #13320] > >> > > >> > Signed-off-by: Meh Mbeh Ida Delphine <[email protected]> > >> > >> I really want to get this issue resolved so I've queued this patch. > >> There is a comment below. > >> > >> > Changes in V6: > >> > * Added "or later" versions of common license files eg GPL-2.0-or-later > >> > in meta/files/common-licenses. > >> > > >> > Changes in V5: > >> > * Added "or later" versions of license mappings in > >> > meta/conf/licenses.conf > >> > > >> > Changes in V4: > >> > * Renamed license files that were added in license mappings eg from > >> > GPL-2.0 to GPL-2.0-only > >> > > >> > Changes in V3: > >> > * Added missing mappings to meta/conf/licenses.conf > >> > > >> > Changes in V2: > >> > * Corrected the email subject line. > >> [...] > >> > #MPL variations > >> > SPDXLICENSEMAP[MPL-1] = "MPL-1.0" > >> > SPDXLICENSEMAP[MPLv1] = "MPL-1.0" > >> > +SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0" > >> > SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" > >> > +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1" > >> > SPDXLICENSEMAP[MPLv2] = "MPL-2.0" > >> > +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0" > >> > + > >> > #MIT variations > >> > SPDXLICENSEMAP[MIT-X] = "MIT" > >> > @@ -48,33 +66,43 @@ SPDXLICENSEMAP[openssl] = "OpenSSL" > >> > #PSF variations > >> > SPDXLICENSEMAP[PSF] = "PSF-2.0" > >> > SPDXLICENSEMAP[PSFv2] = "PSF-2.0" > >> > +SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0" > >> > > >> > #Python variations > >> > > >> > SPDXLICENSEMAP[Python-2] = "Python-2.0" > >> > +SPDXLICENSEMAP[Python-2.0] = "Python-2.0" > >> > > >> > #Apache variations > >> > SPDXLICENSEMAP[Apachev2] = "Apache-2.0" > >> > SPDXLICENSEMAP[Apache-2] = "Apache-2.0" > >> > +SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0" > >> > > >> > #Artistic variations > >> > SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" > >> > SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" > >> > +SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0" > >> > #Academic variations > >> > > >> > SPDXLICENSEMAP[AFL-2] = "AFL-2.0" > >> > +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" > >> > SPDXLICENSEMAP[AFL-1] = "AFL-1.2" > >> > +SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2" > >> > SPDXLICENSEMAP[AFLv2] = "AFL-2.0" > >> > +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" > >> > SPDXLICENSEMAP[AFLv1] = "AFL-1.2" > >> > > >> > #CDDL variations > >> > SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" > >> > SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" > >> > +SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0" > >> > #Other variations > >> > SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" > >> > +SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0" > >> > > >> > > >> > >> > #Silicon Graphics variations > >> > SPDXLICENSEMAP[SGIv1] = "SGI-1" > >> > +SPDXLICENSEMAP[SGI-1] = "SGI-1" > >> > > >> > >> I removed the above pieces where the piece in [] is the same as the > >> value at the end. We don't need mappings where the two pieces are > >> identical. Everything else in the patch looked ok. > >> > >> I also realised that we have recipes which reference some of the names > >> which have been renamed in LIC_FILES_CHKSUM entries. The following > >> files look to be affected: > >> > >> meta/recipes-connectivity/connman/connman-conf.bb > >> meta/recipes-core/busybox/busybox-inittab_1.32.0.bb > >> meta/recipes-core/systemd/systemd-serialgetty.bb > >> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb > >> meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb > >> > >> I've queued a patch to fix these. > >> > >> Cheers, > >> > >> Richard > >> > >> > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148287): https://lists.openembedded.org/g/openembedded-core/message/148287 Mute This Topic: https://lists.openembedded.org/mt/77537765/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
