diff options
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.22.2.bb')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.2.bb | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb index 2f48e0b860..9b94a4773d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb | |||
@@ -2,42 +2,16 @@ MAJOR_VERSION = "2.22" | |||
2 | PR = "r2" | 2 | PR = "r2" |
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 \ |
12 | file://fix-configure.patch \ | 9 | file://fix-configure.patch \ |
10 | file://mbsalign-license.patch \ | ||
13 | " | 11 | " |
14 | 12 | ||
15 | SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" | 13 | SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" |
16 | SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d" | 14 | SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d" |
17 | 15 | ||
18 | # Only lscpu part is gplv3; rest of the code is not, | ||
19 | # so take out the lscpu parts while running non-gplv3 build. | ||
20 | # The removal of the package should now occur during | ||
21 | # the build if INCOMPATIBLE_LICENSE is set to GPLv3 | ||
22 | |||
23 | python () { | ||
24 | d.setVar("REMOVELSCPU", "no") | ||
25 | if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1: | ||
26 | # avoid GPLv3 | ||
27 | d.setVar("REMOVELSCPU", "yes") | ||
28 | src_uri = (d.getVar("SRC_URI", False) or "").split() | ||
29 | src_uri.append("file://remove-lscpu.patch") | ||
30 | d.setVar("SRC_URI", " ".join(src_uri)) | ||
31 | } | ||
32 | |||
33 | do_remove_lscpu() { | ||
34 | if [ "x${REMOVELSCPU}" = "xyes" ]; then | ||
35 | rm -f sys-utils/lscpu.c sys-utils/lscpu.1 | ||
36 | rm -rf tests/ts/lscpu tests/expected/lscpu | ||
37 | fi | ||
38 | } | ||
39 | |||
40 | addtask remove_lscpu before do_configure after do_patch | ||
41 | |||
42 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" | 16 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" |
43 | EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group" | 17 | EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group" |