summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-12-05 14:43:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:18 +0000
commitae4a89612bcd0eb24db499682a44cdeb062a8690 (patch)
treec6a52b180f49b707b02b3aca1c2da2d72930bbdd
parent99e36acfdf3ff13a20a5b486c21f5ca111c0dc86 (diff)
downloadpoky-ae4a89612bcd0eb24db499682a44cdeb062a8690.tar.gz
util-linux: rebase remove-lscpu patch
(From OE-Core rev: b7c343fc4ae8c65cdc3e12e5b75257e3780bd2a0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux/remove-lscpu.patch29
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.22.1.bb2
2 files changed, 14 insertions, 17 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
index a15c1e32a7..ddf14a50d1 100644
--- a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
@@ -4,11 +4,11 @@ Take out lscpu stuff from the code
4 4
5Signed-off-by: Saul Wold <sgw@linux.intel.com> 5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6 6
7Index: util-linux-2.21/configure.ac 7Index: util-linux-2.22.1/configure.ac
8=================================================================== 8===================================================================
9--- util-linux-2.21.orig/configure.ac 9--- util-linux-2.22.1.orig/configure.ac
10+++ util-linux-2.21/configure.ac 10+++ util-linux-2.22.1/configure.ac
11@@ -871,7 +871,7 @@ UL_REQUIRES_BUILD([lsblk], [libblkid]) 11@@ -937,7 +937,7 @@ UL_REQUIRES_BUILD([lsblk], [libmount])
12 AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes) 12 AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
13 13
14 14
@@ -17,24 +17,21 @@ Index: util-linux-2.21/configure.ac
17 UL_REQUIRES_LINUX([lscpu]) 17 UL_REQUIRES_LINUX([lscpu])
18 UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type]) 18 UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type])
19 AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes) 19 AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes)
20Index: util-linux-2.21/sys-utils/Makefile.am 20Index: util-linux-2.22.1/sys-utils/Makemodule.am
21=================================================================== 21===================================================================
22--- util-linux-2.21.orig/sys-utils/Makefile.am 22--- util-linux-2.22.1.orig/sys-utils/Makemodule.am
23+++ util-linux-2.21/sys-utils/Makefile.am 23+++ util-linux-2.22.1/sys-utils/Makemodule.am
24@@ -108,16 +108,6 @@ swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libb 24@@ -224,13 +224,6 @@ swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_lib
25 swapon_LDADD = $(ul_libblkid_la) 25 swapoff_LDADD = $(LDADD) libmount.la
26 endif 26 endif
27 27
28-if BUILD_LSCPU 28-if BUILD_LSCPU
29-usrbin_exec_PROGRAMS += lscpu 29-usrbin_exec_PROGRAMS += lscpu
30-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \ 30-lscpu_SOURCES = sys-utils/lscpu.c
31- $(top_srcdir)/lib/strutils.c \ 31-lscpu_LDADD = $(LDADD) libcommon.la
32- $(top_srcdir)/lib/mbsalign.c \ 32-dist_man_MANS += sys-utils/lscpu.1
33- $(top_srcdir)/lib/tt.c \
34- $(top_srcdir)/lib/path.c
35-dist_man_MANS += lscpu.1
36-endif 33-endif
37- 34-
38 if BUILD_CHCPU 35 if BUILD_CHCPU
39 sbin_PROGRAMS += chcpu 36 sbin_PROGRAMS += chcpu
40 chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \ 37 chcpu_SOURCES = sys-utils/chcpu.c
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.1.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
index 0177bba260..f5d777f686 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.22" 1MAJOR_VERSION = "2.22"
2PR = "r1" 2PR = "r2"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+