merge of '3560960febd8121cf7263cd584a42d62985d8f26'

     and '6f4fc206c5fe4f18b5ae29f55f8e1487a5c22623'

12 files changed, 213 insertions, 29 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0007994373..3c4411c4b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -96,7 +96,7 @@ Distros:    Ångström
 Interests:  OpenSync, GNOME, GPE, Matchbox
 Recipes:    abiword, bootchart, dia, farsight, freeciv, fuse, galago, geda, gimp,
 Recipes:    gnumeric, gobby, obby, imposter, inkscape
-Recipes:    telepathy, tilibs, xchat, xournal.
+Recipes:    *moko*, telepathy, tilibs, xchat, xournal.
 
 Person:     Kristoffer Ericson
 Mail:       Kristoffer_e1@hotmail.com
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index fd07a1a3b9..56f08c48e0 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -18,6 +18,9 @@ IMAGE_BASENAME = "openprotium"
 IMAGE_FSTYPES = "jffs2"
 FEED_URIS = "openprotium##http://www.openprotium.org/ipkg.ppc.v1.0"
 
+# For protium on the turbostation
+IMAGE_BASENAME_turbostation = "openprotium-ts"
+
 #
 # binutils and compilers
 #
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-console-image.bb
index 3977e223af..8bd0fe07e7 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-console-image.bb
@@ -1,6 +1,6 @@
 #Angstrom bootstrap image
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
@@ -10,7 +10,7 @@ RDEPENDS = "task-base-core-default \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	   "
 
-export IMAGE_BASENAME = "bootstrap-image"
+export IMAGE_BASENAME = "console-image"
 export IMAGE_LINGUAS = ""
 export PACKAGE_INSTALL = "${RDEPENDS}"
 
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-x11-image.bb
index d366a62bf7..dbb986ae65 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-x11-image.bb
@@ -1,6 +1,6 @@
-#Angstrom GPE image
+#Angstrom X11 image
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
 PREFERRED_PROVIDER_tslib 		?= "tslib"
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
 ANGSTROM_EXTRA_INSTALL ?= ""
 XSERVER ?= "xserver-kdrive-fbdev"
 
-export IMAGE_BASENAME = "gpe-image"
+export IMAGE_BASENAME = "x11-image"
 
 DEPENDS = "task-base"
 RDEPENDS = "\
@@ -21,7 +21,6 @@ RDEPENDS = "\
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
-    angstrom-gpe-task-pim \
     ${ANGSTROM_EXTRA_INSTALL}"
 
 
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 36aa431d42..490955af9c 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r28"
+PR = "r29"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,7 @@ PACKAGES = "\
     angstrom-gpe-task-pim \
     angstrom-gpe-task-apps \
     angstrom-gpe-task-games \
+    angstrom-ohand-task-pim \
     angstrom-task-office \
     angstrom-task-printing \
     angstrom-task-sectest"
@@ -61,6 +62,12 @@ RDEPENDS_angstrom-gpe-task-pim := "\
     gpe-contacts \
     gpesyncd"
 
+RDEPENDS_angstrom-ohand-task-pim := "\
+    dates \
+    contacts \
+    tasks \
+"
+
 RDEPENDS_angstrom-gpe-task-settings := "\
     matchbox-panel-manager \
     gpe-su \
diff --git a/packages/linux/linux-turbostation/defconfig b/packages/linux/linux-turbostation/defconfig
index f9d91125b3..f24c1feb61 100644
--- a/packages/linux/linux-turbostation/defconfig
+++ b/packages/linux/linux-turbostation/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20.1
-# Wed Feb 28 20:58:12 2007
+# Fri Mar  2 18:26:20 2007
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -720,7 +720,7 @@ CONFIG_SERIO_SERPORT=y
 # Character devices
 #
 CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
+# CONFIG_VT_CONSOLE is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
@@ -1198,10 +1198,7 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_ROMFS_FS=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-CONFIG_QFMT_V1=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
+# CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -1219,9 +1216,9 @@ CONFIG_UDF_NLS=y
 #
 # DOS/FAT/NT Filesystems
 #
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_NTFS_FS=m
@@ -1272,27 +1269,27 @@ CONFIG_JFFS2_RTIME=y
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
+CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=y
+CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=y
+CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.1.bb
index 96352cc879..38b607e65b 100644
--- a/packages/linux/linux-turbostation_2.6.20.1.bb
+++ b/packages/linux/linux-turbostation_2.6.20.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS = "uboot-utils"
-PR = "r0"
+PR = "r3"
 
 # notes on iom def kernel:
 #
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index b684ac0833..62a2c0630b 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=master \
 	   file://add_lzo.patch;patch=1 \
@@ -13,7 +13,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=master \
 
 S = "${WORKDIR}/git/"
 
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'"
+EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'"
 
 do_stage () {
 	install -d ${STAGING_INCDIR}/mtd
diff --git a/packages/tzcode/.mtn2git_empty b/packages/tzcode/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tzcode/.mtn2git_empty
diff --git a/packages/tzcode/tzcode-native_2007a.bb b/packages/tzcode/tzcode-native_2007a.bb
new file mode 100644
index 0000000000..1c6e2f59b8
--- /dev/null
+++ b/packages/tzcode/tzcode-native_2007a.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
+
+PR = "r0"
+
+SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \
+           ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
+
+S = "${WORKDIR}"
+
+inherit native
+
+do_stage () {
+        install -m 755 zic ${STAGING_BINDIR}
+        install -m 755 zdump ${STAGING_BINDIR}
+        install -m 755 tzselect ${STAGING_BINDIR}
+}
+
+do_install () {
+        :
+}
diff --git a/packages/tzdata/.mtn2git_empty b/packages/tzdata/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tzdata/.mtn2git_empty
diff --git a/packages/tzdata/tzdata_2007a.bb b/packages/tzdata/tzdata_2007a.bb
new file mode 100644
index 0000000000..e5007e8310
--- /dev/null
+++ b/packages/tzdata/tzdata_2007a.bb
@@ -0,0 +1,158 @@
+DESCRIPTION = "Timezone data"
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = "tzcode-native"
+
+PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
+            tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
+            tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
+RPROVIDES = "tzdata"
+RCONFLICTS= "timezone-africa timezone-america timezone-antarctica \
+             timezone-arctic timezone-asia timezone-atlantic \
+             timezone-australia timezone-europe timezone-indian \
+             timezone-iso3166.tab timezone-pacific timezone-zone.tab"
+
+PR = "r0"
+
+SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
+
+S = "${WORKDIR}"
+
+TZONES= "africa antarctica asia australasia europe northamerica southamerica  \
+         factory solar87 solar88 solar89 etcetera backward systemv \
+#        pacificnew \
+        "
+
+do_compile () {
+        for zone in ${TZONES}; do \
+            zic -d ${WORKDIR}/usr/share/zoneinfo -L /dev/null \
+                -y ${S}/yearistype.sh ${S}/${zone} ; \
+            zic -d ${WORKDIR}/usr/share/zoneinfo/posix -L /dev/null \
+                -y ${S}/yearistype.sh ${S}/${zone} ; \
+            zic -d ${WORKDIR}/usr/share/zoneinfo/right -L ${S}/leapseconds \
+                -y ${S}/yearistype.sh ${S}/${zone} ; \
+        done
+}
+
+do_install () {
+        install -d ${D}/usr ${D}/usr/share ${D}/usr/share/zoneinfo
+        cp -pPR ${S}/usr ${D}/
+}
+
+# Packages primarily organized by directory with a major city
+# in most time zones in the base package
+
+PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
+    tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
+    tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
+
+FILES_tzdata-africa += "/usr/share/zoneinfo/Africa/*"
+RPROVIDES_tzdata-africa = "tzdata-africa"
+
+FILES_tzdata-americas += "/usr/share/zoneinfo/America/*  \
+                /usr/share/zoneinfo/US/*                \
+                /usr/share/zoneinfo/Brazil/*            \
+                /usr/share/zoneinfo/Canada/*            \
+                /usr/share/zoneinfo/Mexico/*            \
+                /usr/share/zoneinfo/Chile/*"
+RPROVIDES_tzdata-americas = "tzdata-americas"
+
+FILES_tzdata-antarctica += "/usr/share/zoneinfo/Antarctica/*"
+RPROVIDES_tzdata-antarctica = "tzdata-antarctica"
+
+FILES_tzdata-arctic += "/usr/share/zoneinfo/Arctic/*"
+RPROVIDES_tzdata-arctic = "tzdata-arctic"
+
+FILES_tzdata-asia += "/usr/share/zoneinfo/Asia/*        \
+                /usr/share/zoneinfo/Indian/*            \
+                /usr/share/zoneinfo/Mideast/*"
+RPROVIDES_tzdata-asia = "tzdata-asia"
+
+FILES_tzdata-atlantic += "/usr/share/zoneinfo/Atlantic/*"
+RPROVIDES_tzdata-atlantic = "tzdata-atlantic"
+
+FILES_tzdata-australia += "/usr/share/zoneinfo/Australia/*"
+RPROVIDES_tzdata-australia = "tzdata-australia"
+
+FILES_tzdata-europe += "/usr/share/zoneinfo/Europe/*"
+RPROVIDES_tzdata-europe = "tzdata-europe"
+
+FILES_tzdata-pacific += "/usr/share/zoneinfo/Pacific/*"
+RPROVIDES_tzdata-pacific = "tzdata-pacific"
+
+FILES_tzdata-posix += "/usr/share/zoneinfo/posix/*"
+RPROVIDES_tzdata-posix = "tzdata-posix"
+
+FILES_tzdata-right += "/usr/share/zoneinfo/right/*"
+RPROVIDES_tzdata-right = "tzdata-right"
+
+
+FILES_tzdata-misc += "/usr/share/zoneinfo/Cuba           \
+                /usr/share/zoneinfo/Egypt                \
+                /usr/share/zoneinfo/Eire                 \
+                /usr/share/zoneinfo/Factory              \
+                /usr/share/zoneinfo/GB-Eire              \
+                /usr/share/zoneinfo/Hongkong             \
+                /usr/share/zoneinfo/Iceland              \
+                /usr/share/zoneinfo/Iran                 \
+                /usr/share/zoneinfo/Israel               \
+                /usr/share/zoneinfo/Jamaica              \
+                /usr/share/zoneinfo/Japan                \
+                /usr/share/zoneinfo/Kwajalein            \
+                /usr/share/zoneinfo/Libya                \
+                /usr/share/zoneinfo/Navajo               \
+                /usr/share/zoneinfo/Poland               \
+                /usr/share/zoneinfo/Portugal             \
+                /usr/share/zoneinfo/Singapore            \
+                /usr/share/zoneinfo/Turkey"
+RPROVIDES_tzdata-misc = "tzdata-misc"
+
+
+FILES_${PN} += "/usr/share/zoneinfo/Pacific/Honolulu     \
+                /usr/share/zoneinfo/America/Anchorage    \
+                /usr/share/zoneinfo/America/Los_Angeles  \
+                /usr/share/zoneinfo/America/Denver       \
+                /usr/share/zoneinfo/America/Chicago      \
+                /usr/share/zoneinfo/America/New_York     \
+                /usr/share/zoneinfo/America/Caracas      \
+                /usr/share/zoneinfo/America/Sao_Paulo    \
+                /usr/share/zoneinfo/Europe/London        \
+                /usr/share/zoneinfo/Europe/Paris         \
+                /usr/share/zoneinfo/Africa/Cairo         \
+                /usr/share/zoneinfo/Europe/Moscow        \
+                /usr/share/zoneinfo/Asia/Dubai           \
+                /usr/share/zoneinfo/Asia/Karachi         \
+                /usr/share/zoneinfo/Asia/Dhaka           \
+                /usr/share/zoneinfo/Asia/Bankok          \
+                /usr/share/zoneinfo/Asia/Hong_Kong       \
+                /usr/share/zoneinfo/Asia/Tokyo           \
+                /usr/share/zoneinfo/Australia/Sydney     \
+                /usr/share/zoneinfo/Pacific/Noumea       \
+                /usr/share/zoneinfo/CET                  \
+                /usr/share/zoneinfo/CST6CDT              \
+                /usr/share/zoneinfo/EET                  \
+                /usr/share/zoneinfo/EST                  \
+                /usr/share/zoneinfo/EST5EDT              \
+                /usr/share/zoneinfo/GB                   \
+                /usr/share/zoneinfo/GMT                  \
+                /usr/share/zoneinfo/GMT+0                \
+                /usr/share/zoneinfo/GMT-0                \
+                /usr/share/zoneinfo/GMT0                 \
+                /usr/share/zoneinfo/Greenwich            \
+                /usr/share/zoneinfo/HST                  \
+                /usr/share/zoneinfo/MET                  \
+                /usr/share/zoneinfo/MST                  \
+                /usr/share/zoneinfo/MST7MDT              \
+                /usr/share/zoneinfo/NZ                   \
+                /usr/share/zoneinfo/NZ-CHAT              \
+                /usr/share/zoneinfo/PRC                  \
+                /usr/share/zoneinfo/PST8PDT              \
+                /usr/share/zoneinfo/ROC                  \
+                /usr/share/zoneinfo/ROK                  \
+                /usr/share/zoneinfo/UCT                  \
+                /usr/share/zoneinfo/UTC                  \
+                /usr/share/zoneinfo/Universal            \
+                /usr/share/zoneinfo/W-SU                 \
+                /usr/share/zoneinfo/WET                  \
+                /usr/share/zoneinfo/Zulu                 \
+                /usr/share/zoneinfo/Etc/*"