[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-46-g8a68afd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-46-g8a68afd
|
From: jscheer <js...@us...> - 2010-10-07 09:55:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8a68afd34b69368ef3e756987d29ef3c71fe532c (commit)
from 11622d91f37fc77acc47ede98840a37cbf5d5f5b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8a68afd34b69368ef3e756987d29ef3c71fe532c
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Oct 7 11:55:07 2010 +0200
[BUILDROOT] Bug corrected in patch 132-qt-full_integration_with_cross_compiling.patch : Qt demos and examples not erased if they already exist in rootfs
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 20 ++++++++++++--------
...-qt-full_integration_with_cross_compiling.patch | 16 ++++++++++------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 2777acd..51b9162 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qtopia4/Config.in
===================================================================
---- buildroot.orig/package/qtopia4/Config.in 2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in 2010-10-06 15:12:26.000000000 +0200
+--- buildroot.orig/package/qtopia4/Config.in 2010-10-06 16:58:24.000000000 +0200
++++ buildroot/package/qtopia4/Config.in 2010-10-06 16:58:24.000000000 +0200
@@ -325,4 +325,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qtopia4/Config.in
endif # BR2_PACKAGE_QT
Index: buildroot/package/qtopia4/qtopia4.mk
===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk 2010-10-06 16:49:51.000000000 +0200
+--- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-06 16:58:24.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk 2010-10-07 11:37:07.000000000 +0200
@@ -345,6 +345,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -55,20 +55,24 @@ Index: buildroot/package/qtopia4/qtopia4.mk
)
touch $@
-@@ -560,8 +568,15 @@
+@@ -560,8 +568,19 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
-+demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro:
++ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos
+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/
++endif
+
-+examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro:
++ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples
+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/
++endif
-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro
# Strip all installed libs
ifeq ($(BR2_PACKAGE_QT_SHARED),y)
cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index 816bb96..a0641c5 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
--- buildroot.orig/package/qt/Config.in 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in 2010-10-06 15:38:23.000000000 +0200
++++ buildroot/package/qt/Config.in 2010-10-06 16:56:09.000000000 +0200
@@ -372,4 +372,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qt/Config.in
Index: buildroot/package/qt/qt.mk
===================================================================
--- buildroot.orig/package/qt/qt.mk 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk 2010-10-06 16:53:11.000000000 +0200
++++ buildroot/package/qt/qt.mk 2010-10-07 11:44:13.000000000 +0200
@@ -362,6 +362,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -55,20 +55,24 @@ Index: buildroot/package/qt/qt.mk
)
touch $@
-@@ -589,8 +597,15 @@
+@@ -589,8 +597,19 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
-+demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro:
++ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos
+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/
++endif
+
-+examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro:
++ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples
+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/
++endif
-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro
# Strip all installed libs
ifeq ($(BR2_PACKAGE_QT_SHARED),y)
cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
hooks/post-receive
--
armadeus
|
