1From 1fe7b756365254f7175558e7a89c1d89f95c5e2e Mon Sep 17 00:00:00 2001
2From: Maxime Hadjinlian <maxime.hadjinlian@devialet.com>
3Date: Tue, 30 Sep 2014 13:46:59 +0200
4Subject: [PATCH] Remove OWNER and GROUPS parameters to install
5
6The Install tries to change the owner and groups of the binary. In
7Buildroot we don't want that, since fakeroot will do its job when we
8finalize the rootfs.
9
10Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@devialet.com>
11[aduskett@gmail.com: Updated for 32408520fcebe785983a68e39ec83830a3005779]
12Signed-off-by: Adam Duskett <Aduskett@gmail.com>
13---
14 docbook/Makefile | 4 ++--
15 ether/Makefile   | 8 ++++----
16 key/Makefile     | 8 ++++----
17 mdio/Makefile    | 8 ++++----
18 mme/Makefile     | 8 ++++----
19 nvm/Makefile     | 8 ++++----
20 pib/Makefile     | 8 ++++----
21 plc/Makefile     | 8 ++++----
22 ram/Makefile     | 8 ++++----
23 serial/Makefile  | 8 ++++----
24 slac/Makefile    | 8 ++++----
25 tools/Makefile   | 2 +-
26 12 files changed, 43 insertions(+), 43 deletions(-)
27
28diff --git a/docbook/Makefile b/docbook/Makefile
29index d630822..039d62a 100755
30--- a/docbook/Makefile
31+++ b/docbook/Makefile
32@@ -32,9 +32,9 @@ manuals:
33 	${SHELL} ../docbook/manuals
34 scripts:
35 library:
36-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${LIBRARY}
37+	install -m ${DIR_PERM} -d ${LIBRARY}
38 install: library
39-	if [ -d ${LIBRARY} ]; then install -m ${WWW_PERM} -o ${OWNER} -g ${GROUP} *.html *.css *.png ${LIBRARY}; fi
40+	if [ -d ${LIBRARY} ]; then install -m ${WWW_PERM} *.html *.css *.png ${LIBRARY}; fi
41 uninstall:
42 	rm -f ${LIBRARY}/*.c.html ${LIBRARY}/*.h.html ${LIBRARY}/*.1.html
43 setup:
44diff --git a/ether/Makefile b/ether/Makefile
45index 89174cb..8256d50 100755
46--- a/ether/Makefile
47+++ b/ether/Makefile
48@@ -27,13 +27,13 @@ compact: compile
49 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
50 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
51 library:
52-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
53+	install -m ${DIR_PERM} -d ${BIN}
54 scripts:
55 manuals:
56-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
57-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
58+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
59+	install -m ${MAN_PERM} ${PAGES} ${MAN}
60 install: $(TOOLS) library
61-	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
62+	install -m ${SUID_PERM} ${TOOLS} ${BIN}
63 uninstall:
64 	cd ${BIN}; rm -f ${TOOLS}
65 	cd ${MAN}; rm -f ${PAGES}
66diff --git a/key/Makefile b/key/Makefile
67index de62a49..78fa200 100755
68--- a/key/Makefile
69+++ b/key/Makefile
70@@ -28,13 +28,13 @@ compact: compile
71 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
72 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
73 library:
74-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
75+	install -m ${DIR_PERM} -d ${BIN}
76 scripts:
77 manuals:
78-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
79-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
80+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
81+	install -m ${MAN_PERM} ${PAGES} ${MAN}
82 install: $(TOOLS)
83-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
84+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
85 uninstall:
86 	cd ${BIN}; rm -f ${TOOLS}
87 	cd ${MAN}; rm -f ${PAGES}
88diff --git a/mdio/Makefile b/mdio/Makefile
89index 049b08e..3ff4c26 100755
90--- a/mdio/Makefile
91+++ b/mdio/Makefile
92@@ -27,13 +27,13 @@ compact: compile
93 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
94 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
95 library:
96-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
97+	install -m ${DIR_PERM} -d ${BIN}
98 scripts:
99 manuals:
100-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
101-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
102+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
103+	install -m ${MAN_PERM} ${PAGES} ${MAN}
104 install: $(TOOLS) library
105-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
106+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
107 uninstall:
108 	cd ${BIN}; rm -f int6k ${TOOLS}
109 	cd ${MAN}; rm -f int6k ${PAGES}
110diff --git a/mme/Makefile b/mme/Makefile
111index 0313aea..77a6b96 100755
112--- a/mme/Makefile
113+++ b/mme/Makefile
114@@ -27,13 +27,13 @@ compact: compile
115 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
116 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
117 library:
118-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
119+	install -m ${DIR_PERM} -d ${BIN}
120 scripts:
121 manuals:
122-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
123-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
124+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
125+	install -m ${MAN_PERM} ${PAGES} ${MAN}
126 install: $(TOOLS) library
127-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
128+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
129 uninstall:
130 	cd ${BIN}; rm -f ${TOOLS}
131 	cd ${MAN}; rm -f ${PAGES}
132diff --git a/nvm/Makefile b/nvm/Makefile
133index 9aa05ec..b468e70 100755
134--- a/nvm/Makefile
135+++ b/nvm/Makefile
136@@ -28,12 +28,12 @@ compact: compile
137 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
138 scripts:
139 manuals:
140-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
141-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
142+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
143+	install -m ${MAN_PERM} ${PAGES} ${MAN}
144 library:
145-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
146+	install -m ${DIR_PERM} -d ${BIN}
147 install: $(TOOLS) library
148-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
149+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
150 uninstall:
151 	cd ${BIN}; rm -f ${TOOLS}
152 	cd ${MAN}; rm -f ${PAGES}
153diff --git a/pib/Makefile b/pib/Makefile
154index 93f0c3b..23195b4 100644
155--- a/pib/Makefile
156+++ b/pib/Makefile
157@@ -30,12 +30,12 @@ compact: compile
158 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
159 scripts:
160 manuals:
161-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
162-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
163+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
164+	install -m ${MAN_PERM} ${PAGES} ${MAN}
165 library:
166-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
167+	install -m ${DIR_PERM} -d ${BIN}
168 install: $(TOOLS) library
169-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
170+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
171 uninstall:
172 	cd ${BIN}; rm -f ${TOOLS}
173 	cd ${MAN}; rm -f ${PAGES}
174diff --git a/plc/Makefile b/plc/Makefile
175index 43d6bd5..9fd4e0a 100644
176--- a/plc/Makefile
177+++ b/plc/Makefile
178@@ -32,13 +32,13 @@ compact: compile
179 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
180 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
181 library:
182-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
183+	install -m ${DIR_PERM} -d ${BIN}
184 scripts:
185 manuals:
186-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
187-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
188+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
189+	install -m ${MAN_PERM} ${PAGES} ${MAN}
190 install: $(TOOLS) library
191-	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
192+	install -m ${SUID_PERM} ${TOOLS} ${BIN}
193 uninstall:
194 	cd ${BIN}; rm -f ${TOOLS}
195 	cd ${MAN}; rm -f ${PAGES}
196diff --git a/ram/Makefile b/ram/Makefile
197index 60b9bb3..c34ddd0 100755
198--- a/ram/Makefile
199+++ b/ram/Makefile
200@@ -27,13 +27,13 @@ compact: compile
201 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
202 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
203 library:
204-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
205+	install -m ${DIR_PERM} -d ${BIN}
206 scripts:
207 manuals:
208-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
209-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
210+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
211+	install -m ${MAN_PERM} ${PAGES} ${MAN}
212 install: $(TOOLS) library
213-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
214+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
215 uninstall:
216 	cd ${BIN}; rm -f ${TOOLS}
217 	cd ${MAN}; rm -f ${PAGES}
218diff --git a/serial/Makefile b/serial/Makefile
219index c25f1a6..aebbac9 100755
220--- a/serial/Makefile
221+++ b/serial/Makefile
222@@ -27,13 +27,13 @@ compact: compile
223 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
224 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
225 library:
226-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
227+	install -m ${DIR_PERM} -d ${BIN}
228 scripts:
229 manuals:
230-	test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}
231-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
232+	test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN}
233+	install -m ${MAN_PERM} ${PAGES} ${MAN}
234 install: $(TOOLS) library
235-	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
236+	install -m ${BIN_PERM} ${TOOLS} ${BIN}
237 uninstall:
238 	cd ${BIN}; rm -f int6k ${TOOLS}
239 	cd ${MAN}; rm -f int6k ${PAGES}
240diff --git a/slac/Makefile b/slac/Makefile
241index bd12db9..1f0b65d 100755
242--- a/slac/Makefile
243+++ b/slac/Makefile
244@@ -27,13 +27,13 @@ compact: compile
245 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
246 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
247 library:
248-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
249+	install -m ${DIR_PERM} -d ${BIN}
250 scripts:
251 manuals:
252-	if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}; fi
253-	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
254+	if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -d ${MAN}; fi
255+	install -m ${MAN_PERM} ${PAGES} ${MAN}
256 install: compile library
257-	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
258+	install -m ${SUID_PERM} ${TOOLS} ${BIN}
259 uninstall:
260 	cd ${BIN}; rm -f ${TOOLS}
261 	cd ${MAN}; rm -f ${PAGES}
262diff --git a/tools/Makefile b/tools/Makefile
263index 1d992cf..a74fd24 100755
264--- a/tools/Makefile
265+++ b/tools/Makefile
266@@ -27,7 +27,7 @@ compact: compile
267 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
268 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
269 library:
270-	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
271+	install -m ${DIR_PERM} -d ${BIN}
272 scripts:
273 manuals:
274 #	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
275--
2762.26.2
277
278