mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 07:27:12 +00:00
util-linux: Update License Information (remove GPLv3 Licnese)
The upstream authors have updated the licenses of a couple subcomponents, these were GPLv3, but updated to be either GPLv2 or LGPLv2.1 accordingly. These changes make the util-linux package become completely non-GPLv3. Cleaned up some white space issue also [YOCTO #4014] (From OE-Core rev: 6093fe2694ac5300feaa38fe2eb898ea843f92ee) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
a6e575292f
commit
2381e46e77
@@ -2,42 +2,16 @@ MAJOR_VERSION = "2.22"
|
||||
PR = "r2"
|
||||
require util-linux.inc
|
||||
|
||||
# note that `lscpu' is under GPLv3+
|
||||
LICENSE_${PN}-lscpu = "GPLv3+"
|
||||
|
||||
SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
|
||||
file://util-linux-ng-2.16-mount_lock_path.patch \
|
||||
file://uclibc-__progname-conflict.patch \
|
||||
file://configure-sbindir.patch \
|
||||
file://fix-configure.patch \
|
||||
file://configure-sbindir.patch \
|
||||
file://fix-configure.patch \
|
||||
file://mbsalign-license.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e"
|
||||
SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d"
|
||||
|
||||
# Only lscpu part is gplv3; rest of the code is not,
|
||||
# so take out the lscpu parts while running non-gplv3 build.
|
||||
# The removal of the package should now occur during
|
||||
# the build if INCOMPATIBLE_LICENSE is set to GPLv3
|
||||
|
||||
python () {
|
||||
d.setVar("REMOVELSCPU", "no")
|
||||
if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
|
||||
# avoid GPLv3
|
||||
d.setVar("REMOVELSCPU", "yes")
|
||||
src_uri = (d.getVar("SRC_URI", False) or "").split()
|
||||
src_uri.append("file://remove-lscpu.patch")
|
||||
d.setVar("SRC_URI", " ".join(src_uri))
|
||||
}
|
||||
|
||||
do_remove_lscpu() {
|
||||
if [ "x${REMOVELSCPU}" = "xyes" ]; then
|
||||
rm -f sys-utils/lscpu.c sys-utils/lscpu.1
|
||||
rm -rf tests/ts/lscpu tests/expected/lscpu
|
||||
fi
|
||||
}
|
||||
|
||||
addtask remove_lscpu before do_configure after do_patch
|
||||
|
||||
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
|
||||
EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group"
|
||||
|
||||
Reference in New Issue
Block a user