| Message ID | 1475577852-15870-1-git-send-email-gustavo.zacarias@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi, On Tuesday 04 October 2016 04:14 PM, gustavo.zacarias@free-electrons.com wrote: > From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> > > elfutils libraries are GPLv2 or LGPLv3+, standalone programs are GPLv3+ > (see the NEWS file). > Make the GPLv3+ license tag/file dependant on the programs being > enabled, and make the GPLv2/LGPLv3+ tag more descriptive. > License string should be GPLv2+ instead of GPLv2 because license header uses clause "either version 2 of the License, or (at your option) any later version". With that license string for library is "GPLv2+ or LGPLv3+" > Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> > --- > package/elfutils/elfutils.mk | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk > index 6af1223..5026474 100644 > --- a/package/elfutils/elfutils.mk > +++ b/package/elfutils/elfutils.mk > @@ -8,10 +8,16 @@ ELFUTILS_VERSION = 0.166 > ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 > ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) > ELFUTILS_INSTALL_STAGING = YES > -ELFUTILS_LICENSE = GPLv3, GPLv2, LGPLv3 > -ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 > +ELFUTILS_LICENSE = GPLv2 or LGPLv3+ (library) As mentioned above it should be ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library) > +ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 > ELFUTILS_DEPENDENCIES = zlib > > +# Programs are GPLv3+ so add it when they're enabled > +ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y) There is same if condition down. Instead we should conditionally add license there. > +ELFUTILS_LICENSE += GPLv3+ (programs) Since it is separate component, it should be comma separated. ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs) Regards, Rahul
On 04/10/16 10:01, Rahul Bedarkar wrote: > Hi, > > License string should be GPLv2+ instead of GPLv2 because license header > uses clause "either version 2 of the License, or (at your option) any > later version". With that license string for library is "GPLv2+ or LGPLv3+" Right, fixed for v2. > There is same if condition down. Instead we should conditionally add > license there. Missed that optimization, fixed. >> +ELFUTILS_LICENSE += GPLv3+ (programs) > > Since it is separate component, it should be comma separated. > > ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs) Most packages don't do this correctly, only a few do and i've used those as example, though it's no excuse. Care to fix the others? Regards.
Hello, On Wednesday 05 October 2016 04:36 AM, Gustavo Zacarias wrote: >>> +ELFUTILS_LICENSE += GPLv3+ (programs) >> >> Since it is separate component, it should be comma separated. >> >> ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs) > > Most packages don't do this correctly, only a few do and i've used those > as example, though it's no excuse. Care to fix the others? I will add it to my todo list. Thanks, Rahul
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 6af1223..5026474 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -8,10 +8,16 @@ ELFUTILS_VERSION = 0.166 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES -ELFUTILS_LICENSE = GPLv3, GPLv2, LGPLv3 -ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 +ELFUTILS_LICENSE = GPLv2 or LGPLv3+ (library) +ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 ELFUTILS_DEPENDENCIES = zlib +# Programs are GPLv3+ so add it when they're enabled +ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y) +ELFUTILS_LICENSE += GPLv3+ (programs) +ELFUTILS_LICENSE_FILES += COPYING +endif + # We patch configure.ac ELFUTILS_AUTORECONF = YES