Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/18 01:44:17-05:00 handhelds.org!kergoth
qte: Correct a bug in a sed script in the do_configure, and disable PARALLEL_MAKE.

2005/01/18 01:09:16-05:00 handhelds.org!kergoth
Properly mangle the messages for the BuildCompleted event.

2005/01/18 00:47:58-05:00 handhelds.org!kergoth
Fix the new base_do_patch application dir problem, again, hopefully for the last time.

BKrev: 41ecb042ECy_RNQJN4-AJGD_c8kZcQ

diff --git a/classes/base.bbclass b/classes/base.bbclass
index f4ee9d9..f09968e 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -454,12 +454,10 @@ python base_do_patch() {
                else:
                        pname = unpacked
 
-               patchdir = bb.data.getVar('S', d, 1)
-               os.chdir(patchdir)
-
                bb.note("Applying patch '%s'" % pname)
                bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
                bb.data.setVarFlag("do_patchcmd", "func", 1, d)
+               bb.data.setVarFlag("do_patchcmd", "dirs", "${WORKDIR} ${S}", d)
                bb.build.exec_func("do_patchcmd", d)
 }
 
@@ -471,6 +469,7 @@ python base_eventhandler() {
        import os
 
        messages = {}
+       messages["Completed"] = "completed"
        messages["Succeeded"] = "completed"
        messages["Started"] = "started"
        messages["Failed"] = "failed"

diff --git a/packages/qte/qte_2.3.7.bb b/packages/qte/qte_2.3.7.bb
index 0e86a1c..38439b8 100644 (file)
--- a/packages/qte/qte_2.3.7.bb
+++ b/packages/qte/qte_2.3.7.bb
@@ -48,11 +48,12 @@ QTE_ARCH := "${@qte_arch(d)}"
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
 EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
                -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 16,32"
-EXTRA_OEMAKE = "-e"
 EXTRA_OECONF_beagle = "-system-jpeg -system-libpng -system-zlib -no-qvfb \
                       -no-xft -no-vnc -gif \
                        -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ \
                       ${EXTRA_OECONF_CONFIG} -depths 8,16,32 "
+EXTRA_OEMAKE = "-e"
+PARALLEL_MAKE = ""
 
 #
 # FIXME: Add more here
@@ -83,7 +84,7 @@ export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 do_configure() {
        for f in ${S}/configs/linux-*-g++-shared; do
                sed -e 's,-linux-,-linux-uclibc-,g' < $f \
-                       > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
+                       > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
        done
        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }

diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index f40de2b..cdc0044 100644 (file)
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -52,6 +52,7 @@ EXTRA_OECONF_CONFIG = "-qconfig qpe"
 EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
                -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
 EXTRA_OEMAKE = "-e"
+PARALLEL_MAKE = ""
 
 #
 # FIXME: Add more here
@@ -84,7 +85,7 @@ export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 do_configure() {
        for f in ${S}/configs/linux-*-g++-shared; do
                sed -e 's,-linux-,-linux-uclibc-,g' < $f \
-                       > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
+                       > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'`
        done
        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }

diff --git a/packages/qte/qte_4.0.0-b1.bb b/packages/qte/qte_4.0.0-b1.bb
index 72922bc..6c1936a 100644 (file)
--- a/packages/qte/qte_4.0.0-b1.bb
+++ b/packages/qte/qte_4.0.0-b1.bb
@@ -63,6 +63,7 @@ EXTRA_OECONF = "-embedded ${QTE_ARCH} \
                "
 
 EXTRA_OEMAKE = "-e"
+PARALLEL_MAKE = ""
 
 export EXTRA_CFLAGS = "-I${STAGING_INCDIR}"
 export EXTRA_CXXFLAGS = "-I${STAGING_INCDIR}"