summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch120
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.19.1.bb2
2 files changed, 64 insertions, 58 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
index c726cf1183..afa50f46b8 100644
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
@@ -6,84 +6,90 @@ Take out lscpu stuff from the code
6Saul Wold <saul.wold@intel.com> 6Saul Wold <saul.wold@intel.com>
7Nitin A Kamble <nitin.a.kamble@intel.com> 7Nitin A Kamble <nitin.a.kamble@intel.com>
8 8
9Index: util-linux-ng-2.17.2/sys-utils/Makefile.am 9Index: util-linux-2.19.1/sys-utils/Makefile.am
10=================================================================== 10===================================================================
11--- util-linux-ng-2.17.2.orig/sys-utils/Makefile.am 11--- util-linux-2.19.1.orig/sys-utils/Makefile.am 2011-04-05 03:43:02.000000000 -0700
12+++ util-linux-ng-2.17.2/sys-utils/Makefile.am 12+++ util-linux-2.19.1/sys-utils/Makefile.am 2011-06-29 12:08:24.187440334 -0700
13@@ -11,11 +11,11 @@ dist_man_MANS = flock.1 ipcrm.1 ipcs.1 i 13@@ -17,12 +17,6 @@
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 \ 14 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
22- ldattach.8 lscpu.1 tunelp.8 rtcwake.8 15 ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
23+ ldattach.8 tunelp.8 rtcwake.8 16
17-if HAVE_CPU_SET_T
18-usrbin_exec_PROGRAMS += lscpu
19-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
20-dist_man_MANS += lscpu.1
21-endif
22-
24 endif 23 endif
25 24
26 cytune_SOURCES = cytune.c cyclades.h 25 cytune_SOURCES = cytune.c cyclades.h
27Index: util-linux-ng-2.17.2/sys-utils/Makefile.in 26Index: util-linux-2.19.1/sys-utils/Makefile.in
28=================================================================== 27===================================================================
29--- util-linux-ng-2.17.2.orig/sys-utils/Makefile.in 28--- util-linux-2.19.1.orig/sys-utils/Makefile.in 2011-05-02 02:49:19.000000000 -0700
30+++ util-linux-ng-2.17.2/sys-utils/Makefile.in 29+++ util-linux-2.19.1/sys-utils/Makefile.in 2011-06-29 12:10:47.647440371 -0700
31@@ -47,10 +47,10 @@ usrsbin_exec_PROGRAMS = readprofile$(EXE 30@@ -51,8 +51,6 @@
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 \ 31 @LINUX_TRUE@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
39-@LINUX_TRUE@ ldattach.8 lscpu.1 tunelp.8 rtcwake.8 32 @LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
40+@LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8
41 33
42 @BUILD_FALLOCATE_TRUE@am__append_6 = fallocate 34-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_6 = lscpu
43 @BUILD_FALLOCATE_TRUE@am__append_7 = fallocate.1 35-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_7 = lscpu.1
44@@ -100,7 +100,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" 36 @BUILD_FALLOCATE_TRUE@am__append_8 = fallocate
37 @BUILD_FALLOCATE_TRUE@am__append_9 = fallocate.1
38 @BUILD_PIVOT_ROOT_TRUE@am__append_10 = pivot_root
39@@ -98,7 +96,6 @@
45 @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT) 40 @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT)
46 @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT) 41 @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT)
47 @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT) \ 42 @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
48-@LINUX_TRUE@ lscpu$(EXEEXT) 43-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_7 = lscpu$(EXEEXT)
49+@LINUX_TRUE@ 44 @BUILD_FALLOCATE_TRUE@am__EXEEXT_8 = fallocate$(EXEEXT)
50 @BUILD_FALLOCATE_TRUE@am__EXEEXT_7 = fallocate$(EXEEXT) 45 @BUILD_UNSHARE_TRUE@am__EXEEXT_9 = unshare$(EXEEXT)
51 @BUILD_UNSHARE_TRUE@am__EXEEXT_8 = unshare$(EXEEXT) 46 @LINUX_TRUE@am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
52 @LINUX_TRUE@am__EXEEXT_9 = ldattach$(EXEEXT) tunelp$(EXEEXT) \ 47@@ -146,11 +143,6 @@
53@@ -141,9 +141,6 @@ ipcs_LDADD = $(LDADD)
54 ldattach_SOURCES = ldattach.c 48 ldattach_SOURCES = ldattach.c
55 ldattach_OBJECTS = ldattach.$(OBJEXT) 49 ldattach_OBJECTS = ldattach.$(OBJEXT)
56 ldattach_LDADD = $(LDADD) 50 ldattach_LDADD = $(LDADD)
57-lscpu_SOURCES = lscpu.c 51-am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c
58-lscpu_OBJECTS = lscpu.$(OBJEXT) 52-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am_lscpu_OBJECTS = lscpu.$(OBJEXT) \
53-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ cpuset.$(OBJEXT)
54-lscpu_OBJECTS = $(am_lscpu_OBJECTS)
59-lscpu_LDADD = $(LDADD) 55-lscpu_LDADD = $(LDADD)
60 pivot_root_SOURCES = pivot_root.c 56 pivot_root_SOURCES = pivot_root.c
61 pivot_root_OBJECTS = pivot_root.$(OBJEXT) 57 pivot_root_OBJECTS = pivot_root.$(OBJEXT)
62 pivot_root_LDADD = $(LDADD) 58 pivot_root_LDADD = $(LDADD)
63@@ -201,11 +198,11 @@ AM_V_GEN = $(am__v_GEN_$(V)) 59@@ -206,13 +198,13 @@
64 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
65 am__v_GEN_0 = @echo " GEN " $@; 60 am__v_GEN_0 = @echo " GEN " $@;
66 SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) dmesg.c fallocate.c \ 61 SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
67- flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c lscpu.c pivot_root.c \ 62 $(fallocate_SOURCES) flock.c fsfreeze.c $(fstrim_SOURCES) \
68+ flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c pivot_root.c \ 63- ipcmk.c ipcrm.c ipcs.c ldattach.c $(lscpu_SOURCES) \
69 rdev.c readprofile.c renice.c rtcwake.c setarch.c setsid.c \ 64+ ipcmk.c ipcrm.c ipcs.c ldattach.c \
70 switch_root.c $(tunelp_SOURCES) unshare.c 65 pivot_root.c readprofile.c renice.c $(rtcwake_SOURCES) \
71 DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) dmesg.c \ 66 setarch.c setsid.c switch_root.c $(tunelp_SOURCES) unshare.c
72- fallocate.c flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c lscpu.c \ 67 DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
73+ fallocate.c flock.c ipcmk.c ipcrm.c ipcs.c ldattach.c \ 68 $(am__fallocate_SOURCES_DIST) flock.c fsfreeze.c \
74 pivot_root.c rdev.c readprofile.c renice.c rtcwake.c setarch.c \ 69 $(fstrim_SOURCES) ipcmk.c ipcrm.c ipcs.c ldattach.c \
75 setsid.c switch_root.c $(tunelp_SOURCES) unshare.c 70- $(am__lscpu_SOURCES_DIST) pivot_root.c readprofile.c renice.c \
76 INFO_DEPS = $(srcdir)/ipc.info 71+ pivot_root.c readprofile.c renice.c \
77@@ -248,7 +245,7 @@ NROFF = nroff 72 $(rtcwake_SOURCES) setarch.c setsid.c switch_root.c \
73 $(tunelp_SOURCES) unshare.c
74 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
75@@ -242,7 +234,7 @@
78 MANS = $(dist_man_MANS) $(man_MANS) 76 MANS = $(dist_man_MANS) $(man_MANS)
79 am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \ 77 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 \ 78 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 \ 79- ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 lscpu.1 \
82+ ldattach.8 tunelp.8 rtcwake.8 fallocate.1 pivot_root.8 \ 80+ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 \
83 switch_root.8 unshare.1 arch.1 rdev.8 81 fallocate.1 pivot_root.8 switch_root.8 unshare.1 arch.1
84 DATA = $(dist_noinst_DATA) 82 DATA = $(dist_noinst_DATA)
85 ETAGS = etags 83 ETAGS = etags
86@@ -678,9 +675,6 @@ ipcs$(EXEEXT): $(ipcs_OBJECTS) $(ipcs_DE 84@@ -438,7 +430,6 @@
85 readprofile.1 $(am__append_5) $(am__append_7) $(am__append_9) \
86 $(am__append_11) $(am__append_13) $(am__append_15) \
87 $(am__append_17)
88-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
89 cytune_SOURCES = cytune.c cyclades.h
90 tunelp_SOURCES = tunelp.c lp.h
91 fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
92@@ -693,9 +684,6 @@
87 ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES) 93 ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES)
88 @rm -f ldattach$(EXEEXT) 94 @rm -f ldattach$(EXEEXT)
89 $(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS) 95 $(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS)
@@ -93,11 +99,11 @@ Index: util-linux-ng-2.17.2/sys-utils/Makefile.in
93 pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES) 99 pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES)
94 @rm -f pivot_root$(EXEEXT) 100 @rm -f pivot_root$(EXEEXT)
95 $(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS) 101 $(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
96@@ -728,7 +722,6 @@ distclean-compile: 102@@ -743,7 +731,6 @@
97 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@ 103 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@
98 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@ 104 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
99 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@ 105 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@
100-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@ 106-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@
101 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@ 107 @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@ 108 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@
109 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renice.Po@am__quote@
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 132f28b41f..0fd67d11d7 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.19" 1MAJOR_VERSION = "2.19"
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+