diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2012-11-16 19:51:34 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-03 14:41:49 +0000 |
| commit | ac807121ce3ba965f3e2a4f664a60ae4e33ce550 (patch) | |
| tree | 0da00ae362c3c1c161b0607bceb6fe7cc9e11ecc /meta/recipes-core/util-linux/util-linux_2.22.1.bb | |
| parent | 1e05183289dbf77ebb1e7aa3375525a7d97eaf0f (diff) | |
| download | openembedded-core-contrib-ac807121ce3ba965f3e2a4f664a60ae4e33ce550.tar.gz | |
util-linux: Update to 2.22.1
Fix the configure-sbindir test, which was not working correctly
add a patch to configure to correctly test if the prefixes are
conatined in libdir so they don't duplicate.
Removed aarch64 patch since it been merged into this version
Rebased util-linux-ng-replace-siginterrupt.patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.22.1.bb')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.1.bb | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.1.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb new file mode 100644 index 0000000000..c72634dc96 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb @@ -0,0 +1,43 @@ +MAJOR_VERSION = "2.22" +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://configure-sbindir.patch \ + file://fix-configure.patch \ +" + +SRC_URI[md5sum] = "cad23c41a014af766d467b86628bd0fd" +SRC_URI[sha256sum] = "4297ea2a560f8839d7b3cde72a5955d1458dbad38fe0e3d99ccb1fde3df751b2" + +# 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" |