Patchwork [04/15] qt4-sdk: Move script to seperate recipe

login
register
mail settings
Submitter Svend Aage Vedstesen
Date July 9, 2014, 8:08 a.m.
Message ID <51d4684a29aa8751459c9ab739a4dda9b5d85fbd.1404891982.git.Svend.Vedstesen@prevas.dk>
Download mbox | patch
Permalink /patch/368126/
State Accepted
Delegated to: Christian Sørensen
Headers show

Comments

Svend Aage Vedstesen - July 9, 2014, 8:08 a.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

---
 recipes/sdk/qt4-sdk-script.oe                    | 17 +++++++++++++++++
 recipes/sdk/{qt4-sdk => qt4-sdk-script}/setup.sh |  0
 recipes/sdk/qt4-sdk.oe                           |  8 +-------
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 recipes/sdk/qt4-sdk-script.oe
 rename recipes/sdk/{qt4-sdk => qt4-sdk-script}/setup.sh (100%)

Patch

diff --git a/recipes/sdk/qt4-sdk-script.oe b/recipes/sdk/qt4-sdk-script.oe
new file mode 100644
index 0000000..18f2edc
--- /dev/null
+++ b/recipes/sdk/qt4-sdk-script.oe
@@ -0,0 +1,17 @@ 
+DESCRIPTION = "Setup script needed for the QT4 sdk"
+
+RECIPE_TYPES = "canadian-cross"
+
+SRC_URI += "file://setup.sh"
+
+do_rstage[postfuncs] += "do_rstage_setupsdk"
+do_rstage_setupsdk () {
+	cp ${SRCDIR}/setup.sh ${D}
+}
+
+QT4_TOOLS="host:qmake host:glib host:qmake host:pkg-config"
+QT4_TOOLS:HOST_OS_mingw32 = ""
+
+PACKAGES = "${PN}"
+RDEPENDS_${PN} += "${QT4_TOOLS}"
+FILES_${PN} = "/setup.sh"
diff --git a/recipes/sdk/qt4-sdk/setup.sh b/recipes/sdk/qt4-sdk-script/setup.sh
similarity index 100%
rename from recipes/sdk/qt4-sdk/setup.sh
rename to recipes/sdk/qt4-sdk-script/setup.sh
diff --git a/recipes/sdk/qt4-sdk.oe b/recipes/sdk/qt4-sdk.oe
index 6de755d..d148e8f 100644
--- a/recipes/sdk/qt4-sdk.oe
+++ b/recipes/sdk/qt4-sdk.oe
@@ -1,14 +1,7 @@ 
 inherit sdk-image image-qa
 
-SRC_URI += "file://setup.sh"
-
 IMAGE_BASENAME = "oe-lite-qt-sdk-${HOST_ARCH}-${TARGET_ARCH}"
 
-do_rstage[postfuncs] += "do_rstage_setupsdk"
-do_rstage_setupsdk () {
-	cp ${SRCDIR}/setup.sh ${RSTAGE_DIR}
-}
-
 #gstreamer
 RDEPENDS += """
 target:gstreamer
@@ -21,6 +14,7 @@  target:gst-plugins-base
 
 #QT
 RDEPENDS += """
+ qt4-sdk-script
  target:qt
  target:qt-dev
  target:freetype