diff options
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.21.2.bb')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.21.2.bb | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb index 39e3609ac0..3ec6a50b57 100644 --- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb | |||
@@ -2,41 +2,15 @@ MAJOR_VERSION = "2.21" | |||
2 | PR = "r5" | 2 | PR = "r5" |
3 | require util-linux.inc | 3 | require util-linux.inc |
4 | 4 | ||
5 | # note that `lscpu' is under GPLv3+ | ||
6 | LICENSE_${PN}-lscpu = "GPLv3+" | ||
7 | |||
8 | SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ | 5 | SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ |
9 | file://util-linux-ng-2.16-mount_lock_path.patch \ | 6 | file://util-linux-ng-2.16-mount_lock_path.patch \ |
10 | file://uclibc-__progname-conflict.patch \ | 7 | file://uclibc-__progname-conflict.patch \ |
11 | file://configure-sbindir.patch \ | 8 | file://configure-sbindir.patch \ |
9 | file://mbsalign-license.patch \ | ||
12 | " | 10 | " |
13 | 11 | ||
14 | SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" | 12 | SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" |
15 | SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30" | 13 | SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30" |
16 | 14 | ||
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" | 15 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" |
42 | EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" | 16 | EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" |