mirror of
https://git.yoctoproject.org/poky
synced 2026-02-12 03:33:02 +01:00
100111f6ff
(From OE-Core rev: 998abea2748c6c7e0873ffd382b2bb2fd233c3f1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
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 \
|