0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch 10.0 KB

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