blob: a15c1e32a729d6e134eddae4b80c35ec52d79f2d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Upstream-Status: Inappropriate [distribution]
Take out lscpu stuff from the code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: util-linux-2.21/configure.ac
===================================================================
--- util-linux-2.21.orig/configure.ac
+++ util-linux-2.21/configure.ac
@@ -871,7 +871,7 @@ UL_REQUIRES_BUILD([lsblk], [libblkid])
AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
-UL_BUILD_INIT([lscpu], [check])
+UL_BUILD_INIT([lscpu], [no])
UL_REQUIRES_LINUX([lscpu])
UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type])
AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes)
Index: util-linux-2.21/sys-utils/Makefile.am
===================================================================
--- util-linux-2.21.orig/sys-utils/Makefile.am
+++ util-linux-2.21/sys-utils/Makefile.am
@@ -108,16 +108,6 @@ swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libb
swapon_LDADD = $(ul_libblkid_la)
endif
-if BUILD_LSCPU
-usrbin_exec_PROGRAMS += lscpu
-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \
- $(top_srcdir)/lib/strutils.c \
- $(top_srcdir)/lib/mbsalign.c \
- $(top_srcdir)/lib/tt.c \
- $(top_srcdir)/lib/path.c
-dist_man_MANS += lscpu.1
-endif
-
if BUILD_CHCPU
sbin_PROGRAMS += chcpu
chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \
|
