[oe-commits] org.oe.dev qmake2 sdk: fix packaging

[koen commit]

qmake2 sdk: fix packaging

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 614ea89d1f0c0b66596dc2487d7ff3da789c8793
ViewMTN: http://monotone.openembedded.org/revision/info/614ea89d1f0c0b66596dc2487d7ff3da789c8793
Files:
1
packages/qmake/qmake2-native.inc
packages/qmake/qmake2-native_2.10a.bb
packages/qmake/qmake2-sdk_2.10a.bb
Diffs:

#
# mt diff -r1631ad4d30afa15be3c49fbb53c9fcb87c5c1c8e -r614ea89d1f0c0b66596dc2487d7ff3da789c8793
#
#
#
# patch "packages/qmake/qmake2-native.inc"
#  from [9a65ca126be59f3596e029277143094715b059be]
#    to [f5000ca45c6fa48ac244de67f96888ef38d5d7b1]
# 
# patch "packages/qmake/qmake2-native_2.10a.bb"
#  from [ce5fc62363b0cdf63720e3988d06934643bb780f]
#    to [c50778fcd7cdf33c89fe6a0ea1bd651b90adb62a]
# 
# patch "packages/qmake/qmake2-sdk_2.10a.bb"
#  from [d0be162e9dd2009913ff0eb8a085e605c897c6a1]
#    to [931674d68171befe4ba574c8c1333e334ac6efab]
#
============================================================
--- packages/qmake/qmake2-native.inc	9a65ca126be59f3596e029277143094715b059be
+++ packages/qmake/qmake2-native.inc	f5000ca45c6fa48ac244de67f96888ef38d5d7b1
@@ -17,7 +17,7 @@ CROSS_SYS := "${TARGET_SYS}"
 
 # we need the real target system here
 CROSS_SYS := "${TARGET_SYS}"
-inherit autotools cross 
+inherit autotools  
 
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
@@ -62,6 +62,3 @@ do_stage() {
     cp -PfR mkspecs ${CROSS_DATADIR}/qt4/
 }
 
-do_install() {
-    :
-}
============================================================
--- packages/qmake/qmake2-native_2.10a.bb	ce5fc62363b0cdf63720e3988d06934643bb780f
+++ packages/qmake/qmake2-native_2.10a.bb	c50778fcd7cdf33c89fe6a0ea1bd651b90adb62a
@@ -1,3 +1,11 @@ require ${PN}.inc
 QTVERSION="4.3.3"
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
 require ${PN}.inc
+
+inherit cross
+
+do_install() {
+    :
+}
+
+
============================================================
--- packages/qmake/qmake2-sdk_2.10a.bb	d0be162e9dd2009913ff0eb8a085e605c897c6a1
+++ packages/qmake/qmake2-sdk_2.10a.bb	931674d68171befe4ba574c8c1333e334ac6efab
@@ -2,3 +2,16 @@ inherit sdk
 require qmake2-native.inc
 
 inherit sdk
+
+do_install () {
+	install -d ${D}/${bindir}
+    install -m 0755 bin/qmake ${D}/${bindir}/qmake2
+    install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4
+    install -d ${D}/${datadir}/qt4
+    cp -PfR mkspecs ${D}/${datadir}/qt4/
+}
+
+
+
+
+