merge of '8996304d45d20965f75c306e6317a0238f26fbf7'

     and 'd0954a8a227efc014d29aba8d911adfc59934357'

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index bbc9f18..f7daa9f 100644 (file)
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -18,14 +18,20 @@ def get_src_tree(d):
                bb.error("S not defined, unable to find source tree.")
                return
 
-       s_tree_raw = s.split('/')[1]
+       try:
+               s_tree_raw = s.split('/')[1]
+       except IndexError:
+               return
+
        s_tree = bb.data.expand(s_tree_raw, d)
 
        src_tree_path = os.path.join(workdir, s_tree)
        try:
                os.listdir(src_tree_path)
        except OSError:
-               bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
+               bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)
+               return
+
        bb.debug("Assuming source tree is '%s'" % src_tree_path)
 
        return s_tree
@@ -39,11 +45,14 @@ sourcepkg_do_create_orig_tgz(){
        done
 
        src_tree=${@get_src_tree(d)}
-       
-       echo $src_tree
+       if test x${src_tree} = x; then
+               oenote "Skipping empty source tree"
+               return
+       fi
+
        oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
        tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
-       cp -pPR $src_tree $src_tree.orig
+       cp -av $src_tree $src_tree.orig
 }
 
 sourcepkg_do_archive_bb() {
@@ -74,7 +83,14 @@ python sourcepkg_do_dumpdata() {
        bb.note("Dumping metadata into '%s'" % dumpfile)
        f = open(dumpfile, "w")
        # emit variables and shell functions
-        bb.data.emit_env(f, d, True)
+
+       # FIXME: if we emit all, bitbake will get error while
+       # evaluating AUTOREV since we have AUTOREV =
+       # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev
+       # without a valid SRC_URI will cause problem.
+
+       bb.data.emit_env(f, d, True)
+
        # emit the metadata which isnt valid shell
        for e in d.keys():
                if bb.data.getVarFlag(e, 'python', d):
@@ -89,8 +105,11 @@ sourcepkg_do_create_diff_gz(){
                echo $i >> temp/exclude-from-file
        done
 
-
        src_tree=${@get_src_tree(d)}
+       if test x${src_tree} = x; then
+               oenote "Skipping empty source tree"
+               return
+       fi
 
        for i in `find . -maxdepth 1 -type f`; do
                mkdir -p $src_tree/${DISTRO}/files
@@ -102,10 +121,10 @@ sourcepkg_do_create_diff_gz(){
        rm -rf $src_tree.orig
 }
 
-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
-addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dump_data before do_configure
-
+addtask archive_bb after do_patch before do_configure
+#addtask dumpdata after do_archive_bb before do_configure
+addtask create_diff_gz after do_archive_bb before do_configure

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 87fea8d..671babe 100644 (file)
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -34,11 +34,12 @@ SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 
 SRCREV_pn-openocd ?= "${AUTOREV}"

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index fb369a8..f8516d2 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -112,6 +112,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3609"
 SRCREV_pn-openmoko-today2-folders ?= "3414"
+SRCREV_pn-openmoko-toolchain-scripts ?= "3683"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 23d73eb..3101ecb 100644 (file)
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -8,7 +8,7 @@ inherit native
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils"
-INSTALL += "ipkg-list-fields arfile.py"
+INSTALL += "arfile.py"
 
 do_stage() {
         for i in ${INSTALL}; do

diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch
deleted file mode 100644 (file)
index 51eccbb..0000000
--- a/packages/ipkg/files/ipkg_bugfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: C/ipkg_conf.c
-===================================================================
---- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000
-+++ C/ipkg_conf.c      2007-11-27 01:11:17.000000000 +0000
-@@ -423,6 +423,7 @@
-      nv_pair_t *nv_pair;
-      pkg_dest_t *dest;
-      char *root_dir;
-+     char *list_dir2;
- 
-      for (iter = nv_pair_list->head; iter; iter = iter->next) {
-         nv_pair = iter->data;
-@@ -432,8 +433,14 @@
-         } else {
-              root_dir = strdup(nv_pair->value);
-         }
--        dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
-+        if (conf->offline_root) {
-+             sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir);
-+        } else {
-+             list_dir2 = strdup(lists_dir);
-+        }
-+        dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2);
-         free(root_dir);
-+        free(list_dir2);
-         if (dest == NULL) {
-              continue;
-         }
-@@ -562,13 +569,13 @@
-         } else if (strcmp(type, "dest") == 0) {
-              nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
-         } else if (strcmp(type, "lists_dir") == 0) {
--             *lists_dir = realloc(*lists_dir,strlen(value)+1);
-+             *lists_dir = realloc(*lists_dir,strlen(name)+1);
-                if (*lists_dir == NULL) {
-                   ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n");
-                   free(options);
-                   return EINVAL;
-                }
--               sprintf (*lists_dir,"%s",value);
-+               sprintf (*lists_dir,"%s", name);
-         } else if (strcmp(type, "arch") == 0) {
-              ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value);
-              if (!value) {

diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index fe46c59..fc702c8 100644 (file)
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -60,12 +60,18 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss"
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"
 
-do_prepatch() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        mv patches patches.openmoko
-        mv .pc .pc.old
-        mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
+python do_patch_prepend() {
+       def runcmd(cmd):
+               import commands
+               (status, output) = commands.getstatusoutput(cmd)
+               if status != 0:
+                       raise Exception, "Status %i: %s" % (status >> 8, output)
+               return output
+       runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && '
+              'quilt push -av && mv patches patches.openmoko && '
+              'mv .pc .pc.old && mv %(WORKDIR)s/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' %
+              {'WORKDIR': bb.data.getVar('WORKDIR', d, 1),
+               'S': bb.data.getVar('S', d, 1),
+               'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)})
+       del runcmd
 }
-
-addtask prepatch after do_unpack before do_patch
-

diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index 47d9a93..69f16b1 100644 (file)
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -15,7 +15,7 @@ PROVIDES = "\
     virtual/linux-libc-headers \
     "
 
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 PR = "r1"
 

diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index 90eff20..6ee3e04 100644 (file)
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -1,4 +1,6 @@
-TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
+PR = "r1"
 
-require meta-toolchain.bb
+TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
+TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
 
+require meta-toolchain.bb

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 91467e5..4a8edb9 100644 (file)
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
 
 inherit sdk meta
 
@@ -59,8 +60,8 @@ do_populate_sdk() {
        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 
        # remove unwanted housekeeping files
-       mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
-       rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg
+       mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+       rm -Rf ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg
        mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
        rm -Rf ${SDK_OUTPUT}/usr/lib
 
@@ -73,10 +74,17 @@ do_populate_sdk() {
                for arch in $revipkgarchs; do
                        pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
                        if [ -e $pkgnames ]; then
-                               echo "Found $pkgnames"
+                               oenote "Found $pkgnames"
                                cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
                                orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
-                               pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+                               pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+                               for aarch in $revipkgarchs; do
+                                       if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
+                                               pkg_subdir="${aarch}${pkg_subdir_postfix}"
+                                               break
+                                       fi
+                               done
+                               oenote "Original package in ${pkg_subdir}"
                                mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
                                cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
                                subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`

diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
index 1526cba..7533f81 100644 (file)
--- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
+++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
@@ -1,15 +1,14 @@
 DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
-PACKAGE_ARCH = "all"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
-SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
 
-SRCREV="3630"
+S = "${WORKDIR}/toolkit"
+
 FILES_${PN} = "/"
 
 do_install () {
-       (find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true
-       install -m 755 -d ${D}/share
-       cp -dr ${WORKDIR}/toolkit/* ${D}
-       cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share
+       cp -dr ${S}/* ${D}
+       find ${D} -name ".svn" | xargs rm -rf
+       rm -r ${D}/patches
 }

diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb
index 4c2c5aa..9118f89 100644 (file)
--- a/packages/openmoko2/openmoko-sample2_svn.bb
+++ b/packages/openmoko2/openmoko-sample2_svn.bb
@@ -9,7 +9,7 @@ inherit openmoko2
 PACKAGES += "${PN}-src"
 # path should match the toolchain path
 FILES_${PN}-src = "/usr/local/openmoko"
-PACKAGE_ARCH_${PN}-src = "all"
+PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
 
 do_configure_prepend() {
        install -d ${WORKDIR}/source

diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 8486aa0..a6a17b3 100644 (file)
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -15,6 +15,7 @@ RDEPENDS_task-openmoko-debug = "\
   cu \
   dbench \
   fbgrab \
+  fbset \
   fstests \
   gdb \
   gdbserver \

diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
new file mode 100644 (file)
index 0000000..788152c
--- /dev/null
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -0,0 +1,13 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+    openmoko-sample2-src \
+"

diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-openmoko-toolchain-target.bb
similarity index 95%
rename from packages/tasks/task-toolchain-openmoko-sdk.bb
rename to packages/tasks/task-openmoko-toolchain-target.bb
index bcb2d37..281884d 100644 (file)
--- a/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -26,6 +26,5 @@ RDEPENDS_${PN} = "\
     libmokoui2-dev \
     libmokopanelui2-dev \
     libmokojournal2-dev \
-    openmoko-sample2-src \
     openmoko-toolchain-scripts \
 "

diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 4367e40..e3bb271 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,9 +3,10 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r23"
+PR = "r22"
 
-SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+#SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;tag=master \
        ${KDRIVE_COMMON_PATCHES} \
        file://enable-epson.patch;patch=1 \
        file://enable-builtin-fonts.patch;patch=1 \
@@ -21,18 +22,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://w100-fix-offscreen-bmp.patch;patch=1 \
         file://kdrive-1.3-18bpp.patch;patch=1 \
         file://gumstix-kmode.patch;patch=1 \
-        file://smedia-glamo.patch;patch=1 \
-        file://build-glamo.patch;patch=1 \
-        file://00-xglamo-logs.patch;patch=1 \
-        file://01-xglamo-scrolling-artifact-fix.patch;patch=1 \
-        file://02-xglamo-no-dri.patch;patch=1 \
-        file://03-xglamo-no-vesa.patch;patch=1 \
 "
 
-SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1"
-PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/xorg-server-${PV}"
+#S = "${WORKDIR}/xorg-server-${PV}"
+S = "${WORKDIR}/git"
 
 W100_OECONF = "--disable-w100"
 W100_OECONF_arm = "--enable-w100"