Patchwork [03/15] qt5-sdk: Move setup script to seperate recipe

login
register
mail settings
Submitter Svend Aage Vedstesen
Date July 9, 2014, 8:08 a.m.
Message ID <0f3fe42dce649e8b95601193c3f48a746ce6fc1f.1404891982.git.Svend.Vedstesen@prevas.dk>
Download mbox | patch
Permalink /patch/368125/
State New
Headers show

Comments

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

---
 recipes/sdk/qt5-sdk-script.oe                    | 16 +++++++++++++++
 recipes/sdk/{qt5-sdk => qt5-sdk-script}/setup.sh |  0
 recipes/sdk/qt5-sdk.oe                           | 25 +-----------------------
 3 files changed, 17 insertions(+), 24 deletions(-)
 create mode 100644 recipes/sdk/qt5-sdk-script.oe
 rename recipes/sdk/{qt5-sdk => qt5-sdk-script}/setup.sh (100%)

Patch

diff --git a/recipes/sdk/qt5-sdk-script.oe b/recipes/sdk/qt5-sdk-script.oe
new file mode 100644
index 0000000..8a8647f
--- /dev/null
+++ b/recipes/sdk/qt5-sdk-script.oe
@@ -0,0 +1,16 @@ 
+DESCRIPTION = "Setup script needed for the QT5 sdk"
+
+RECIPE_TYPES = "canadian-cross"
+
+SRC_URI += "file://setup.sh"
+
+do_install () {
+	cp ${SRCDIR}/setup.sh ${D}
+}
+
+QT5_TOOLS="host:qmake5-utilities"
+QT5_TOOLS:HOST_OS_mingw32 = ""
+
+PACKAGES = "${PN}"
+RDEPENDS_${PN} += "${QT5_TOOLS}"
+FILES_${PN} = "/setup.sh"
diff --git a/recipes/sdk/qt5-sdk/setup.sh b/recipes/sdk/qt5-sdk-script/setup.sh
similarity index 100%
rename from recipes/sdk/qt5-sdk/setup.sh
rename to recipes/sdk/qt5-sdk-script/setup.sh
diff --git a/recipes/sdk/qt5-sdk.oe b/recipes/sdk/qt5-sdk.oe
index 1a78795..8473c6a 100644
--- a/recipes/sdk/qt5-sdk.oe
+++ b/recipes/sdk/qt5-sdk.oe
@@ -1,32 +1,9 @@ 
 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
-"""
-
-#Gstreamer plugins
-RDEPENDS += """
-target:gst-plugins-base
-"""
-
 #QT
 RDEPENDS += """
- target:qtbase
+ qt5-sdk-script
  target:qtbase-dev
 """
-
-#Misc
-RDEPENDS += "target:libxml2-dev ${QT5_TOOLS}"
-
-QT5_TOOLS="host:qmake5-utilities"
-QT5_TOOLS:HOST_OS_mingw32 = ""