[poky,dunfell,4/8] e2fsprogs: Use specific BSD license variant

Message ID 20220201072831.34695-4-nishaparrakat@gmail.com
State New, archived
Headers show
Series [poky,dunfell,1/8] common-licenses: add missing SPDX licences | expand

Commit Message

Nisha Parrakat Feb. 1, 2022, 7:28 a.m. UTC
From: Joshua Watt <JPEWhacker@gmail.com>

Make the license more accurate by specifying the specific variant of BSD
license instead of the generic one. This helps with SPDX license
attribution as "BSD" is not a valid SPDX license.

(From OE-Core rev: 966fb77981e4fed0ab7998439940b1e05dd0ee43)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Steve Sakoman Feb. 3, 2022, 3:01 p.m. UTC | #1
On Mon, Jan 31, 2022 at 9:28 PM Nisha Parrakat <nishaparrakat@gmail.com> wrote:
>
> From: Joshua Watt <JPEWhacker@gmail.com>
>
> Make the license more accurate by specifying the specific variant of BSD
> license instead of the generic one. This helps with SPDX license
> attribution as "BSD" is not a valid SPDX license.
>
> (From OE-Core rev: 966fb77981e4fed0ab7998439940b1e05dd0ee43)
>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de>
> ---
>  meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> index 45fb9720ee..08fb30fc71 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> @@ -3,12 +3,12 @@ DESCRIPTION = "The Ext2 Filesystem Utilities (e2fsprogs) contain all of the stan
>  fixing, configuring , and debugging ext2 filesystems."
>  HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
>
> -LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
> -LICENSE_e2fsprogs-dumpe2fs = "GPLv2"
> -LICENSE_e2fsprogs-e2fsck = "GPLv2"
> -LICENSE_e2fsprogs-mke2fs = "GPLv2"
> -LICENSE_e2fsprogs-tune2fs = "GPLv2"
> -LICENSE_e2fsprogs-badblocks = "GPLv2"
> +LICENSE = "GPLv2 & LGPLv2 & BSD-3-Clause & MIT"
> +LICENSE:e2fsprogs-dumpe2fs = "GPLv2"
> +LICENSE:e2fsprogs-e2fsck = "GPLv2"
> +LICENSE:e2fsprogs-mke2fs = "GPLv2"
> +LICENSE:e2fsprogs-tune2fs = "GPLv2"
> +LICENSE:e2fsprogs-badblocks = "GPLv2"

Note that the new override syntax is trying to sneak in here.  I've
corrected this.

Steve

>  LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
>                        file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
>                        file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
> --
> 2.17.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#161148): https://lists.openembedded.org/g/openembedded-core/message/161148
> Mute This Topic: https://lists.openembedded.org/mt/88827820/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 45fb9720ee..08fb30fc71 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -3,12 +3,12 @@  DESCRIPTION = "The Ext2 Filesystem Utilities (e2fsprogs) contain all of the stan
 fixing, configuring , and debugging ext2 filesystems."
 HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
 
-LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
-LICENSE_e2fsprogs-dumpe2fs = "GPLv2"
-LICENSE_e2fsprogs-e2fsck = "GPLv2"
-LICENSE_e2fsprogs-mke2fs = "GPLv2"
-LICENSE_e2fsprogs-tune2fs = "GPLv2"
-LICENSE_e2fsprogs-badblocks = "GPLv2"
+LICENSE = "GPLv2 & LGPLv2 & BSD-3-Clause & MIT"
+LICENSE:e2fsprogs-dumpe2fs = "GPLv2"
+LICENSE:e2fsprogs-e2fsck = "GPLv2"
+LICENSE:e2fsprogs-mke2fs = "GPLv2"
+LICENSE:e2fsprogs-tune2fs = "GPLv2"
+LICENSE:e2fsprogs-badblocks = "GPLv2"
 LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
                       file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
                       file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \