merge of '99b4c2c5cc4144822d6a86158e68432fb854563c'

     and '9a0857ebdef17f18989f0702e43595ce522a7a24'

31 files changed, 534 insertions, 433 deletions

diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index 3187b9b12a..f9a45e74df 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -6,7 +6,23 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
 
+PR = "r2"
+
 inherit autotools
 acpaths=""
 
 EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
+
+do_stage() {
+
+#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
+	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/
+	install -d ${STAGING_INCDIR}/beecrypt
+	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
+	do
+		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
+	done
+
+}
+
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index 46ade701a3..e16cad051d 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.043+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
 
 inherit e update-alternatives
 
@@ -10,7 +10,6 @@ RDEPENDS += "shared-mime-info mime-support"
 
 SRC_URI = "\
   svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
-  file://disable-e-cursor.patch;patch=1 \
   file://enlightenment_start.oe \
   file://applications.menu \
 "
diff --git a/packages/portabase/beecrypt/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/portabase/beecrypt/.mtn2git_empty
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch
new file mode 100644
index 0000000000..29edaeb93c
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch
@@ -0,0 +1,13 @@
+Index: e2fsprogs-libs-1.41.2/MCONFIG.in
+===================================================================
+--- e2fsprogs-libs-1.41.2.orig/MCONFIG.in	2008-09-12 15:28:13.000000000 +0200
++++ e2fsprogs-libs-1.41.2/MCONFIG.in	2008-10-08 01:01:49.539806918 +0200
+@@ -64,7 +64,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = @MKDIR_P@
+ 
+ #
+ # Library definitions
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
new file mode 100644
index 0000000000..87bc2d7e6a
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
@@ -0,0 +1,14 @@
+require e2fsprogs-libs.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+	   file://mkinstalldirs.patch;patch=1 \
+	  "
+
+EXTRA_OECONF=" --enable-elf-shlibs "
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 74ec3615a9..63da1dffa2 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.2+${PR}-gitr${SRCREV}"
-PR = "r2"
+PV = "0.8.3+${PR}-gitr${SRCREV}"
+PR = "r0"
 
 inherit distutils update-rc.d
 
@@ -26,6 +26,7 @@ do_install_append() {
 RDEPENDS_${PN} += "\
   python-dbus \
   python-datetime \
+  python-pprint \
   python-pygobject \
   python-pyrtc \
   python-pyserial \
diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb
index cbd90e5030..648cc48f91 100644
--- a/packages/freesmartphone/mickeydbus_git.bb
+++ b/packages/freesmartphone/mickeydbus_git.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's DBus introspection and calling Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-PV = "0.9.0+gitr${SRCREV}"
-PR = "r0"
+PV = "0.9.1+gitr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
@@ -15,4 +15,8 @@ do_install() {
 
 RDEPENDS_${PN} = "\
   python-dbus \
+  python-pprint \
 "
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index 243354cc91..0ecc8bbbea 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's Terminal Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-PV = "2.9.0+gitr${SRCREV}"
-PR = "r0"
+PV = "2.9.1+gitr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
@@ -23,3 +23,6 @@ RRECOMMENDS_${PN} += "\
   gsm0710muxd \
   python-dbus \
 "
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 1bd275d7e7..d8c678ce59 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Zhone: Zen Phone"
 LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
-RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo"
 PV = "0.0.0+${PR}-gitr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"
@@ -18,3 +17,10 @@ do_install_append() {
 }
 
 FILES_${PN} += "${datadir} ${sysconfdir}"
+
+RDEPENDS = "\
+  task-python-efl \
+  python-textutils \
+  python-dbus \
+  python-pycairo \
+"
diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb
index c6daf7b782..5d44db5a62 100644
--- a/packages/gettext/gettext-native_0.17.bb
+++ b/packages/gettext/gettext-native_0.17.bb
@@ -1,4 +1,5 @@
 require gettext_${PV}.bb
+PR = "r2"
 
 DEPENDS = ""
 PROVIDES = ""
@@ -56,4 +57,11 @@ do_stage_append() {
 		fi
 		install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
 	done
+
+	# config.rpath is needed by some configure macros and needs to be autoinstalled.
+        # automake will do this but config.rpath needs to be visible to automake
+        for i in `ls -d ${STAGING_DATADIR}/automake*`
+        do
+                cp ${STAGING_DATADIR}/gettext/config.rpath $i
+        done
 }
diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb
index 7beaee1294..3dac87a09b 100644
--- a/packages/gettext/gettext_0.17.bb
+++ b/packages/gettext/gettext_0.17.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
 PR = "r1"
-DEFAULT_PREFERENCE = "-1"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 PROVIDES = "virtual/libintl"
 
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
index b4878406de..b04cfc39bf 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
@@ -1,15 +1,10 @@
+DEPENDS = "libgpewidget sqlite"
 LICENSE = "GPL"
-PR = "r4"
-
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-SECTION = "gpe"
-PRIORITY = "optional"
 DESCRIPTION = "A GPE notebook to sketch your notes"
 export CVSBUILD = "no"
 
+inherit gpe pkgconfig
+
 CFLAGS +="-D_GNU_SOURCE"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
index 60bb1b3d76..488e32f55b 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
@@ -1,14 +1,10 @@
+DEPENDS = "libgpewidget sqlite"
 LICENSE = "GPL"
-
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-SECTION = "gpe"
-PRIORITY = "optional"
 DESCRIPTION = "A GPE notebook to sketch your notes"
 export CVSBUILD = "no"
 
+inherit gpe pkgconfig
+
 CFLAGS +="-D_GNU_SOURCE"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
index 8884746136..929d622a51 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
@@ -1,18 +1,23 @@
 DESCRIPTION = "A GPE notebook to sketch your notes"
 SECTION = "gpe"
-SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "libgpewidget"
-PV = "0.2.9+svn-${SRCDATE}"
+DEPENDS = "libgpewidget sqlite"
+PV = "0.2.9+svnr${SRCREV}"
 
-inherit pkgconfig autotools
+DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "${GPE_SVN} \
-	   file://svn-build.patch;patch=1"
+inherit pkgconfig autotools
 
+SRC_URI = "\
+  ${GPE_SVN} \
+  file://svn-build.patch;patch=1 \
+"
 S = "${WORKDIR}/${PN}"
 
+export CVSBUILD = "no"
+CFLAGS += "-D_GNU_SOURCE"
+
 do_compile () {
         oe_runmake PREFIX=${prefix}
         oe_runmake all-desktop PREFIX=${prefix}
@@ -23,10 +28,3 @@ do_install () {
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-export CVSBUILD = "no"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/linux/linux-omap/dvb-fix-dma.diff b/packages/linux/linux-omap/dvb-fix-dma.diff
new file mode 100644
index 0000000000..e05473fc7f
--- /dev/null
+++ b/packages/linux/linux-omap/dvb-fix-dma.diff
@@ -0,0 +1,60 @@
+Hi,
+I post this patch that fixes a kernel crash that happens when using a dvb
+usb stick on a mips platform and I think even on other platforms on which
+the dma access in not cache-coherent.
+
+The problem's origin is that, inside the method usb_bulk_urb_init of file
+drivers/media/dvb/dvb-usb/usb-urb.c, stream->urb_list[i]->transfer_buffer
+points to a memory area that has been allocated to be dma-coherent but
+stream->urb_list[i]->transfer_flags doesn't include the
+URB_NO_TRANSFER_DMA_MAP flag and stream->urb_list[i]->transfer_dma is not
+set.
+When later on the stream->urb_list[i]->transfer_buffer pointer is used
+inside function usb_hcd_submit_urb of file drivers/usb/core/hcd.c since the
+flag URB_NO_TRANSFER_DMA_MAP is not set the urb->transfer_buffer pointer is
+passed to the dma_map_single function that since the address is dma-coherent
+returns a wrong tranfer_dma address that later on leads to the kernel crash.
+
+The problem is solved by setting the URB_NO_TRANSFER_DMA_MAP flag and the
+stream->urb_list[i]->transfer_dma address.
+
+Perhaps to be more safe the URB_NO_TRANSFER_DMA_MAP flag can be set only
+if stream->urb_list[i]->transfer_dma != 0.
+
+I don't know if half of the fault can be of the dma_map_single function that
+should anyway returns a valid address both for a not dma-coherent and a
+dma-coherent address.
+
+Just to be clear:
+I've done this patch to solve my problem and I tested it only on a mips 
+platform
+but I think it should not cause any problems on other platforms.
+I posted it here to help someone else that can have my same problem and to 
+point it out
+to the mantainer of this part of code.
+You can use it at your own risk and I'm not resposible in any way for any 
+problem or
+damage that it can cause.
+I'm available to discuss about it
+
+Bye
+
+Michele Scorcia
+
+--------------------
+
+
+
+
+--- /tmp/usb-urb.c	2008-10-08 09:53:23.000000000 +0200
++++ git/drivers/media/dvb/dvb-usb/usb-urb.c	2008-10-08 09:54:16.000000000 +0200
+@@ -152,7 +152,8 @@
+ 				stream->props.u.bulk.buffersize,
+ 				usb_urb_complete, stream);
+ 
+-		stream->urb_list[i]->transfer_flags = 0;
++		stream->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
++		stream->urb_list[i]->transfer_dma = stream->dma_addr[i];	
+ 		stream->urbs_initialized++;
+ 	}
+ 	return 0;
diff --git a/packages/linux/linux-omap/fix-irq33.diff b/packages/linux/linux-omap/fix-irq33.diff
new file mode 100644
index 0000000000..709f042ab7
--- /dev/null
+++ b/packages/linux/linux-omap/fix-irq33.diff
@@ -0,0 +1,111 @@
+From: "Nathan Monson" <nmonson@gmail.com>
+To: "linux-omap@vger.kernel.org List" <linux-omap@vger.kernel.org>
+Subject: Re: omapfb: help from userspace
+Cc: "TK, Pratheesh Gangadhar" <pratheesh@ti.com>
+
+On Wed, Oct 8, 2008 at 11:36 AM, Nathan Monson <nmonson@gmail.com> wrote:
+> "Felipe Contreras" <felipe.contreras@gmail.com> writes:
+>> irq -33, desc: c0335cf8, depth: 0, count: 0, unhandled: 0
+>
+> On the BeagleBoard list, Pratheesh Gangadhar said that mapping I/O
+> regions as Strongly Ordered suppresses this problem:
+> http://groups.google.com/group/beagleboard/browse_thread/thread/23e1c95b4bfb09b5/70d12dca569ca503?show_docid=70d12dca569ca503
+
+Pratheesh helped me make a patch against the latest linux-omap git to
+try this.
+
+With this patch, my IRQ -33 problems with the DSP have disappeared.
+Before, I would end up in IRQ -33 loop after 10 invocations of the DSP
+Bridge 'ping.out' utility.  I just finished running it 50,000 times
+without error.
+
+As stated before, this patch is just a workaround for testing
+purposes, not a fix.  Who knows what performance side effects it
+has...
+
+---
+diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
+index 9eb936e..5cb4f5f 100644
+--- a/arch/arm/include/asm/mach/map.h
++++ b/arch/arm/include/asm/mach/map.h
+@@ -25,6 +25,7 @@ struct map_desc {
+ #define MT_HIGH_VECTORS		8
+ #define MT_MEMORY		9
+ #define MT_ROM			10
++#define MT_MEMORY_SO		11
+
+ #define MT_NONSHARED_DEVICE	MT_DEVICE_NONSHARED
+ #define MT_IXP2000_DEVICE	MT_DEVICE_IXP2000
+diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
+index adbe21f..c11c0e8 100644
+--- a/arch/arm/mach-omap2/io.c
++++ b/arch/arm/mach-omap2/io.c
+@@ -119,13 +119,13 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
+ 		.virtual	= L3_34XX_VIRT,
+ 		.pfn		= __phys_to_pfn(L3_34XX_PHYS),
+ 		.length		= L3_34XX_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= L4_34XX_VIRT,
+ 		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
+ 		.length		= L4_34XX_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= L4_WK_34XX_VIRT,
+@@ -137,19 +137,19 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
+ 		.virtual	= OMAP34XX_GPMC_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),
+ 		.length		= OMAP34XX_GPMC_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= OMAP343X_SMS_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),
+ 		.length		= OMAP343X_SMS_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= OMAP343X_SDRC_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),
+ 		.length		= OMAP343X_SDRC_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= L4_PER_34XX_VIRT,
+@@ -161,7 +161,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
+ 		.virtual	= L4_EMU_34XX_VIRT,
+ 		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),
+ 		.length		= L4_EMU_34XX_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ };
+ #endif
+diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
+index a713e40..d5f25ad 100644
+--- a/arch/arm/mm/mmu.c
++++ b/arch/arm/mm/mmu.c
+@@ -245,6 +245,10 @@ static struct mem_type mem_types[] = {
+ 		.prot_sect = PMD_TYPE_SECT,
+ 		.domain    = DOMAIN_KERNEL,
+ 	},
++	[MT_MEMORY_SO] = {
++		.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_UNCACHED,
++		.domain    = DOMAIN_KERNEL,
++	},
+ };
+
+ const struct mem_type *get_mem_type(unsigned int type)
+--
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 290d90084b..14de954e7c 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
 
 PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-PR = "r12"
+PR = "r14"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -34,6 +34,8 @@ SRC_URI_append = " \
            file://musb-fix-multiple-bulk-transfers.diff;patch=1 \
            file://mru-256MB.diff;patch=1 \
            file://musb-fix-endpoints.diff;patch=1 \
+           file://dvb-fix-dma.diff;patch=1 \
+           file://fix-irq33.diff;patch=1 \
 "
 
 
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index c68b5c2e69..dac670abf9 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -5,21 +5,14 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for the Openmoko Neo Smartphones
 
 DEFAULT_PREFERENCE = "-1"
 
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.26"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
-PR = "r4"
+PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}"
+PR = "r0"
 
 SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy \
-  \
-  file://0001-squashfs-with-lzma.patch;patch=1 \
-  file://0002-squashfs-initrd.patch;patch=1 \
-  file://0003-squashfs-force-O2.patch;patch=1 \
-  file://0004-squashfs-Kconfig.patch;patch=1 \
-  file://0005-squashfs-Makefile.patch;patch=1 \
-  \
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \
   file://defconfig-oe \
 "
 S = "${WORKDIR}/git"
diff --git a/packages/pmount/pmount-0.9.17/.mtn2git_empty b/packages/pmount/pmount-0.9.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pmount/pmount-0.9.17/.mtn2git_empty
diff --git a/packages/pmount/pmount-0.9.17/gettext.patch b/packages/pmount/pmount-0.9.17/gettext.patch
new file mode 100644
index 0000000000..dbac93f6ba
--- /dev/null
+++ b/packages/pmount/pmount-0.9.17/gettext.patch
@@ -0,0 +1,133 @@
+Index: pmount-0.9.17/src/pmount-hal.c
+===================================================================
+--- pmount-0.9.17.orig/src/pmount-hal.c	2007-07-01 13:58:49.000000000 +0200
++++ pmount-0.9.17/src/pmount-hal.c	2008-10-08 23:39:20.970178412 +0200
+@@ -16,7 +16,6 @@
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <locale.h>
+-#include <libintl.h>
+ #include <libhal-storage.h>
+ 
+ #include "policy.h"
+@@ -26,7 +25,12 @@
+ #include "realpath.h"
+ 
+ /* gettext abbreviation */
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
++#else
++#define _(String) (String)
++#endif
+ 
+ void help() {
+     puts( _(
+@@ -196,10 +200,12 @@
+     char *dmask = NULL;
+     char *iocharset = NULL;
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     if( argc < 2 ) {
+         help();
+Index: pmount-0.9.17/src/utils.h
+===================================================================
+--- pmount-0.9.17.orig/src/utils.h	2007-07-07 09:05:06.000000000 +0200
++++ pmount-0.9.17/src/utils.h	2008-10-08 23:19:09.515475595 +0200
+@@ -12,7 +12,12 @@
+ #define __utils_h
+ 
+ /* gettext abbreviation */
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
++#else
++#define _(String) (String)
++#endif
+ 
+ /* global flag whether to print debug messages (false by default) */
+ extern int enable_debug;
+Index: pmount-0.9.17/configure.ac
+===================================================================
+--- pmount-0.9.17.orig/configure.ac	2007-12-14 20:27:23.000000000 +0100
++++ pmount-0.9.17/configure.ac	2008-10-08 23:19:09.598820915 +0200
+@@ -77,10 +77,7 @@
+ fi
+ AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL")
+ 													   
+-GETTEXT_PACKAGE="pmount"
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+-AM_GLIB_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ AC_OUTPUT([
+ Makefile
+Index: pmount-0.9.17/src/pmount.c
+===================================================================
+--- pmount-0.9.17.orig/src/pmount.c	2008-10-08 23:36:44.452037557 +0200
++++ pmount-0.9.17/src/pmount.c	2008-10-08 23:37:38.778816969 +0200
+@@ -21,9 +21,12 @@
+ #include <errno.h>
+ #include <locale.h>
+ #include <langinfo.h>
+-#include <libintl.h>
+ #include <sys/stat.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ #include "fs.h"
+ #include "policy.h"
+ #include "utils.h"
+@@ -619,10 +622,12 @@
+         { NULL, 0, NULL, 0}
+     };
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     /* If pmount is run without a single argument, print out the list
+        of removable devices. Does not require root privileges, just read access
+Index: pmount-0.9.17/src/pumount.c
+===================================================================
+--- pmount-0.9.17.orig/src/pumount.c	2008-10-08 23:38:21.122028300 +0200
++++ pmount-0.9.17/src/pumount.c	2008-10-08 23:38:47.972023678 +0200
+@@ -16,9 +16,12 @@
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <getopt.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ #include "policy.h"
+ #include "utils.h"
+ #include "luks.h"
+@@ -172,10 +175,12 @@
+         { NULL, 0, NULL, 0}
+     };
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     /* are we root? */
+     if( geteuid() ) {
diff --git a/packages/pmount/pmount-0.9.17/install.patch b/packages/pmount/pmount-0.9.17/install.patch
new file mode 100644
index 0000000000..b02942a591
--- /dev/null
+++ b/packages/pmount/pmount-0.9.17/install.patch
@@ -0,0 +1,15 @@
+Index: pmount-0.9.17/src/Makefile.am
+===================================================================
+--- pmount-0.9.17.orig/src/Makefile.am	2008-10-09 01:22:41.668067209 +0200
++++ pmount-0.9.17/src/Makefile.am	2008-10-09 01:23:22.144725902 +0200
+@@ -36,8 +36,8 @@
+ 
+ install-data-hook:
+ 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
++	$(INSTALL_DATA)  -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
++	$(INSTALL_DATA)  -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+ 
+ uninstall-hook:
+ 	rm -f $(INSTALL_DIR)/pmount
diff --git a/packages/pmount/pmount_0.9.17.bb b/packages/pmount/pmount_0.9.17.bb
new file mode 100644
index 0000000000..f72534b468
--- /dev/null
+++ b/packages/pmount/pmount_0.9.17.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE = "http://pmount.alioth.debian.org/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+DEPENDS = "hal e2fsprogs-libs sysfsutils"
+RDEPENDS_${PN}-hal = "${PN}"
+RRECOMMENDS_${PN}-hal = "hal"
+
+SRC_URI = "http://alioth.debian.org/frs/download.php/2247/${P}.tar.gz \
+	   file://gettext.patch;patch=1 \
+	   file://install.patch;patch=1 \
+	  "
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--enable-hal"
+
+PACKAGES =+ "${PN}-hal"
+
+FILES_${PN}-hal = "${bindir}/pmount-hal"
+
diff --git a/packages/portabase/beecrypt/config.m4 b/packages/portabase/beecrypt/config.m4
deleted file mode 100644
index 05d2d1593d..0000000000
--- a/packages/portabase/beecrypt/config.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-dnl config.m4
-ifdef(`__CONFIG_M4_INCLUDED__',,`
-define(`CONFIG_TOP_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0')
-define(`ASM_OS',`linux-gnu')
-define(`ASM_CPU',`arm')
-define(`ASM_ARCH',`arm')
-define(`ASM_BIGENDIAN',`no')
-define(`ASM_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0/gas')
-define(`TEXTSEG',`.text')
-define(`GLOBL',`.globl')
-define(`GSYM_PREFIX',`')
-define(`LSYM_PREFIX',`.L')
-define(`ALIGN',`')
-define(`__CONFIG_M4_INCLUDED__')
-include(asmdefs.m4)
-')
diff --git a/packages/portabase/beecrypt/gas.patch b/packages/portabase/beecrypt/gas.patch
deleted file mode 100644
index bdb20944d3..0000000000
--- a/packages/portabase/beecrypt/gas.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 beecrypt-3.1.0/gas/aesopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/aesopt.ppc.m4	2003-06-09 08:03:21 +0200
-+++ beecrypt-3.1.0/gas/aesopt.ppc.m4	2004-10-06 17:59:31 +0200
-@@ -21,7 +21,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- define(`s0',`r24')
- define(`s1',`r25')
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.x86.m4 beecrypt-3.1.0/gas/aesopt.x86.m4
---- beecrypt-3.1.0/gas.orig/aesopt.x86.m4	2003-06-09 10:35:39 +0200
-+++ beecrypt-3.1.0/gas/aesopt.x86.m4	2004-10-06 17:54:36 +0200
-@@ -1,5 +1,5 @@
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- ifdef(`USE_MMX',`
- 
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 beecrypt-3.1.0/gas/blowfishopt.i586.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4	2003-06-09 10:25:11 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.i586.m4	2004-10-06 17:54:58 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- dnl during this macro we assume:
- dnl	bp in %esi, xl and xr in %ecx and %edx, %eax and %ebx clear
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 beecrypt-3.1.0/gas/blowfishopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4	2003-06-04 19:39:57 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.ppc.m4	2004-10-06 17:59:36 +0200
-@@ -21,7 +21,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- define(`round',`
- 	lwz r9,$3(r3)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 beecrypt-3.1.0/gas/mpopt.alpha.m4
---- beecrypt-3.1.0/gas.orig/mpopt.alpha.m4	2003-05-29 10:44:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.alpha.m4	2004-10-06 17:57:20 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/alpha.m4)
-+include(alpha.m4)
- 
- 
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 beecrypt-3.1.0/gas/mpopt.ia64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ia64.m4	2003-05-28 10:40:44 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ia64.m4	2004-10-06 17:57:32 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ia64.m4)
-+include(ia64.m4)
- 
- define(`sze',`r14')
- define(`dst',`r15')
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 beecrypt-3.1.0/gas/mpopt.m68k.m4
---- beecrypt-3.1.0/gas.orig/mpopt.m68k.m4	2003-04-26 14:01:57 +0200
-+++ beecrypt-3.1.0/gas/mpopt.m68k.m4	2004-10-06 17:57:38 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/m68k.m4)
-+include(m68k.m4)
- 
- dnl works
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 beecrypt-3.1.0/gas/mpopt.ppc64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc64.m4	2004-10-06 17:57:54 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/ppc64.m4)
-+include(ppc64.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 beecrypt-3.1.0/gas/mpopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc.m4	2004-10-06 17:57:50 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 beecrypt-3.1.0/gas/mpopt.sparcv8.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8.m4	2004-10-06 17:56:54 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpsetmul)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4	2004-10-06 17:57:04 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 beecrypt-3.1.0/gas/mpopt.x86_64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4	2003-05-29 14:40:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86_64.m4	2004-10-06 17:56:14 +0200
-@@ -21,7 +21,7 @@
- 	.file "mpopt.s"
- 
- include(config.m4)
--include(ASM_SRCDIR/x86_64.m4)
-+include(x86_64.m4)
- 
- 
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86.m4 beecrypt-3.1.0/gas/mpopt.x86.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86.m4	2003-06-04 19:39:58 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86.m4	2004-10-06 17:56:27 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- 
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 beecrypt-3.1.0/gas/sha1opt.x86.m4
---- beecrypt-3.1.0/gas.orig/sha1opt.x86.m4	2003-05-08 19:52:54 +0200
-+++ beecrypt-3.1.0/gas/sha1opt.x86.m4	2004-10-06 17:55:20 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- 	.equ	K00,	0x5a827999
- 	.equ	K20,	0x6ed9eba1
diff --git a/packages/portabase/beecrypt/m4.diff b/packages/portabase/beecrypt/m4.diff
deleted file mode 100644
index 0d07f75cb2..0000000000
--- a/packages/portabase/beecrypt/m4.diff
+++ /dev/null
@@ -1,155 +0,0 @@
---- beecrypt-3.1.0/acinclude.m4.orig	2004-10-06 17:09:25.000000000 +0200
-+++ beecrypt-3.1.0/acinclude.m4	2004-10-06 17:12:22.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- 
- dnl  BEECRYPT_INT_TYPES
--AC_DEFUN(BEECRYPT_INT_TYPES,[
-+AC_DEFUN([BEECRYPT_INT_TYPES],[
-   AC_TYPE_SIZE_T
-   bc_typedef_size_t=
-   if test $ac_cv_type_size_t != yes; then
-@@ -112,7 +112,7 @@
- 
- 
- dnl  BEECRYPT_CPU_BITS
--AC_DEFUN(BEECRYPT_CPU_BITS,[
-+AC_DEFUN([BEECRYPT_CPU_BITS],[
-   AC_CHECK_SIZEOF([unsigned long])
-   if test $ac_cv_sizeof_unsigned_long -eq 8; then
-     AC_SUBST(MP_WBITS,64U)
-@@ -125,7 +125,7 @@
- 
- 
- dnl  BEECRYPT_WORKING_AIO
--AC_DEFUN(BEECRYPT_WORKING_AIO,[
-+AC_DEFUN([BEECRYPT_WORKING_AIO],[
-   AC_CHECK_HEADERS(aio.h)
-   if test "$ac_cv_header_aio_h" = yes; then
-     AC_SEARCH_LIBS([aio_read],[c rt aio posix4],[
-@@ -228,7 +228,7 @@
- 
- 
- dnl  BEECRYPT_CFLAGS_REM
--AC_DEFUN(BEECRYPT_CFLAGS_REM,[
-+AC_DEFUN([BEECRYPT_CFLAGS_REM],[
-   if test "$CFLAGS" != ""; then
-     CFLAGS_save=""
-     for flag in $CFLAGS
-@@ -243,7 +243,7 @@
- 
- 
- dnl  BEECRYPT_GNU_CC
--AC_DEFUN(BEECRYPT_GNU_CC,[
-+AC_DEFUN([BEECRYPT_GNU_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   case $bc_target_arch in
-   ia64)
-@@ -331,7 +331,7 @@
- 
- 
- dnl  BEECRYPT_COMPAQ_CC
--AC_DEFUN(BEECRYPT_COMPAQ_CC,[
-+AC_DEFUN([BEECRYPT_COMPAQ_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Compaq's C compiler],bc_cv_prog_COMPAQ_CC,[
-@@ -355,7 +355,7 @@
- 
- 
- dnl  BEECRYPT_HPUX_CC
--AC_DEFUN(BEECRYPT_HPUX_CC,[
-+AC_DEFUN([BEECRYPT_HPUX_CC],[
-   if test "$ac_enable_debug" != yes; then
-     BEECRYPT_CFLAGS_REM([-g])
-     CFLAGS="$CFLAGS -fast"
-@@ -364,7 +364,7 @@
- 
- 
- dnl  BEECRYPT_IBM_CC
--AC_DEFUN(BEECRYPT_IBM_CC,[
-+AC_DEFUN([BEECRYPT_IBM_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using IBM C],bc_cv_prog_IBM_CC,[
-@@ -398,7 +398,7 @@
- 
- 
- dnl  BEECRYPT_INTEL_CC
--AC_DEFUN(BEECRYPT_INTEL_CC,[
-+AC_DEFUN([BEECRYPT_INTEL_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Intel C++],bc_cv_prog_INTEL_CC,[
-@@ -448,7 +448,7 @@
- 
- 
- dnl  BEECRYPT_SUN_FORTE_CC
--AC_DEFUN(BEECRYPT_SUN_FORTE_CC,[
-+AC_DEFUN([BEECRYPT_SUN_FORTE_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Sun Forte C],bc_cv_prog_SUN_FORTE_CC,[
-@@ -485,7 +485,7 @@
- 
- 
- dnl  BEECRYPT_ASM_DEFS
--AC_DEFUN(BEECRYPT_ASM_DEFS,[
-+AC_DEFUN([BEECRYPT_ASM_DEFS],[
-   AC_SUBST(ASM_OS,$target_os)
-   AC_SUBST(ASM_CPU,$bc_target_cpu)
-   AC_SUBST(ASM_ARCH,$bc_target_arch)
-@@ -494,7 +494,7 @@
- 
- 
- dnl  BEECRYPT_ASM_TEXTSEG
--AC_DEFUN(BEECRYPT_ASM_TEXTSEG,[
-+AC_DEFUN([BEECRYPT_ASM_TEXTSEG],[
-   AC_CACHE_CHECK([how to switch to text segment],
-     bc_cv_asm_textseg,[
-       case $target_os in
-@@ -516,7 +516,7 @@
- 
- 
- dnl  BEECRYPT_ASM_GLOBL
--AC_DEFUN(BEECRYPT_ASM_GLOBL,[
-+AC_DEFUN([BEECRYPT_ASM_GLOBL],[
-   AC_CACHE_CHECK([how to declare a global symbol],
-     bc_cv_asm_globl,[
-       case $target_os in
-@@ -529,7 +529,7 @@
- 
- 
- dnl  BEECRYPT_ASM_GSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_GSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_GSYM_PREFIX],[
-   AC_CACHE_CHECK([if global symbols need leading underscore],
-     bc_cv_asm_gsym_prefix,[
-       case $target_os in
-@@ -542,7 +542,7 @@
- 
- 
- dnl  BEECRYPT_ASM_LSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_LSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_LSYM_PREFIX],[
-   AC_CACHE_CHECK([how to declare a local symbol],
-     bc_cv_asm_lsym_prefix,[
-       case $target_os in
-@@ -562,7 +562,7 @@
- 
- 
- dnl  BEECRYPT_ASM_ALIGN
--AC_DEFUN(BEECRYPT_ASM_ALIGN,[
-+AC_DEFUN([BEECRYPT_ASM_ALIGN],[
-   AC_CACHE_CHECK([how to align symbols],
-     bc_cv_asm_align,[
-       case $target_cpu in
-@@ -587,7 +587,7 @@
- 
- 
- dnl  BEECRYPT_ASM_SOURCES
--AC_DEFUN(BEECRYPT_ASM_SOURCES,[
-+AC_DEFUN([BEECRYPT_ASM_SOURCES],[
-   echo > mpopt.s
-   echo > aesopt.s
-   echo > blowfishopt.s
diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb
deleted file mode 100644
index bd61bad88e..0000000000
--- a/packages/portabase/beecrypt_3.1.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "BeeCrypt is an ongoing project to provide a strong and fast cryptography \
-toolkit. Includes entropy sources, random generators, block ciphers, hash functions, \
-message authentication codes, multiprecision integer routines, and public key primitives."
-
-HOMEPAGE = "http://sourceforge.net/projects/beecrypt/"
-LICENSE = "LGPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-file://config.m4 \
-file://gas.patch;patch=1 \
-file://m4.diff;patch=1"
-PR = "r1"
-
-inherit autotools
-
-do_configure_prepend() {
-
-cp ${WORKDIR}/config.m4 ${S}/gas/
-
-}
-
-
-do_stage() {
-
-#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
-	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/beecrypt
-	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
-	do
-		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
-	done
-
-}
diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb
index 43794f3e6f..404dfcfe1e 100644
--- a/packages/portabase/metakit_2.4.9.3.bb
+++ b/packages/portabase/metakit_2.4.9.3.bb
@@ -8,13 +8,16 @@ HOMEPAGE = "http://www.equi4.com/metakit.html"
 
 SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \
 	   file://metakit-2.4.9.3.patch;patch=1"
-PR = "r2"
+PR = "r3"
+
+FILES_${PN} += " ${libdir}/*.so"
 
 do_configure_prepend() {
 
 #	cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/
 
 }
+
 do_configure () {
 
 	cd builds
@@ -41,10 +44,8 @@ do_configure () {
 
 }
 
-
 do_stage() {
-#	oe_libinstall  -a  -C builds/.libs libmk4  ${STAGING_LIBDIR}
-	cp builds/.libs/libmk4.a ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C builds/.libs libmk4 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/
 	for X in mk4.h mk4.inl
 	do
@@ -53,14 +54,12 @@ do_stage() {
 
 }
 
-
-
 do_compile () {
 	cd builds
 	oe_runmake
 }
 
 do_install() {
-
-	:
+	oe_libinstall -so -C builds/.libs libmk4 ${D}${libdir}
 }
+
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index d43cb520cb..be8fc35a5a 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -26,8 +26,8 @@ exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
 
 EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
                 --without-cxx --with-signal-module --with-wctype-functions"
-EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \
-		STAGING_INCDIR=${STAGING_INCDIR}'
+EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
+		STAGING_INCDIR=${STAGING_INCDIR_NATIVE}'
 
 do_stage_append() {
 	install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
diff --git a/packages/totem/totem-pl-parser_2.24.1.bb b/packages/totem/totem-pl-parser_2.24.1.bb
new file mode 100644
index 0000000000..7f3cd861e9
--- /dev/null
+++ b/packages/totem/totem-pl-parser_2.24.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = "eds-dbus"
+
+inherit gnome
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/totem/totem_2.24.2.bb b/packages/totem/totem_2.24.2.bb
new file mode 100644
index 0000000000..a0de5705cf
--- /dev/null
+++ b/packages/totem/totem_2.24.2.bb
@@ -0,0 +1,70 @@
+# totem OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "A GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
+RDEPENDS_${PN} += "iso-codes"
+RRECOMMENDS_${PN} += "gst-plugin-playbin \
+                      gst-plugin-gconfelements \
+		      gst-plugin-decodebin \
+		      gst-plugin-decodebin2 \
+		      gst-ffmpeg \
+		      gst-plugin-audioresample \
+		      gst-plugin-ximagesink \
+		      gst-plugin-xvimagesink \
+		      gst-plugin-alsa \
+		      gst-plugin-avi \
+		      gst-plugin-ffmpegcolorspace \
+		      gst-plugin-flvdemux \
+		      gst-plugin-nuvdemux \
+		      gst-plugin-videoscale \
+		      gst-plugin-a52dec \
+		      gst-plugin-mpegaudioparse \
+		      gst-plugin-ossaudio \
+		      gst-plugin-pulse \
+		      gst-plugin-autodetect \
+		      "
+
+inherit gnome
+
+SRC_URI += "file://gst-detect.diff;patch=1"
+
+EXTRA_OECONF=" --disable-schemas-install \
+               --enable-gtk \
+	       --disable-iso-codes \
+	       --disable-debug \
+               --enable-gstreamer \
+               --enable-browser-plugins \
+	       --disable-run-in-source-tree \
+	       --disable-python \
+	       --disable-vala \
+	       --with-dbus \
+	       "
+
+do_configure_prepend() {
+	sed -i -e s:help::g ${S}/Makefile.am
+}
+
+PACKAGES += "totem-plugin-bemused totem-plugin-gromit totem-plugin-lirc totem-plugin-media-player-keys totem-plugin-mythtv totem-plugin-ontop totem-plugin-properties totem-plugin-screensaver totem-plugin-skipto totem-plugin-thumbnail totem-plugin-youtube totem-browser-plugin-dbg totem-browser-plugin"
+
+FILES_totem-plugin-bemused += "${libdir}/totem/plugins/bemused/*"
+FILES_totem-plugin-gromit += "${libdir}/totem/plugins/gromit/*"
+FILES_totem-plugin-lirc += "${libdir}/totem/plugins/lirc/*"
+FILES_totem-plugin-media-player-keys += "${libdir}/totem/plugins/media-player-keys/*"
+FILES_totem-plugin-mythtv += "${libdir}/totem/plugins/mythtv/*"
+FILES_totem-plugin-ontop += "${libdir}/totem/plugins/ontop/*"
+FILES_totem-plugin-properties += "${libdir}/totem/plugins/properties/*"
+FILES_totem-plugin-screensaver += "${libdir}/totem/plugins/screensaver/*"
+FILES_totem-plugin-skipto += "${libdir}/totem/plugins/skipto/*"
+FILES_totem-plugin-thumbnail += "${libdir}/totem/plugins/thumbnail/*"
+FILES_totem-plugin-youtube += "${libdir}/totem/plugins/youtube/*"
+
+FILES_${PN} = "${bindir}/* ${sysconfdir} ${libdir}/lib*.so.* ${libexecdir} ${datadir}/icons ${datadir}/totem ${datadir}/applications"
+FILES_${PN}-dbg += "${libdir}/totem/plugins/*/.debug"
+FILES_${PN}-dev += "${libdir}/totem/plugins/*/*a"
+FILES_totem-browser-plugin-dbg += "${libdir}/mozilla/plugins/.debug"
+FILES_totem-browser-plugin += "${libdir}/mozilla/plugins/"
diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb
index 95e33daff3..c9737152da 100644
--- a/packages/ttf-fonts/ttf-liberation_0.2.bb
+++ b/packages/ttf-fonts/ttf-liberation_0.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://www.redhat.com/promo/fonts/"
 LICENSE = "Liberation"
 PR = "r3"
 
-SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz"
+SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz"
 S = "${WORKDIR}/liberation-fonts-${PV}"
 
 PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"