From e2e6f6fe07049f33cb6348780fa975162752e421 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 12 Dec 2013 13:38:32 +0100 Subject: initial commit of Enea Linux 3.1 Migrated from the internal git server on the dora-enea branch Signed-off-by: Adrian Dudau --- .../util-linux/util-linux/remove-lscpu.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/remove-lscpu.patch (limited to 'meta/recipes-core/util-linux/util-linux/remove-lscpu.patch') 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..ddf14a50d1 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch @@ -0,0 +1,37 @@ +Upstream-Status: Inappropriate [distribution] + +Take out lscpu stuff from the code + +Signed-off-by: Saul Wold + +Index: util-linux-2.22.1/configure.ac +=================================================================== +--- util-linux-2.22.1.orig/configure.ac ++++ util-linux-2.22.1/configure.ac +@@ -937,7 +937,7 @@ UL_REQUIRES_BUILD([lsblk], [libmount]) + 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.22.1/sys-utils/Makemodule.am +=================================================================== +--- util-linux-2.22.1.orig/sys-utils/Makemodule.am ++++ util-linux-2.22.1/sys-utils/Makemodule.am +@@ -224,13 +224,6 @@ swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_lib + swapoff_LDADD = $(LDADD) libmount.la + endif + +-if BUILD_LSCPU +-usrbin_exec_PROGRAMS += lscpu +-lscpu_SOURCES = sys-utils/lscpu.c +-lscpu_LDADD = $(LDADD) libcommon.la +-dist_man_MANS += sys-utils/lscpu.1 +-endif +- + if BUILD_CHCPU + sbin_PROGRAMS += chcpu + chcpu_SOURCES = sys-utils/chcpu.c -- cgit v1.2.3-54-g00ecf