Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH V3, 1/1] Fix: qt5webkit overwrites target python.
@ 2016-10-19 14:35 johanderycke at gmail.com
  2016-10-19 15:54 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: johanderycke at gmail.com @ 2016-10-19 14:35 UTC (permalink / raw)
  To: buildroot

From: Johan Derycke <johan.derycke@barco.com>

Fixes issue with https://git.buildroot.net/buildroot/commit/?id=ac16793eaaabfced0312420759e3a66cdaa1ea8e.
We made a link in $(@D)/bin/python which is copied to $(TARGET_DIR) during install and overwrites target pyton.
Fixed by using $(@D)/host-bin instead.

Signed-off-by: Johan Derycke <johan.derycke@barco.com>
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
---
Changes v2 -> v3
- Added Tested-by
- More detailed commit log

Changes v1 -> v2:
- simpler fix suggested by Thomas

 package/qt5/qt5webkit/qt5webkit.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index f300c11..378cdf7 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -36,10 +36,10 @@ endif
 # QtWebkit's build system uses python, but only supports python2. We work
 # around this by forcing python2 early in the PATH, via a python->python2
 # symlink.
-QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH)
+QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
 define QT5WEBKIT_PYTHON2_SYMLINK
-	mkdir -p $(@D)/bin
-	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
+	mkdir -p $(@D)/host-bin
+	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
 endef
 QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
 
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH V3, 1/1] Fix: qt5webkit overwrites target python.
  2016-10-19 14:35 [Buildroot] [PATCH V3, 1/1] Fix: qt5webkit overwrites target python johanderycke at gmail.com
@ 2016-10-19 15:54 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2016-10-19 15:54 UTC (permalink / raw)
  To: buildroot

Hello,

The commit title should always have the format:

	<package>: <what you're doing>

On Wed, 19 Oct 2016 16:35:24 +0200, johanderycke at gmail.com wrote:
> From: Johan Derycke <johan.derycke@barco.com>
> 
> Fixes issue with https://git.buildroot.net/buildroot/commit/?id=ac16793eaaabfced0312420759e3a66cdaa1ea8e.
> We made a link in $(@D)/bin/python which is copied to $(TARGET_DIR) during install and overwrites target pyton.
> Fixed by using $(@D)/host-bin instead.
> 
> Signed-off-by: Johan Derycke <johan.derycke@barco.com>
> Tested-by: Yegor Yefremov <yegorslists@googlemail.com>

I've fixed the commit title, reworked the commit log, and applied.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-10-19 15:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-19 14:35 [Buildroot] [PATCH V3, 1/1] Fix: qt5webkit overwrites target python johanderycke at gmail.com
2016-10-19 15:54 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox