diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-05-24 16:19:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-01 18:32:26 +0100 |
commit | 596e6807826c34a4f93d7cb26052d1bd7a985201 (patch) | |
tree | d4b16f78ef5eb8eff79f285f77c46b6be09ac7e1 /meta/recipes-core/util-linux/util-linux_2.19.1.bb | |
parent | b6fdf7eb9a1c5927009d88c84df59e091f5b2a7d (diff) | |
download | openembedded-core-596e6807826c34a4f93d7cb26052d1bd7a985201.tar.gz openembedded-core-596e6807826c34a4f93d7cb26052d1bd7a985201.tar.bz2 openembedded-core-596e6807826c34a4f93d7cb26052d1bd7a985201.tar.xz openembedded-core-596e6807826c34a4f93d7cb26052d1bd7a985201.zip |
util-linux: update to 2.19.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.19.1.bb')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.19.1.bb | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb new file mode 100644 index 000000000..7fe7497eb --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb @@ -0,0 +1,43 @@ +MAJOR_VERSION = "2.19" +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" + +SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c" +SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d" + +# 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" +EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" |