From 9cb35b41c803bd0d1904b2dc0e14624fa7ea6e95 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 27 Feb 2012 00:45:48 -0800 Subject: util-linux: Update to 2.21 This updates various checksums for the COPYING files, which moved in the process no changes to Licenses Tweak the scanf_cv_alloc_modifier and rebase the patch Signed-off-by: Saul Wold --- meta/recipes-core/util-linux/util-linux_2.21.bb | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux_2.21.bb (limited to 'meta/recipes-core/util-linux/util-linux_2.21.bb') diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb new file mode 100644 index 0000000000..aa6ac649a3 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.21.bb @@ -0,0 +1,47 @@ +MAJOR_VERSION = "2.21" +PR = "r0" +require util-linux.inc + +# note that `lscpu' is under GPLv3+ +LICENSE_util-linux-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 \ +" + +SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870" +SRC_URI[sha256sum] = "2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6" + +# 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 + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" +EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" + +do_install_append () { + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe +} -- cgit 1.2.3-korg