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:48:06 +0100 |
commit | 034cebebb294a025c5ed1d60d6332f982d2b93ce (patch) | |
tree | 67ea779326e9d6b3d3c8066261ce4d7c1d32c044 /meta/recipes-core/util-linux/util-linux_2.21.bb | |
parent | 6362e9c01e999fb24269cc117a049f4c42e6b27a (diff) | |
download | poky-034cebebb294a025c5ed1d60d6332f982d2b93ce.tar.gz |
util-linux: Update to 2.21.1
(From OE-Core rev: 2114d734b9c4ace980ef9fa30dd5b5f76f49b934)
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.21.bb')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.21.bb | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb deleted file mode 100644 index c0c8bc6edd..0000000000 --- a/meta/recipes-core/util-linux/util-linux_2.21.bb +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | MAJOR_VERSION = "2.21" | ||
2 | PR = "r5" | ||
3 | require util-linux.inc | ||
4 | |||
5 | # note that `lscpu' is under GPLv3+ | ||
6 | LICENSE_${PN}-lscpu = "GPLv3+" | ||
7 | |||
8 | SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ | ||
9 | file://util-linux-ng-2.16-mount_lock_path.patch \ | ||
10 | file://uclibc-__progname-conflict.patch \ | ||
11 | file://fix_NL_TIME_FIRST_WEEKDAY.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870" | ||
15 | SRC_URI[sha256sum] = "2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6" | ||
16 | |||
17 | # Only lscpu part is gplv3; rest of the code is not, | ||
18 | # so take out the lscpu parts while running non-gplv3 build. | ||
19 | # The removal of the package should now occur during | ||
20 | # the build if INCOMPATIBLE_LICENSE is set to GPLv3 | ||
21 | |||
22 | python () { | ||
23 | d.setVar("REMOVELSCPU", "no") | ||
24 | if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1: | ||
25 | # avoid GPLv3 | ||
26 | d.setVar("REMOVELSCPU", "yes") | ||
27 | src_uri = (d.getVar("SRC_URI", False) or "").split() | ||
28 | src_uri.append("file://remove-lscpu.patch") | ||
29 | d.setVar("SRC_URI", " ".join(src_uri)) | ||
30 | } | ||
31 | |||
32 | do_remove_lscpu() { | ||
33 | if [ "x${REMOVELSCPU}" = "xyes" ]; then | ||
34 | rm -f sys-utils/lscpu.c sys-utils/lscpu.1 | ||
35 | rm -rf tests/ts/lscpu tests/expected/lscpu | ||
36 | fi | ||
37 | } | ||
38 | |||
39 | addtask remove_lscpu before do_configure after do_patch | ||
40 | |||
41 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" | ||
42 | EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" | ||
43 | |||
44 | do_install_append () { | ||
45 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe | ||
46 | } | ||