All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun
@ 2014-02-14 21:02 Otavio Salvador
  2014-02-14 21:02 ` [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents Otavio Salvador
  2014-02-17 17:38 ` [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Denys Dmytriyenko
  0 siblings, 2 replies; 11+ messages in thread
From: Otavio Salvador @ 2014-02-14 21:02 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Otavio Salvador

In case changes are done in do_install and the sstate checksums
change, the task would fail as the qmake binary has already been
replaced. Avoid this error checking for the original filename.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/qt5/nativesdk-qtbase.inc |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index c4ef6e8..36bc334 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -178,8 +178,10 @@ do_install() {
     find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
 
     # switch back the proper qmake
-    rm ${B}/bin/qmake
-    mv ${B}/bin/qmake-real ${B}/bin/qmake
+    if [ -e ${B}/bin/qmake-real ]; then
+        rm ${B}/bin/qmake
+        mv ${B}/bin/qmake-real ${B}/bin/qmake
+    fi
 
     oe_runmake install INSTALL_ROOT=${D}
 
-- 
1.7.10.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun
@ 2014-02-17 19:37 Otavio Salvador
  2014-02-17 19:39 ` Otavio Salvador
  0 siblings, 1 reply; 11+ messages in thread
From: Otavio Salvador @ 2014-02-17 19:37 UTC (permalink / raw)
  To: meta-freescale; +Cc: Otavio Salvador

In case changes are done in do_install and the sstate checksums
change, the task would fail as the qmake binary has already been
replaced. Avoid this error checking for the original filename.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/qt5/nativesdk-qtbase.inc |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index c4ef6e8..36bc334 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -178,8 +178,10 @@ do_install() {
     find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
 
     # switch back the proper qmake
-    rm ${B}/bin/qmake
-    mv ${B}/bin/qmake-real ${B}/bin/qmake
+    if [ -e ${B}/bin/qmake-real ]; then
+        rm ${B}/bin/qmake
+        mv ${B}/bin/qmake-real ${B}/bin/qmake
+    fi
 
     oe_runmake install INSTALL_ROOT=${D}
 
-- 
1.7.10.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-02-21 21:56 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-14 21:02 [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Otavio Salvador
2014-02-14 21:02 ` [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents Otavio Salvador
2014-02-17 17:36   ` Denys Dmytriyenko
2014-02-17 17:45     ` Otavio Salvador
2014-02-21 21:31       ` Jacob Kroon
2014-02-21 21:46         ` Otavio Salvador
2014-02-21 21:56           ` Jacob Kroon
2014-02-17 17:38 ` [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Denys Dmytriyenko
2014-02-17 17:46   ` Otavio Salvador
2014-02-17 19:37 Otavio Salvador
2014-02-17 19:39 ` Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.