| Message ID | 1571820259-28691-1-git-send-email-simon.rowe@citrix.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/util-linux: fix licence definition formatting | expand |
On Wed, Oct 23, 2019 at 5:44 AM Simon Rowe <simon.rowe@citrix.com> wrote: > > Signed-off-by: Simon Rowe <simon.rowe@citrix.com> > --- > package/util-linux/util-linux.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 534cff2..7bd7a89 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -11,7 +11,7 @@ UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERS > > # README.licensing claims that some files are GPL-2.0 only, but this is not true. > # Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. > -UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill) > +UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill) > UTIL_LINUX_LICENSE_FILES = README.licensing \ > Documentation/licenses/COPYING.BSD-3-Clause \ > Documentation/licenses/COPYING.BSD-4-Clause-UC \ > -- > 1.8.3.1 > Reviewed-by: Carlos Santos <unixmania@gmail.com>
On 23/10/2019 10:44, Simon Rowe wrote: > Signed-off-by: Simon Rowe <simon.rowe@citrix.com> Applied to master, thanks. Regards, Arnout > --- > package/util-linux/util-linux.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 534cff2..7bd7a89 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -11,7 +11,7 @@ UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERS > > # README.licensing claims that some files are GPL-2.0 only, but this is not true. > # Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. > -UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill) > +UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill) > UTIL_LINUX_LICENSE_FILES = README.licensing \ > Documentation/licenses/COPYING.BSD-3-Clause \ > Documentation/licenses/COPYING.BSD-4-Clause-UC \ >
>>>>> "Simon" == Simon Rowe <simon.rowe@citrix.com> writes: > Signed-off-by: Simon Rowe <simon.rowe@citrix.com> Committed to 2019.02.x and 2019.08.x, thanks.
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 534cff2..7bd7a89 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -11,7 +11,7 @@ UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERS # README.licensing claims that some files are GPL-2.0 only, but this is not true. # Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. -UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill) +UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill) UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.BSD-3-Clause \ Documentation/licenses/COPYING.BSD-4-Clause-UC \
Signed-off-by: Simon Rowe <simon.rowe@citrix.com> --- package/util-linux/util-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)