[oe-commits] org.oe.dev merge of '5dde2d982b4415230cf4fcc1095f4a732837813a'

[koen commit]

merge of '5dde2d982b4415230cf4fcc1095f4a732837813a'
     and 'e546707be8f44437449d19908d966d7a62798618'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2703f9c8f8f9c0cb83c396aa9f5cb7c8b818b573
ViewMTN: http://monotone.openembedded.org/revision/info/2703f9c8f8f9c0cb83c396aa9f5cb7c8b818b573
Files:
1
conf/machine/beagleboard.conf
packages/uicmoc/uicmoc4-native.inc
packages/uicmoc/uicmoc4-native_4.4.0.bb
Diffs:

#
# mt diff -r5dde2d982b4415230cf4fcc1095f4a732837813a -r2703f9c8f8f9c0cb83c396aa9f5cb7c8b818b573
#
#
#
# patch "conf/machine/beagleboard.conf"
#  from [4d63e2381f81386e82dd68c70bb759af28ed230a]
#    to [d9ead88ad9a6d2f71fd898e1f6d3e15ccdda9ade]
#
============================================================
--- conf/machine/beagleboard.conf	4d63e2381f81386e82dd68c70bb759af28ed230a
+++ conf/machine/beagleboard.conf	d9ead88ad9a6d2f71fd898e1f6d3e15ccdda9ade
@@ -32,6 +32,8 @@ UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+PREFERRED_VERSION_u-boot = "git"
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
 # and sdio
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"


#
# mt diff -re546707be8f44437449d19908d966d7a62798618 -r2703f9c8f8f9c0cb83c396aa9f5cb7c8b818b573
#
#
#
# patch "packages/uicmoc/uicmoc4-native.inc"
#  from [043e25c5533489d6bcfe95d8ae39f63961957071]
#    to [53db81cdd6b3ced8145fb586be6e547a7c4e2cf1]
# 
# patch "packages/uicmoc/uicmoc4-native_4.4.0.bb"
#  from [3279313c21ce4a2e7869d37eb6ad6781132a9f42]
#    to [8de9348a7d46bc1d8677391748b092f9aeacada1]
#
============================================================
--- packages/uicmoc/uicmoc4-native.inc	043e25c5533489d6bcfe95d8ae39f63961957071
+++ packages/uicmoc/uicmoc4-native.inc	53db81cdd6b3ced8145fb586be6e547a7c4e2cf1
@@ -56,6 +56,7 @@ do_stage() {
 }
 
 do_stage() {
+	install -d ${STAGING_BINDIR}/
     install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
     install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
     install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
============================================================
--- packages/uicmoc/uicmoc4-native_4.4.0.bb	3279313c21ce4a2e7869d37eb6ad6781132a9f42
+++ packages/uicmoc/uicmoc4-native_4.4.0.bb	8de9348a7d46bc1d8677391748b092f9aeacada1
@@ -7,4 +7,15 @@ inherit native
 S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
 inherit native
 
+do_stage() {
+    install -d ${STAGING_BINDIR}/
+    install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+    install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+    install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+    install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+    install -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4
+    install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4
+    install -d ${STAGING_DIR_NATIVE}/qt4/
+    install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
+}