Skip to contentSkip to conversation

package/rpi-userland: don't isntall file in random location

PATCH New Yann E. MORIN 4 participants 5 messages Mar 7, 2017 – Mar 13, 2017

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 package/rpi-userland: don't isntall file in random location

Currently, rpi-userland installs files in $(@D)/../../bin/ which is entirely stupid, especially in cross-compilation.

Get rid of the dubious, broken, custom install command.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 ...toverlay-don-t-install-script-in-random-l.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch
package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch new file +45 -0
new file mode 100644
index 0000000..2900eb7
@@ -0,0 +1,45 @@
+From a5a4e361c8116ca9228a896f672102c02be56bb7 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <[email protected]>
+Date: Tue, 7 Mar 2017 22:01:39 +0100
+Subject: [PATCH] host-apps/dtoverlay: don't install script in random location
+
+Currently, we add a custom command that installs the dtoverlay pre/post
+scripts in ${CMAKE_BINARY_DIR}/../../bin
+
+However:
+
+  - this points outside of the package directory.; it even points two
+    directories higher;
+
+  - when doing cross-compilation, this is definitely not the place where
+    the /bin directory really is;
+
+  - the scripts are already properly installed without this code.
+
+Remove that code, it serves no purpose and breaks for cross-compilation.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+---
+ host_applications/linux/apps/dtoverlay/CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/host_applications/linux/apps/dtoverlay/CMakeLists.txt b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+index 9009200..dd48d83 100755
+--- a/host_applications/linux/apps/dtoverlay/CMakeLists.txt
++++ b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+@@ -22,12 +22,4 @@ add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
+ 
+ set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
+-foreach(_script ${DTOVERLAY_SCRIPTS})
+-   add_custom_command(
+-     TARGET dtoverlay
+-     COMMAND ${CMAKE_COMMAND}
+-     -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
+-     ${CMAKE_BINARY_DIR}/../../bin/${_script}
+-   )
+-endforeach()
+ install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
+-- 
+2.7.4
+
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/rpi-userland: don't isntall file in random location

Hello Yann,

Quoted 52 lines · Yann E. MORIN

Currently, rpi-userland installs files in $(@D)/../../bin/ which is entirely stupid, especially in cross-compilation.

Get rid of the dubious, broken, custom install command.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 ...toverlay-don-t-install-script-in-random-l.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch
package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch new file +35 -0
new file mode 100644
index 0000000..2900eb7
@@ -0,0 +1,45 @@
+From a5a4e361c8116ca9228a896f672102c02be56bb7 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <[email protected]>
+Date: Tue, 7 Mar 2017 22:01:39 +0100
+Subject: [PATCH] host-apps/dtoverlay: don't install script in random location
+
+Currently, we add a custom command that installs the dtoverlay pre/post
+scripts in ${CMAKE_BINARY_DIR}/../../bin
+
+However:
+
+  - this points outside of the package directory.; it even points two
+    directories higher;
+
+  - when doing cross-compilation, this is definitely not the place where
+    the /bin directory really is;
+
+  - the scripts are already properly installed without this code.
+
+Remove that code, it serves no purpose and breaks for cross-compilation.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+---
+ host_applications/linux/apps/dtoverlay/CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/host_applications/linux/apps/dtoverlay/CMakeLists.txt b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+index 9009200..dd48d83 100755
+--- a/host_applications/linux/apps/dtoverlay/CMakeLists.txt
++++ b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+@@ -22,12 +22,4 @@ add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
+ 
+ set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
+-foreach(_script ${DTOVERLAY_SCRIPTS})
+-   add_custom_command(

package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch line 45

Quoted 10 lines
package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch new file +10 -0
+-     TARGET dtoverlay
+-     COMMAND ${CMAKE_COMMAND}
+-     -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
+-     ${CMAKE_BINARY_DIR}/../../bin/${_script}
+-   )
+-endforeach()
+ install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
+-- 
+2.7.4
+

No more spurious bin directory created...

Tested-by Peter Seiderer <[email protected]>

Regards,
Peter

Applied
#2 lore raw

PATCH 1/1 package/rpi-userland: don't isntall file in random location

In reply to Yann E. MORIN

Hello,

Quoted 10 lines · Yann E. MORIN

Currently, rpi-userland installs files in $(@D)/../../bin/ which is entirely stupid, especially in cross-compilation.

Get rid of the dubious, broken, custom install command.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 ...toverlay-don-t-install-script-in-random-l.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch

Applied to master after fixing the typo in the commit title. Please don't forget to submit upstream.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 1/1 package/rpi-userland: don't isntall file in random location

Thomas, All,

On 2017-03-10 22:46 +0100, Thomas Petazzoni spake thusly:

Quoted 6 lines · Yann E. MORIN
Quoted 5 lines

Currently, rpi-userland installs files in $(@D)/../../bin/ which is entirely stupid, especially in cross-compilation.

Get rid of the dubious, broken, custom install command.

Quoted 8 lines
Quoted 5 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 ...toverlay-don-t-install-script-in-random-l.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch

Applied to master after fixing the typo in the commit title. Please don't forget to submit upstream.

Already done 3 days ago:
https://github.com/raspberrypi/userland/pull/380

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/1 package/rpi-userland: don't isntall file in random location

In reply to Yann E. MORIN
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Currently, rpi-userland installs files in $(@D)/../../bin/ which is entirely stupid, especially in cross-compilation.

Get rid of the dubious, broken, custom install command.

Signed-off-by "Yann E. MORIN" <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard