summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/remove-lscpu.patch')
-rw-r--r--meta/recipes-core/util-linux/util-linux/remove-lscpu.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
new file mode 100644
index 0000000000..a15c1e32a7
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
@@ -0,0 +1,40 @@
1Upstream-Status: Inappropriate [distribution]
2
3Take out lscpu stuff from the code
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: util-linux-2.21/configure.ac
8===================================================================
9--- util-linux-2.21.orig/configure.ac
10+++ util-linux-2.21/configure.ac
11@@ -871,7 +871,7 @@ UL_REQUIRES_BUILD([lsblk], [libblkid])
12 AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
13
14
15-UL_BUILD_INIT([lscpu], [check])
16+UL_BUILD_INIT([lscpu], [no])
17 UL_REQUIRES_LINUX([lscpu])
18 UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type])
19 AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes)
20Index: util-linux-2.21/sys-utils/Makefile.am
21===================================================================
22--- util-linux-2.21.orig/sys-utils/Makefile.am
23+++ util-linux-2.21/sys-utils/Makefile.am
24@@ -108,16 +108,6 @@ swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libb
25 swapon_LDADD = $(ul_libblkid_la)
26 endif
27
28-if BUILD_LSCPU
29-usrbin_exec_PROGRAMS += lscpu
30-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \
31- $(top_srcdir)/lib/strutils.c \
32- $(top_srcdir)/lib/mbsalign.c \
33- $(top_srcdir)/lib/tt.c \
34- $(top_srcdir)/lib/path.c
35-dist_man_MANS += lscpu.1
36-endif
37-
38 if BUILD_CHCPU
39 sbin_PROGRAMS += chcpu
40 chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \