util-linux: extract ISC licence from rfkill.c

PATCH New Carlos Santos 3 participants 6 messages Jan 14, 2018 – Jan 18, 2018

Share & tools

Carlos Santos

author

2018-01-14 19:28 UTC #0 lore raw

PATCH v2 1/1 util-linux: extract ISC licence from rfkill.c

Save the top 21 lines of sys-utils/rfkill.c as COPYING.ISC instead of distributing the whole file. This matches a corresponding patch alreardy submitted upstream that creates the Documentation/licenses/COPYING.ISC file.

Signed-off-by Carlos Santos <[email protected]>

---
 package/util-linux/util-linux.hash | 2 +-
 package/util-linux/util-linux.mk   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

package/util-linux/util-linux.hash +1 -1

index 838d2dcb53..a614190f41 100644
@@ -6,4 +6,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documen
 sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.UCB
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPLv2.1
 sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3
-sha256 996126b78a42dd2eeea1256d78b7fd6dec090ea196365c0ccb46adc32bc92460  sys-utils/rfkill.c
+sha256 7c219a72182dcc988e9b748fa39c17df3e973994260741750be3e12e94234e28  Documentation/licenses/COPYING.ISC

package/util-linux/util-linux.mk +7 -1

index 5858887b04..c33b73594c 100644
@@ -13,7 +13,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_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 sys-utils/rfkill.c
+UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support

@@ -206,6 +206,12 @@ else
 UTIL_LINUX_CONF_OPTS += --without-audit
 endif
 
+# rfkill contails the license inside rfkill.c
+define UTIL_LINUX_EXTRACT_LICENSE
+	head -n 21 $(@D)/sys-utils/rfkill.c > $(@D)/Documentation/licenses/COPYING.ISC
+endef
+UTIL_LINUX_POST_EXTRACT_HOOKS += UTIL_LINUX_EXTRACT_LICENSE
+
 # Install PAM configuration files
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
 define UTIL_LINUX_INSTALL_PAMFILES

Signature · 1 line

2.14.3

Yann E. MORIN

2018-01-14 22:18 UTC #1 lore raw

PATCH v2 1/1 util-linux: extract ISC licence from rfkill.c

Carlos, All,

On 2018-01-14 17:28 -0200, Carlos Santos spake thusly:

Quoted 2 lines

Save the top 21 lines of sys-utils/rfkill.c as COPYING.ISC instead of distributing the whole file.

We usually do not do that, and there are quite a few packages where source files are actually listed as _LICENSE_FILES.

We refrained from doing such a split in the past, just because there is no point in it. Just including such source files in the output of legal-info is the easiest thing to do.

Quoted 3 lines

This matches a corresponding patch alreardy
submitted upstream that creates the Documentation/licenses/COPYING.ISC file.

Then when we update util-linux we can update the list of license files.

Regards,
Yann E. MORIN.

Quoted 49 lines

Signed-off-by Carlos Santos <[email protected]>

---
 package/util-linux/util-linux.hash | 2 +-
 package/util-linux/util-linux.mk   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

package/util-linux/util-linux.hash +1 -1

index 838d2dcb53..a614190f41 100644
@@ -6,4 +6,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documen
 sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.UCB
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPLv2.1
 sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3
-sha256 996126b78a42dd2eeea1256d78b7fd6dec090ea196365c0ccb46adc32bc92460  sys-utils/rfkill.c
+sha256 7c219a72182dcc988e9b748fa39c17df3e973994260741750be3e12e94234e28  Documentation/licenses/COPYING.ISC

package/util-linux/util-linux.mk +7 -1

index 5858887b04..c33b73594c 100644
@@ -13,7 +13,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_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 sys-utils/rfkill.c
+UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support

@@ -206,6 +206,12 @@ else
 UTIL_LINUX_CONF_OPTS += --without-audit
 endif
 
+# rfkill contails the license inside rfkill.c
+define UTIL_LINUX_EXTRACT_LICENSE
+	head -n 21 $(@D)/sys-utils/rfkill.c > $(@D)/Documentation/licenses/COPYING.ISC
+endef
+UTIL_LINUX_POST_EXTRACT_HOOKS += UTIL_LINUX_EXTRACT_LICENSE
+
 # Install PAM configuration files
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
 define UTIL_LINUX_INSTALL_PAMFILES

Signature · 6 lines

2.14.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Thomas Petazzoni

2018-01-15 20:39 UTC #2 lore raw

PATCH v2 1/1 util-linux: extract ISC licence from rfkill.c

Hello,

Quoted 5 lines · Yann E. MORIN

Quoted 3 lines
This matches a corresponding patch alreardy
submitted upstream that creates the Documentation/licenses/COPYING.ISC file.
Then when we update util-linux we can update the list of license files.

Or we could backport the patch adding COPYING.ISC.

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Yann E. MORIN

2018-01-15 20:42 UTC #3 lore raw

PATCH v2 1/1 util-linux: extract ISC licence from rfkill.c

Thomas, Carlos, All,

On 2018-01-15 21:39 +0100, Thomas Petazzoni spake thusly:

Quoted 6 lines · Yann E. MORIN

Quoted 4 lines
Quoted 3 lines
This matches a corresponding patch alreardy
submitted upstream that creates the Documentation/licenses/COPYING.ISC file.
Then when we update util-linux we can update the list of license files.
Or we could backport the patch adding COPYING.ISC.

Yes, we could. That's so much simpler.

Dude, do I need to think, sometimes... ;-)

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Carlos Santos

author

2018-01-18 00:21 UTC #4 lore raw

PATCH 1/1 util-linux: add ISC licence, used by rfkill

Pull a patch from upstream that adds Documentation/licenses/COPYING.ISC instead of distributing the whole rfkill.c file.

Signed-off-by Carlos Santos <[email protected]>

---
 package/util-linux/0001-docs-add-ISC-licence.patch | 38 ++++++++++++++++++++++
 package/util-linux/util-linux.hash                 |  2 +-
 package/util-linux/util-linux.mk                   |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 package/util-linux/0001-docs-add-ISC-licence.patch

package/util-linux/0001-docs-add-ISC-licence.patch new file +38 -0

new file mode 100644
index 0000000000..aea7b9719c
@@ -0,0 +1,38 @@
+From a9e4662d26b10789b28282d7e77ab189ef34cf5c Mon Sep 17 00:00:00 2001
+From: Carlos Santos <[email protected]>
+Date: Sun, 14 Jan 2018 16:39:31 -0200
+Subject: [PATCH] docs: add ISC licence
+
+Save the top 21 lines of sys-utils/rfkill.c as COPYING.ISC. This is
+useful for Linux distributions an integration tools like Buildroot,
+to collect detailed legal information for each package.
+
+[kzak at redhat.com: - remove C-comments and rfkill header]
+
+Signed-off-by: Carlos Santos <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ Documentation/licenses/COPYING.ISC | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 Documentation/licenses/COPYING.ISC
+
+diff --git a/Documentation/licenses/COPYING.ISC b/Documentation/licenses/COPYING.ISC
+new file mode 100644
+index 000000000..8351a30e3
+--- /dev/null
++++ b/Documentation/licenses/COPYING.ISC
+@@ -0,0 +1,11 @@
++Permission to use, copy, modify, and/or distribute this software for any
++purpose with or without fee is hereby granted, provided that the above
++copyright notice and this permission notice appear in all copies.
++
++THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+-- 
+2.14.3
+

package/util-linux/util-linux.hash +1 -1

index 838d2dcb53..068bb45e6c 100644
@@ -6,4 +6,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documen
 sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.UCB
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPLv2.1
 sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3
-sha256 996126b78a42dd2eeea1256d78b7fd6dec090ea196365c0ccb46adc32bc92460  sys-utils/rfkill.c
+sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63  Documentation/licenses/COPYING.ISC

package/util-linux/util-linux.mk +1 -1

index 5858887b04..e368464e8d 100644
@@ -13,7 +13,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_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 sys-utils/rfkill.c
+UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support

Signature · 1 line

2.14.3

Thomas Petazzoni

Applied

2018-01-18 16:53 UTC #5 lore raw

PATCH 1/1 util-linux: add ISC licence, used by rfkill

Hello,

Quoted 10 lines · Carlos Santos

Pull a patch from upstream that adds Documentation/licenses/COPYING.ISC instead of distributing the whole rfkill.c file.
Signed-off-by Carlos Santos <[email protected]>
---
 package/util-linux/0001-docs-add-ISC-licence.patch | 38 ++++++++++++++++++++++
 package/util-linux/util-linux.hash                 |  2 +-
 package/util-linux/util-linux.mk                   |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 package/util-linux/0001-docs-add-ISC-licence.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com