From 2aa39b4470f61f3ce9d5c307b5faa9cb600cfb61 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 12 Dec 2022 15:20:08 +1100 Subject: [PATCH] LU-16382 spec: Declare correct license Lustre is primarily licensed under GPL-v2. Some files claim v2+, others claim v2-only, but all are consistent with v2. liblustreapi is LGPL2.1+ So make that explicit in lustre.spec. All 'kmp' packages are GPL-v2-only, all the rest add "AND LGPL-2.1-or-later. The Open Build Service complains that "GPL" is too vague. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I4f10c50a39b5b48fed71b179bc888b0ae144444e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49363 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Aurelien Degremont Reviewed-by: Jian Yu Reviewed-by: jsimmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre-dkms.spec.in | 2 +- lustre.spec.in | 2 +- rpm/kmp-lustre-osd-ldiskfs.preamble | 1 + rpm/kmp-lustre-osd-zfs.preamble | 1 + rpm/kmp-lustre.preamble | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 242658f..cbbec62 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -51,7 +51,7 @@ Release: %{buildid}%{?dist} Summary: Kernel module(s) (dkms) Group: System Environment/Kernel -License: GPLv2+ +License: GPL-2.0-only URL: http://lustre.opensfs.org/ Source0: @PACKAGE@-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/lustre.spec.in b/lustre.spec.in index 2e34a11..653bc1e 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -186,7 +186,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: %{version} Release: 1%{?dist} -License: GPL +License: GPL-2.0-only AND LGPL-2.1-or-later Group: System Environment/Kernel Source: lustre-%{version}.tar.gz Source1: kmp-lustre.preamble diff --git a/rpm/kmp-lustre-osd-ldiskfs.preamble b/rpm/kmp-lustre-osd-ldiskfs.preamble index 680373f..cdd8a12 100644 --- a/rpm/kmp-lustre-osd-ldiskfs.preamble +++ b/rpm/kmp-lustre-osd-ldiskfs.preamble @@ -1,3 +1,4 @@ +License: GPL-2.0-only Requires: %{requires_kmod_name} = %{requires_kmod_version} Requires: ldiskfsprogs >= 1.44.3.wc1 Requires: %{name}-osd-ldiskfs-mount = %{version} diff --git a/rpm/kmp-lustre-osd-zfs.preamble b/rpm/kmp-lustre-osd-zfs.preamble index e17709c..339ed9b 100644 --- a/rpm/kmp-lustre-osd-zfs.preamble +++ b/rpm/kmp-lustre-osd-zfs.preamble @@ -1,4 +1,5 @@ Summary: Lustre osd-zfs feature support +License: GPL-2.0-only Requires: %{name}-osd-zfs-mount = %{version} Provides: %{name}-osd = %{version} Obsoletes: %{name}-osd-zfs < %{version} diff --git a/rpm/kmp-lustre.preamble b/rpm/kmp-lustre.preamble index 47ae87e..9224573 100644 --- a/rpm/kmp-lustre.preamble +++ b/rpm/kmp-lustre.preamble @@ -1 +1,2 @@ Obsoletes: %{name}-modules < %{version} +License: GPL-2.0-only -- 1.8.3.1