diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-04-30 11:26:24 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:00:28 +0100 |
commit | 2114d734b9c4ace980ef9fa30dd5b5f76f49b934 (patch) | |
tree | e2b7239da2360bb1a69c5552c17e87cf770ff9b2 /meta/recipes-core/util-linux/util-linux_2.21.1.bb | |
parent | 6a0dac89932b41502bb55a2dae07d835ca3c6245 (diff) | |
download | openembedded-core-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.tar.gz openembedded-core-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.tar.bz2 openembedded-core-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.tar.xz openembedded-core-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.zip |
util-linux: Update to 2.21.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.21.1.bb')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.21.1.bb | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.1.bb new file mode 100644 index 000000000..12faba00b --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.21.1.bb @@ -0,0 +1,46 @@ +MAJOR_VERSION = "2.21" +PR = "r0" +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://fix_NL_TIME_FIRST_WEEKDAY.patch \ +" + +SRC_URI[md5sum] = "3d9ad37bf8c5a8e6d0e165b020cf9ba5" +SRC_URI[sha256sum] = "4bf9641fd58454106589be8a8d1cfd61e7694f0a6912d8095d17b1fb94b85abe" + +# 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_virtclass-native += "--disable-fallocate --disable-use-tty-group" + +do_install_append () { + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe +} |