summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-27 00:45:48 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:46 +0000
commit79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb (patch)
tree6253b2390a781ad4e84a50108ca158b553890c4c /meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
parentef461c4a2a3e056adc875662f3c26f2cb4b9f161 (diff)
downloadpoky-79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb.tar.gz
util-linux: Update to 2.21
This updates various checksums for the COPYING files, which moved in the process no changes to Licenses Tweak the scanf_cv_alloc_modifier and rebase the patch (From OE-Core rev: 9cb35b41c803bd0d1904b2dc0e14624fa7ea6e95) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch')
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
new file mode 100644
index 0000000000..434e28d637
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
@@ -0,0 +1,25 @@
1Upstream-Status: Inappropriate [distribution]
2
3Take out lscpu stuff from the code
4
52011/03/17
6Saul Wold <saul.wold@intel.com>
7Nitin A Kamble <nitin.a.kamble@intel.com>
8
9Index: util-linux-2.20.1/sys-utils/Makefile.am
10===================================================================
11--- util-linux-2.20.1.orig/sys-utils/Makefile.am
12+++ util-linux-2.20.1/sys-utils/Makefile.am
13@@ -17,12 +17,6 @@ usrsbin_exec_PROGRAMS += ldattach tunelp
14 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
15 ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
16
17-if HAVE_CPU_SET_T
18-usrbin_exec_PROGRAMS += lscpu
19-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c
20-dist_man_MANS += lscpu.1
21-endif
22-
23 endif
24
25 cytune_SOURCES = cytune.c cyclades.h