aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux_2.17.2.bb
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-03-15 13:18:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 16:38:11 +0000
commitebd181cf6ce3fe233b61aef3af093228aa925f4d (patch)
tree0b043218ceb39aafea9adb058754b25af45e79f7 /meta/recipes-core/util-linux/util-linux_2.17.2.bb
parent543577c25b5a4e89a3ab15ee28e754b71c2a43d5 (diff)
downloadopenembedded-core-contrib-ebd181cf6ce3fe233b61aef3af093228aa925f4d.tar.gz
openembedded-core-contrib-ebd181cf6ce3fe233b61aef3af093228aa925f4d.tar.bz2
openembedded-core-contrib-ebd181cf6ce3fe233b61aef3af093228aa925f4d.zip
util-linux: Setup for GPLv2 Recipe
* add task to remove the GPLv3 lscpu code * Add patch to remove the reference to lscpu in Makfiles Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.17.2.bb')
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.17.2.bb31
1 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index 190a9e3784..f6bdfd4988 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,9 @@
MAJOR_VERSION = "2.17"
+PR = "r7"
require util-linux.inc
-PR = "r6"
+
+# note that `lscpu' is under GPLv3+
+LICENSE_util-linux-lscpu = "GPLv3+"
SRC_URI += "file://uclibc-compile.patch \
file://util-linux-ng-replace-siginterrupt.patch \
@@ -9,6 +12,32 @@ SRC_URI += "file://uclibc-compile.patch \
SRC_URI[md5sum] = "4635725a3eef1c57090bac8ea5e082e6"
SRC_URI[sha256sum] = "c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f"
+# Only lscpu part is gplv3; rest of the code is not,
+# so take out the lscpu parts while running non-gplv3 build.
+python () {
+ d.setVar("REMOVELSCPU", "no")
+ if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
+ # avoid GPLv3
+ d.setVar("REMOVELSCPU", "yes")
+ packages = (d.getVar("PACKAGES", False) or "").split()
+ if "util-linux-lscpu" in packages:
+ packages.remove("util-linux-lscpu")
+ d.setVar("PACKAGES", " ".join(packages))
+
+ 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
+
# fallocate is glibc 2.10, fallocate64 is glibc 2.11
# we need to disable it for older versions
EXTRA_OECONF += "ac_cv_func_fallocate=no"