summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-04 15:11:58 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-06 12:11:30 +0000
commit815c7e8e83c424510bb2b012f2839f10316f467a (patch)
treee342119fbbf6080fcf6c19b5ef3bf56104844bf3 /meta/recipes-core
parent1d2451a8c70774380aae48f99ebc3967a86911f5 (diff)
downloadpoky-815c7e8e83c424510bb2b012f2839f10316f467a.tar.gz
util-linux: Update patch for non-GPLv3
Rebase the disable-lscpu patch for the updated source base, we only need to modify Makefile.am, since automake will regenerate the Makefile.in. (From OE-Core rev: a299d91ba422ed2ee34c1c54cdfaff4c88c60754) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch94
1 files changed, 5 insertions, 89 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
index afa50f46b8..434e28d637 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
@@ -6,104 +6,20 @@ 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-2.19.1/sys-utils/Makefile.am 9Index: util-linux-2.20.1/sys-utils/Makefile.am
10=================================================================== 10===================================================================
11--- util-linux-2.19.1.orig/sys-utils/Makefile.am 2011-04-05 03:43:02.000000000 -0700 11--- util-linux-2.20.1.orig/sys-utils/Makefile.am
12+++ util-linux-2.19.1/sys-utils/Makefile.am 2011-06-29 12:08:24.187440334 -0700 12+++ util-linux-2.20.1/sys-utils/Makefile.am
13@@ -17,12 +17,6 @@ 13@@ -17,12 +17,6 @@ usrsbin_exec_PROGRAMS += ldattach tunelp
14 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ 14 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
15 ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 15 ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
16 16
17-if HAVE_CPU_SET_T 17-if HAVE_CPU_SET_T
18-usrbin_exec_PROGRAMS += lscpu 18-usrbin_exec_PROGRAMS += lscpu
19-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c 19-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c
20-dist_man_MANS += lscpu.1 20-dist_man_MANS += lscpu.1
21-endif 21-endif
22- 22-
23 endif 23 endif
24 24
25 cytune_SOURCES = cytune.c cyclades.h 25 cytune_SOURCES = cytune.c cyclades.h
26Index: util-linux-2.19.1/sys-utils/Makefile.in
27===================================================================
28--- util-linux-2.19.1.orig/sys-utils/Makefile.in 2011-05-02 02:49:19.000000000 -0700
29+++ util-linux-2.19.1/sys-utils/Makefile.in 2011-06-29 12:10:47.647440371 -0700
30@@ -51,8 +51,6 @@
31 @LINUX_TRUE@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
32 @LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
33
34-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_6 = lscpu
35-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_7 = lscpu.1
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 @@
40 @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT)
41 @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT)
42 @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
43-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_7 = lscpu$(EXEEXT)
44 @BUILD_FALLOCATE_TRUE@am__EXEEXT_8 = fallocate$(EXEEXT)
45 @BUILD_UNSHARE_TRUE@am__EXEEXT_9 = unshare$(EXEEXT)
46 @LINUX_TRUE@am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
47@@ -146,11 +143,6 @@
48 ldattach_SOURCES = ldattach.c
49 ldattach_OBJECTS = ldattach.$(OBJEXT)
50 ldattach_LDADD = $(LDADD)
51-am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c
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)
55-lscpu_LDADD = $(LDADD)
56 pivot_root_SOURCES = pivot_root.c
57 pivot_root_OBJECTS = pivot_root.$(OBJEXT)
58 pivot_root_LDADD = $(LDADD)
59@@ -206,13 +198,13 @@
60 am__v_GEN_0 = @echo " GEN " $@;
61 SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
62 $(fallocate_SOURCES) flock.c fsfreeze.c $(fstrim_SOURCES) \
63- ipcmk.c ipcrm.c ipcs.c ldattach.c $(lscpu_SOURCES) \
64+ ipcmk.c ipcrm.c ipcs.c ldattach.c \
65 pivot_root.c readprofile.c renice.c $(rtcwake_SOURCES) \
66 setarch.c setsid.c switch_root.c $(tunelp_SOURCES) unshare.c
67 DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
68 $(am__fallocate_SOURCES_DIST) flock.c fsfreeze.c \
69 $(fstrim_SOURCES) ipcmk.c ipcrm.c ipcs.c ldattach.c \
70- $(am__lscpu_SOURCES_DIST) pivot_root.c readprofile.c renice.c \
71+ pivot_root.c readprofile.c renice.c \
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 @@
76 MANS = $(dist_man_MANS) $(man_MANS)
77 am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \
78 setsid.1 readprofile.1 dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
79- ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 lscpu.1 \
80+ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 \
81 fallocate.1 pivot_root.8 switch_root.8 unshare.1 arch.1
82 DATA = $(dist_noinst_DATA)
83 ETAGS = etags
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 @@
93 ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES)
94 @rm -f ldattach$(EXEEXT)
95 $(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS)
96-lscpu$(EXEEXT): $(lscpu_OBJECTS) $(lscpu_DEPENDENCIES)
97- @rm -f lscpu$(EXEEXT)
98- $(AM_V_CCLD)$(LINK) $(lscpu_OBJECTS) $(lscpu_LDADD) $(LIBS)
99 pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES)
100 @rm -f pivot_root$(EXEEXT)
101 $(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
102@@ -743,7 +731,6 @@
103 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@
104 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
105 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@
106-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@
107 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.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@