diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-05-24 16:19:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-01 18:34:32 +0100 |
commit | a70cc536166de4114de1ad1c8f491f45093ef7fc (patch) | |
tree | 3050047ef7e4ba91d0788499da2b854770fa6322 /meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch | |
parent | 2dfc95b92d31540970891aea1aca0d9e04ba7df3 (diff) | |
download | poky-a70cc536166de4114de1ad1c8f491f45093ef7fc.tar.gz |
util-linux: update to 2.19.1
(From OE-Core rev: 596e6807826c34a4f93d7cb26052d1bd7a985201)
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.17.2/remove-lscpu.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch deleted file mode 100644 index c726cf1183..0000000000 --- a/meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch +++ /dev/null | |||
@@ -1,103 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [distribution] | ||
2 | |||
3 | Take out lscpu stuff from the code | ||
4 | |||
5 | 2011/03/17 | ||
6 | Saul Wold <saul.wold@intel.com> | ||
7 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
8 | |||
9 | Index: util-linux-ng-2.17.2/sys-utils/Makefile.am | ||
10 | =================================================================== | ||
11 | --- util-linux-ng-2.17.2.orig/sys-utils/Makefile.am | ||
12 | +++ util-linux-ng-2.17.2/sys-utils/Makefile.am | ||
13 | @@ -11,11 +11,11 @@ dist_man_MANS = flock.1 ipcrm.1 ipcs.1 i | ||
14 | if LINUX | ||
15 | bin_PROGRAMS += dmesg | ||
16 | sbin_PROGRAMS += ctrlaltdel | ||
17 | -usrbin_exec_PROGRAMS += cytune setarch lscpu | ||
18 | +usrbin_exec_PROGRAMS += cytune setarch | ||
19 | usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake | ||
20 | |||
21 | dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ | ||
22 | - ldattach.8 lscpu.1 tunelp.8 rtcwake.8 | ||
23 | + ldattach.8 tunelp.8 rtcwake.8 | ||
24 | endif | ||
25 | |||
26 | cytune_SOURCES = cytune.c cyclades.h | ||
27 | Index: util-linux-ng-2.17.2/sys-utils/Makefile.in | ||
28 | =================================================================== | ||
29 | --- util-linux-ng-2.17.2.orig/sys-utils/Makefile.in | ||
30 | +++ util-linux-ng-2.17.2/sys-utils/Makefile.in | ||
31 | @@ -47,10 +47,10 @@ usrsbin_exec_PROGRAMS = readprofile$(EXE | ||
32 | $(am__EXEEXT_10) | ||
33 | @LINUX_TRUE@am__append_1 = dmesg | ||
34 | @LINUX_TRUE@am__append_2 = ctrlaltdel | ||
35 | -@LINUX_TRUE@am__append_3 = cytune setarch lscpu | ||
36 | +@LINUX_TRUE@am__append_3 = cytune setarch | ||
37 | @LINUX_TRUE@am__append_4 = ldattach tunelp rtcwake | ||
38 | @LINUX_TRUE@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ | ||
39 | -@LINUX_TRUE@ ldattach.8 lscpu.1 tunelp.8 rtcwake.8 | ||
40 | +@LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8 | ||
41 | |||
42 | @BUILD_FALLOCATE_TRUE@am__append_6 = fallocate | ||
43 | @BUILD_FALLOCATE_TRUE@am__append_7 = fallocate.1 | ||
44 | @@ -100,7 +100,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" | ||
45 | @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT) | ||
46 | @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT) | ||
47 | @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT) \ | ||
48 | -@LINUX_TRUE@ lscpu$(EXEEXT) | ||
49 | +@LINUX_TRUE@ | ||
50 | @BUILD_FALLOCATE_TRUE@am__EXEEXT_7 = fallocate$(EXEEXT) | ||
51 | @BUILD_UNSHARE_TRUE@am__EXEEXT_8 = unshare$(EXEEXT) | ||
52 | @LINUX_TRUE@am__EXEEXT_9 = ldattach$(EXEEXT) tunelp$(EXEEXT) \ | ||
53 | @@ -141,9 +141,6 @@ ipcs_LDADD = $(LDADD) | ||
54 | ldattach_SOURCES = ldattach.c | ||
55 | ldattach_OBJECTS = ldattach.$(OBJEXT) | ||
56 | ldattach_LDADD = $(LDADD) | ||
57 | -lscpu_SOURCES = lscpu.c | ||
58 | -lscpu_OBJECTS = lscpu.$(OBJEXT) | ||
59 | -lscpu_LDADD = $(LDADD) | ||
60 | pivot_root_SOURCES = pivot_root.c | ||
61 | pivot_root_OBJECTS = pivot_root.$(OBJEXT) | ||
62 | pivot_root_LDADD = $(LDADD) | ||
63 | @@ -201,11 +198,11 @@ AM_V_GEN = $(am__v_GEN_$(V)) | ||
64 | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
65 | am__v_GEN_0 = @echo " GEN " $@; | ||
66 | SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) dmesg.c fallocate.c \ | ||
67 | - flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c lscpu.c pivot_root.c \ | ||
68 | + flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c pivot_root.c \ | ||
69 | rdev.c readprofile.c renice.c rtcwake.c setarch.c setsid.c \ | ||
70 | switch_root.c $(tunelp_SOURCES) unshare.c | ||
71 | DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) dmesg.c \ | ||
72 | - fallocate.c flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c lscpu.c \ | ||
73 | + fallocate.c flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c \ | ||
74 | pivot_root.c rdev.c readprofile.c renice.c rtcwake.c setarch.c \ | ||
75 | setsid.c switch_root.c $(tunelp_SOURCES) unshare.c | ||
76 | INFO_DEPS = $(srcdir)/ipc.info | ||
77 | @@ -248,7 +245,7 @@ NROFF = nroff | ||
78 | MANS = $(dist_man_MANS) $(man_MANS) | ||
79 | am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \ | ||
80 | setsid.1 readprofile.1 dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ | ||
81 | - ldattach.8 lscpu.1 tunelp.8 rtcwake.8 fallocate.1 pivot_root.8 \ | ||
82 | + ldattach.8 tunelp.8 rtcwake.8 fallocate.1 pivot_root.8 \ | ||
83 | switch_root.8 unshare.1 arch.1 rdev.8 | ||
84 | DATA = $(dist_noinst_DATA) | ||
85 | ETAGS = etags | ||
86 | @@ -678,9 +675,6 @@ ipcs$(EXEEXT): $(ipcs_OBJECTS) $(ipcs_DE | ||
87 | ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES) | ||
88 | @rm -f ldattach$(EXEEXT) | ||
89 | $(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS) | ||
90 | -lscpu$(EXEEXT): $(lscpu_OBJECTS) $(lscpu_DEPENDENCIES) | ||
91 | - @rm -f lscpu$(EXEEXT) | ||
92 | - $(AM_V_CCLD)$(LINK) $(lscpu_OBJECTS) $(lscpu_LDADD) $(LIBS) | ||
93 | pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES) | ||
94 | @rm -f pivot_root$(EXEEXT) | ||
95 | $(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS) | ||
96 | @@ -728,7 +722,6 @@ distclean-compile: | ||
97 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@ | ||
98 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@ | ||
99 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@ | ||
100 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@ | ||
101 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@ | ||
102 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdev.Po@am__quote@ | ||
103 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@ | ||