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

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

2005/02/23 15:31:35-06:00 ti.com!kergoth
Apply fix to lame from Michael Kropfberg that ensures that the library packages get emitted.

2005/02/23 14:04:22-06:00 ti.com!kergoth
Use the recent glibc snaps by default for the sh3 and sh4 target architectures.

2005/02/23 13:49:33-06:00 ti.com!kergoth
Fix the unpleasant target path mangling in do_install in the uclibc builds to happen only when necessary (thereby unborking the uclibc build with default paths).

2005/02/23 13:30:16-06:00 ti.com!kergoth
modutils: apply patch from Hermann Lacheiner to fix another missing /.

2005/02/23 12:36:57-06:00 ti.com!kergoth
Add sh3 uclibc defconfigs for all the uclibc versions.

2005/02/23 12:27:56-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded

2005/02/23 12:27:44-06:00 ti.com!kergoth
module-init-tools: fix another bug caused by that rampant sed'ing.

2005/02/23 18:57:22+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 18:57:02+01:00 uni-frankfurt.de!mickeyl
introduce IPKGBUILDCMD to enable overwriting the ipkg-build command line arguments. tweak sharprom-compatible.conf to override IPKGBUILDCMD. thanksfully, ipkg-build still supports the outdated format

2005/02/23 10:32:16-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded

2005/02/23 10:31:54-06:00 ti.com!kergoth
Bump PR in the packages that were broken by the hokey sed from yesterday.

2005/02/23 17:14:56+01:00 uni-frankfurt.de!mickeyl
misc opie files: use palmtopdir variable instead of hardcoding /opt/QtPalmtop/

2005/02/23 17:05:25+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 09:56:05-06:00 ti.com!kergoth
Fixes per the overenthusiastic sed / removal I did yesterday.  Thanks to Hermann Lacheiner and Holger Schurig for spotting a couple of them, this should fix the others.

2005/02/23 16:48:08+01:00 uni-frankfurt.de!mickeyl
make the prism3-support package work

BKrev: 421cfb9f-K6bfhnkhAVPJV_fqpHn7Q

49 files changed, 446 insertions, 137 deletions

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 1119502bc8..513e4639b5 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -209,7 +209,8 @@ python do_package_ipk () {
 			conffiles.close()
 
 		os.chdir(basedir)
-		ret = os.system("PATH=\"%s\" ipkg-build -o 0 -g 0 %s %s" % (bb.data.getVar("PATH", localdata, 1), pkg, pkgoutdir))
+		ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1), 
+                                                          bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir))
 		if ret != 0:
 			raise bb.build.FuncFailed("ipkg-build execution failed")
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f70c0c4147..aa5874225c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -321,6 +321,10 @@ PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1;
 PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
 PATCH_DEPENDS = "quilt-native"
 
+# Program to be used to build ipkg packages
+
+IPKGBUILDCMD = "ipkg-build -o 0 -g 0"
+
 ##################################################################
 # Not sure about the rest of this yet.
 ##################################################################
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index e69de29bb2..58a6e15fea 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -0,0 +1,62 @@
+#@TYPE: Distribution
+#@NAME: SharpROM
+#@DESCRIPTION: Distribution configuration for SharpROM compatible packages
+
+#
+# This is pretty ad-hoc - feel free to improve as needed :)
+#
+
+INHERIT += " package_ipk debian"
+TARGET_OS = "linux"
+TARGET_FPU = ""
+TARGET_CC_ARCH = "-march=armv4"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2"
+
+DISTRO = "sharprom"
+DISTRO_NAME = "SharpROM"
+DISTRO_VERSION = "3.1 compatible"
+DISTRO_TYPE = "debug"
+# DISTRO_TYPE = "release"
+
+CVSDATE = "20050221"
+
+#
+# Zaurus
+#
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "tty1"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+#
+# Base
+#
+
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross"
+ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc"
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial
+
+PREFERRED_VERSION_glibc = "2.2.5"
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+
+OPIE_VERSION = "1.2.0"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+CVSDATE_xserver-kdrive = "20050208"
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+
+include conf/distro/preferred-gpe-versions.inc
+
diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index 03d64155c1..8c54741547 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -47,9 +47,9 @@ def get_commands_apt_doc(d, bb, manpages):
 		dest = get_files_apt_doc(d, bb, m)
 		dir = os.path.dirname(dest)
 		if not dir in __dir_cache__:
-			s.append("install -d ${D}%s" % dir)
+			s.append("install -d ${D}/%s" % dir)
 			__dir_cache__.append(dir)
-		s.append("install -m 0644 %s ${D}%s" % (m, dest))
+		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
 	return "\n".join(s)
 
 PACKAGES += "${PN}-utils ${PN}-utils-doc"
diff --git a/packages/apt/apt_0.5.28.1.bb b/packages/apt/apt_0.5.28.1.bb
index e69de29bb2..99f5ef63c7 100644
--- a/packages/apt/apt_0.5.28.1.bb
+++ b/packages/apt/apt_0.5.28.1.bb
@@ -0,0 +1,13 @@
+include apt.inc
+PR = "r1"
+
+SRC_URI += "file://autofoo.patch;patch=1"
+
+inherit autotools gettext
+
+include apt-package.inc
+
+apt-manpages += "doc/vendors.list.5 \
+		 doc/fr/vendors.list.fr.5 \
+		 doc/es/vendors.list.es.5 \
+		 doc/de/apt.de.8"
diff --git a/packages/apt/apt_0.6.25.bb b/packages/apt/apt_0.6.25.bb
index e69de29bb2..a6f9f9e223 100644
--- a/packages/apt/apt_0.6.25.bb
+++ b/packages/apt/apt_0.6.25.bb
@@ -0,0 +1,11 @@
+include apt.inc
+
+PR = "r2"
+SRC_URI += "file://autofoo.patch;patch=1"
+
+inherit autotools gettext
+
+include apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 677ff0f4f7..39e63387af 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -58,7 +58,7 @@ do_install () {
 		install -m 2755 -d ${D}$d
 	done
 	for d in card cf net ram; do
-		ln -sf /media/$d ${D}mnt/$d
+		ln -sf /media/$d ${D}/mnt/$d
 	done
 
 	if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
@@ -138,15 +138,15 @@ do_install () {
 
 
 do_install_append_ramses () {
-	rmdir ${D}tmp
+	rmdir ${D}/tmp
 	mkdir -p ${D}${localstatedir}/tmp
-	ln -s var/tmp ${D}tmp
+	ln -s var/tmp ${D}/tmp
 }
 
 do_install_append_nylon() {
 	rm ${D}${sysconfdir}/resolv.conf
 	touch ${D}${sysconfdir}/resolv.conf
-	rm -r ${D}mnt/*
+	rm -r ${D}/mnt/*
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb
index 2c81cfb61d..9160fdd577 100644
--- a/packages/cdparanoia/cdparanoia_9.8alpha.bb
+++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb
@@ -2,6 +2,7 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
+PR="r1"
 LICENSE="GPL"
 
 SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \
@@ -12,8 +13,8 @@ S="${WORKDIR}/cdparanoia-III-alpha9.8"
 inherit autotools
 
 do_install() {
-	oe_runmake BINDIR="${D}usr/bin" MANDIR="${D}usr/share/man/" \
-		   INCLUDEDIR="${D}usr/include/" LIBDIR="${D}usr/lib" install 
+	oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
+		   INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install 
 }
 
 do_stage() {
diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb
index b459ee9204..37a630ca51 100644
--- a/packages/gdb/gdb_6.2.bb
+++ b/packages/gdb/gdb_6.2.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "gdb - GNU debugger"
 LICENSE="GPL"
 SECTION = "devel"
 PRIORITY = "optional"
+PR = "r1"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 
@@ -41,8 +42,8 @@ do_install () {
 	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
 	oe_runmake install \
 	    'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}${base_bindir}' \
-	    'sbindir=${D}${base_sbindir}' 'infodir=${D}share/info' 'libdir=${D}${base_libdir}' \
-	    'mandir=${D}share/man' 'includedir=${D}include'
+	    'sbindir=${D}${base_sbindir}' 'infodir=${D}/share/info' 'libdir=${D}${base_libdir}' \
+	    'mandir=${D}/share/man' 'includedir=${D}/include'
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index fe5a7680a8..bd2b7782b0 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -14,6 +14,8 @@ GLIBC_EXTRA_OECONF ?= ""
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_i686 = "0"
 DEFAULT_PREFERENCE_i586 = "0"
+DEFAULT_PREFERENCE_sh3 = "0"
+DEFAULT_PREFERENCE_sh4 = "0"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index e69de29bb2..da01f34b57 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -0,0 +1,179 @@
+DESCRIPTION = "GNU C Library"
+HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
+PR = "r0"
+
+GLIBC_ADDONS ?= "linuxthreads"
+GLIBC_EXTRA_OECONF ?= ""
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_i686 = "0"
+DEFAULT_PREFERENCE_i586 = "0"
+DEFAULT_PREFERENCE_sh3 = "0"
+DEFAULT_PREFERENCE_sh4 = "0"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+
+# nptl needs unwind support in gcc, which can't be built without glibc.
+PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
+DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
+INHIBIT_DEFAULT_DEPS = "1"
+
+libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
+
+FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "/lib/libSegFault*"
+FILES_glibc-extra-nss = "/lib/libnss*"
+FILES_sln = "/sbin/sln"
+FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_glibc-utils = "${bindir} ${sbindir}"
+FILES_glibc-gconv = "${libdir}/gconv"
+FILES_catchsegv = "${bindir}/catchsegv"
+DEPENDS_catchsegv = "libsegfault"
+FILES_glibc-pcprofile = "/lib/libpcprofile.so"
+FILES_glibc-thread-db = "/lib/libthread_db*"
+FILES_localedef = "${bindir}/localedef"
+RPROVIDES_glibc-dev += "libc-dev"
+
+#	   file://noinfo.patch;patch=1
+#	   file://ldconfig.patch;patch=1;pnum=0
+SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
+	   file://arm-ioperm.patch;patch=1;pnum=0 \
+	   file://fhs-linux-paths.patch;patch=1 \
+	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
+	   file://arm-memcpy.patch;patch=1;pnum=0 \
+	   file://arm-longlong.patch;patch=1;pnum=0 \
+	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+	   \
+           file://etc/ld.so.conf \
+	   file://generate-supported.mk"
+
+# seems to fail on tls platforms
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+
+SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+
+S = "${WORKDIR}/libc"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+	        --without-cvs --disable-profile --disable-debug --without-gd \
+		--enable-clocale=gnu \
+	        --enable-add-ons=${GLIBC_ADDONS} \
+		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+		--without-selinux \
+		${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+def get_glibc_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--without-fp"
+	return ""
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+	if [ -z "`which rpcgen`" ]; then
+		echo "rpcgen not found.  Install glibc-devel."
+		exit 1
+	fi
+	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+	CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+	  yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+	# this really is arm specific
+	touch ${S}/sysdeps/arm/framestate.c
+	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+	unset LDFLAGS
+	base_do_compile
+	(
+		cd ${S}/sunrpc/rpcsvc
+		for r in ${rpcsvc}; do
+			h=`echo $r|sed -e's,\.x$,.h,'`
+			rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+		done
+	)
+}
+
+do_stage() {
+	rm -f ${STAGING_LIBDIR}/libc.so.6
+	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
+		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		   '${STAGING_LIBDIR}/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${STAGING_INCDIR}/gnu \
+		   ${STAGING_INCDIR}/bits \
+		   ${STAGING_INCDIR}/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+	done
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+
+	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
+	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
+		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
+		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
+		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
+	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
+	done
+
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
+}
+
+include glibc-package.bbclass
diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb
index 1305c5dc90..f2ff82d8be 100644
--- a/packages/ipaq-boot-params/ipaq-boot-params.bb
+++ b/packages/ipaq-boot-params/ipaq-boot-params.bb
@@ -1,10 +1,11 @@
 FILES_${PN} = "/boot/params"
 
+PR = "r1"
 LICENSE = "MIT"
 SRC_URI = "file://params"
 
 do_install() {
-	install -d ${D}boot
-	install -m 0644 ${WORKDIR}/params ${D}boot/
+	install -d ${D}/boot
+	install -m 0644 ${WORKDIR}/params ${D}/boot/
 }
 
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
index d08a1fc806..fe43ff488e 100644
--- a/packages/iptables/iptables_1.2.9.bb
+++ b/packages/iptables/iptables_1.2.9.bb
@@ -1,6 +1,7 @@
 SECTION = "console/network"
 DESCRIPTION = "iptables network filtering tools"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
 
@@ -11,10 +12,10 @@ export KERNEL_DIR = "${STAGING_INCDIR}"
 
 do_compile () {
 	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}usr/man NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man NO_SHARED_LIBS=1
 }
 
 do_install () {
 #	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}usr/man install NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man install NO_SHARED_LIBS=1
 }
diff --git a/packages/irk/irk_0.11.bb b/packages/irk/irk_0.11.bb
index 687dee3b50..d21029807b 100644
--- a/packages/irk/irk_0.11.bb
+++ b/packages/irk/irk_0.11.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php"
 DEPENDS = "virtual/libqpe lirc"
 RCONFLICTS = "irk-belkin"
 RREPLACES = "irk-belkin"
-PR = "r1"
+PR = "r2"
 REALV = "0.11.0"
 
 SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${REALV}.tgz"
@@ -20,7 +20,7 @@ EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc"
 do_install() {
 	install -d ${D}${sysconfdir}
 	install -d ${D}${palmtopdir}/plugins/inputmethods/
-	install -d ${D}home/root/Settings/
+	install -d ${D}/home/root/Settings/
 
 	install chicony.conf ${D}${sysconfdir}/lircd.conf
 	install IRK.conf ${D}${sysconfdir}
diff --git a/packages/lame/lame_3.96.1.bb b/packages/lame/lame_3.96.1.bb
index e69de29bb2..b732a8cb23 100644
--- a/packages/lame/lame_3.96.1.bb
+++ b/packages/lame/lame_3.96.1.bb
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+DESCRIPTION = "Not an MP3 encoder"
+LICENSE = "LGPL"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
+	file://no-gtk1.patch;patch=1"
+
+inherit autotools
+
+PACKAGES += "libmp3lame libmp3lame-dev"
+FILES_${PN} = "${bindir}/lame"
+FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
+FILES_libmp3lame-dev = "${includedir} ${libdir}"
+FILES_${PN}-dev = ""
+
+do_configure() {
+	# no autoreconf please
+	aclocal
+	autoconf
+	libtoolize --force
+	oe_runconf
+}
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	oe_libinstall -C libmp3lame -so -a libmp3lame ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/lame
+	install -m 0644 include/lame.h ${STAGING_INCDIR}/lame/
+}
diff --git a/packages/linux-uml/linux-uml_2.4.26.bb b/packages/linux-uml/linux-uml_2.4.26.bb
index f2b8d24255..efcb228396 100644
--- a/packages/linux-uml/linux-uml_2.4.26.bb
+++ b/packages/linux-uml/linux-uml_2.4.26.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "User Mode Linux Kernel"
 LICENSE = "GPL"
 UMLR = "2"
-PR = "0"
+PR = "1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;patch=1 \
@@ -36,8 +36,8 @@ do_compile() {
 do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}boot
-        install -m 0755 linux ${D}boot/linux-${PV}
-        install -m 0644 System.map ${D}boot/System.map-${PV}
-        install -m 0644 .config ${D}boot/config-${PV}
+        install -d ${D}/boot
+        install -m 0755 linux ${D}/boot/linux-${PV}
+        install -m 0644 System.map ${D}/boot/System.map-${PV}
+        install -m 0644 .config ${D}/boot/config-${PV}
 }
diff --git a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
index e66b9620ed..b7ef49c0f4 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
@@ -6,7 +6,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 RCV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
 MMV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 LV = "2.6.10"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \
            http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \
@@ -51,8 +51,8 @@ do_stage_prepend() {
 do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         #oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}boot
-        install -m 0755 linux ${D}boot/linux-${PV}
-        install -m 0644 System.map ${D}boot/System.map-${PV}
-        install -m 0644 .config ${D}boot/config-${PV}
+        install -d ${D}/boot
+        install -m 0755 linux ${D}/boot/linux-${PV}
+        install -m 0644 System.map ${D}/boot/System.map-${PV}
+        install -m 0644 .config ${D}/boot/config-${PV}
 }
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index e062af29ee..8f59854c32 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 KV = "2.4.21"
 RMKV = "2"
 PXAV = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 	   ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
@@ -56,10 +56,10 @@ kernel_do_install() {
 	else
 		oenote "no modules to install"
 	fi
-	install -d ${D}tmp
-	install -m 0644 ${KERNEL_OUTPUT} ${D}tmp
-	install -d ${D}boot
-	install -m 0644 .config ${D}boot/config-${PV}
-	bzip2 -9 ${D}boot/*
+	install -d ${D}/tmp
+	install -m 0644 ${KERNEL_OUTPUT} ${D}/tmp
+	install -d ${D}/boot
+	install -m 0644 .config ${D}/boot/config-${PV}
+	bzip2 -9 ${D}/boot/*
 	install -d ${D}${sysconfdir}/modutils
 }
diff --git a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
index 4cd87bba34..a23cd4bfb8 100644
--- a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "kernel"
 DEPENDS = "virtual/kernel"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/lirc"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/lirc;module=lirc;date=20040918;method=pserver \
@@ -28,7 +28,7 @@ do_compile() {
 
 fakeroot do_install() {
 	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
-	rm -rf ${D}dev
+	rm -rf ${D}/dev
 }
 
 FILES_${PN}="/lib/modules"
diff --git a/packages/lirc/lirc-modules_0.7.0.bb b/packages/lirc/lirc-modules_0.7.0.bb
index c87fe06a98..fa6cd3ba0b 100644
--- a/packages/lirc/lirc-modules_0.7.0.bb
+++ b/packages/lirc/lirc-modules_0.7.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
            file://lirc_sir-sa1100.patch;patch=1"
@@ -27,7 +27,7 @@ do_compile() {
 
 fakeroot do_install() {
 	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
-	rm -rf ${D}dev
+	rm -rf ${D}/dev
 }
 
 pkg_postinst() {
diff --git a/packages/makedev/makedev_2.3.1.bb b/packages/makedev/makedev_2.3.1.bb
index 635bd38d22..317840f8ed 100644
--- a/packages/makedev/makedev_2.3.1.bb
+++ b/packages/makedev/makedev_2.3.1.bb
@@ -1,4 +1,5 @@
 LICENSE = "makedev"
+PR = "r1"
 SECTION = "base"
 DESCRIPTION = "The MAKEDEV executable is used to create \
 device files, often in /dev."
@@ -7,8 +8,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/m/makedev/makedev_${PV}.orig.tar.gz"
 S = "${WORKDIR}/makedev-${PV}.orig"
 
 do_install () {
-	install -d ${D}dev ${D}${mandir}/man8
-	install -m 0755 MAKEDEV ${D}dev/MAKEDEV
+	install -d ${D}/dev ${D}${mandir}/man8
+	install -m 0755 MAKEDEV ${D}/dev/MAKEDEV
 	install -m 0644 MAKEDEV.man ${D}${mandir}/man8/MAKEDEV.8
 }
 
diff --git a/packages/maradns/maradns_1.0.23.bb b/packages/maradns/maradns_1.0.23.bb
index 5fbbed546d..f70746c56e 100644
--- a/packages/maradns/maradns_1.0.23.bb
+++ b/packages/maradns/maradns_1.0.23.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "A security-aware DNS server"
 HOMEPAGE = "http://www.maradns.org"
 LICENSE = "PD"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+PR = "r1"
 
 SRC_URI = "http://www.maradns.org/download/maradns-${PV}.tar.bz2 \
 	file://init \
@@ -26,7 +27,7 @@ do_install() {
                 TOPLEVEL=${S} \
                 BUILDDIR=${S}/build \
                 RPM_BUILD_ROOT=${D} \
-                PREFIX=${D}usr \
+                PREFIX=${D}/usr \
                 MAN1=${D}${mandir}/man1 \
                 MAN5=${D}${mandir}/man5 \
                 MAN8=${D}${mandir}/man8 \
diff --git a/packages/module-init-tools/module-init-tools_3.1.bb b/packages/module-init-tools/module-init-tools_3.1.bb
index ac4f50fa3b..5355509f70 100644
--- a/packages/module-init-tools/module-init-tools_3.1.bb
+++ b/packages/module-init-tools/module-init-tools_3.1.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
 removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
+PR = "r1"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -27,7 +28,7 @@ inherit autotools
 do_install() {
 	autotools_do_install
 	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
-		mv ${D}$f ${D}$f.26
+		mv ${D}/$f ${D}/$f.26
 	done
 }
 
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index c260d651b9..0b7463240c 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
 manageable for all users, administrators and distribution maintainers."
 LICENSE = "GPLv2"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
            file://lex.l.diff;patch=1 \
@@ -26,7 +26,7 @@ do_install () {
 	rm ${D}${base_sbindir}/lsmod
 	install -d ${D}${base_bindir}/
 	ln -s ../sbin/insmod ${D}${base_bindir}/lsmod
-        for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do                mv ${D}$f ${D}$f.24
+        for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do                mv ${D}/$f ${D}/$f.24
         done
 }
 
diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb
index 4a7db96d5e..4b8b4005cc 100644
--- a/packages/mythfront/mythfront-config.bb
+++ b/packages/mythfront/mythfront-config.bb
@@ -1,4 +1,5 @@
 PV = "1.7"
+PR = "r1"
 
 DEPENDS = "xfonts-xorg"
 RDEPENDS_${PN} = "xfonts-xorg"
@@ -19,8 +20,8 @@ do_install() {
 
 	ln -sf /var/lib/config/lircd.conf ${D}${sysconfdir}/lircd.conf
 
-	install -d ${D}dev
-	ln -sf lirc0 ${D}dev/lirc
+	install -d ${D}/dev
+	ln -sf lirc0 ${D}/dev/lirc
 
 	if [ -f ${WORKDIR}/serial.sh ]; then
 		install -d ${D}${sysconfdir}/init.d
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index e93749e7f2..1840f4fc53 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -5,15 +5,16 @@ PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
 PV = "cvs${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "svn://meshcube.org/svn/application;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
 
 do_install() {
-	install -d ${D}srv/www/cgi-bin
+	install -d ${D}/srv/www/cgi-bin
 	install -d ${D}${sbindir}
-	ln -s /var/tmp ${D}srv/www/rrd-img
-	install -m 755 ${S}/*.html ${D}srv/www/cgi-bin
+	ln -s /var/tmp ${D}/srv/www/rrd-img
+	install -m 755 ${S}/*.html ${D}/srv/www/cgi-bin
 	install -m 755 ${S}/collect.sh ${D}${sbindir}
 }
 
@@ -35,4 +36,4 @@ else
 fi
 }
 
-FILES_${PN} += "/srv"
\ No newline at end of file
+FILES_${PN} += "/srv"
diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
index ad948c23f4..9569084eb1 100644
--- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
 LICENSE = "GPL"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://icon-reload.desktop \
 	   file://icon-reload.sh \
@@ -13,12 +13,12 @@ SRC_URI = "file://icon-reload.desktop \
 FILES_${PN} += "/opt"
 
 do_install() {		
-	install -d ${D}opt/QtPalmtop/apps/Settings
-	install -d ${D}opt/QtPalmtop/bin
-	install -d ${D}opt/QtPalmtop/pics
+	install -d ${D}${palmtopdir}/apps/Settings
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/pics
 	
-	install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}opt/QtPalmtop/apps/Settings
-	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}opt/QtPalmtop/bin
-	install -m 0644 ${WORKDIR}/reload.png ${D}opt/QtPalmtop/pics	
+	install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings
+	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin
+	install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics	
 }
 
diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
index 4fe14863e9..a49a025fc0 100644
--- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 RDEPENDS = "opie-sh"
 
 
-PR = "r1"
+PR = "r2"
 
 FILES_${PN} = "/opt/QtPalmtop"
 
@@ -20,10 +20,10 @@ do_install() {
 
 	for dir in apps apps/Games bin pics
 	do
-		install -d ${D}opt/QtPalmtop/$dir
+		install -d ${D}${palmtopdir}/$dir
 	done
 	
-	install -m 755 ${WORKDIR}/opie-sh-snes.sh ${D}opt/QtPalmtop/bin
-	install -m 644 ${WORKDIR}/*.png ${D}opt/QtPalmtop/pics
-	install -m 644 ${WORKDIR}/*.desktop ${D}opt/QtPalmtop/apps/Games
+	install -m 755 ${WORKDIR}/opie-sh-snes.sh ${D}${palmtopdir}/bin
+	install -m 644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics
+	install -m 644 ${WORKDIR}/*.desktop ${D}${palmtopdir}/apps/Games
 }	   
diff --git a/packages/oz-compat/oz-compat_0.5.bb b/packages/oz-compat/oz-compat_0.5.bb
index 81b83fb414..28eef2681c 100644
--- a/packages/oz-compat/oz-compat_0.5.bb
+++ b/packages/oz-compat/oz-compat_0.5.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 RDEPENDS = "opie-sh"
 MAINTAINER = "Tim Ansell <mithro AT mithis.net>"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 EXCLUDE_FROM_WORLD = "1"
 
@@ -20,33 +20,33 @@ INITSCRIPT_NAME = "quickexec"
 INITSCRIPT_PARAMS = "defaults 10"
 
 do_install() {
-	install -d ${D}opt/QtPalmtop/apps/Settings
-	install -d ${D}opt/QtPalmtop/bin/
-	install -d ${D}opt/QtPalmtop/etc/
-	install -d ${D}opt/QtPalmtop/pics/
+	install -d ${D}${palmtopdir}/apps/Settings
+	install -d ${D}${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/etc/
+	install -d ${D}${palmtopdir}/pics/
 	
-	install -d ${D}opt/QtPalmtop.compat/bin
-	install -d ${D}opt/QtPalmtop.compat/binlib
-	install -d ${D}opt/QtPalmtop.compat/lib
+	install -d ${D}/opt/QtPalmtop.compat/bin
+	install -d ${D}/opt/QtPalmtop.compat/binlib
+	install -d ${D}/opt/QtPalmtop.compat/lib
 	
 	install -d ${D}${sysconfdir}/init.d
 	
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}opt/QtPalmtop/apps/Settings		
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}opt/QtPalmtop/etc/quickexec.libs
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}opt/QtPalmtop/pics/libraries.png
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}${palmtopdir}/apps/Settings		
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}${palmtopdir}/etc/quickexec.libs
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}${palmtopdir}/pics/libraries.png
 	
-	install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}opt/QtPalmtop.compat/bin
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}opt/QtPalmtop.compat/lib
+	install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}/opt/QtPalmtop.compat/bin
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}/opt/QtPalmtop.compat/lib
 	
 	install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}${sysconfdir}/init.d
 			
-	cd ${D}opt/QtPalmtop/bin
+	cd ${D}${palmtopdir}/bin
 	for file in chkhinge makecompat qeserver quickexec runcompat
 	do
 		ln -s /opt/QtPalmtop.compat/bin/$file
 	done
 	
-	cd ${D}opt/QtPalmtop.compat/lib
+	cd ${D}/opt/QtPalmtop.compat/lib
 	ln -s libqpe.so.1.5.0 libqpe.so.1.5
 	ln -s libqpe.so.1.5.0 libqpe.so.1
 	ln -s libqpe.so.1.5.0 libqpe.so
diff --git a/packages/perl/perl_5.8.3.bb b/packages/perl/perl_5.8.3.bb
index 465ef99c3b..8e1c4974a7 100644
--- a/packages/perl/perl_5.8.3.bb
+++ b/packages/perl/perl_5.8.3.bb
@@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL"
 SECTION = "devel"
 PRIORITY = "optional"
 DEPENDS = "db3 perl-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
 	file://Makefile.patch;patch=1 \
@@ -22,7 +22,7 @@ do_configure() {
 	rm Makefile.SH.patch
 	cp ${WORKDIR}/Makefile.SH.patch .
 	cp ${WORKDIR}/config.sh-mipsel-linux .
-	cat config.sh-${TARGET_ARCH}-${TARGET_OS} | sed -e's,./install_me_here,${D},g' > config.sh-${TARGET_ARCH}-${TARGET_OS}.new
+	cat config.sh-${TARGET_ARCH}-${TARGET_OS} | sed -e's,./install_me_here,${D}/,g' > config.sh-${TARGET_ARCH}-${TARGET_OS}.new
 	mv config.sh-${TARGET_ARCH}-${TARGET_OS}.new config.sh-${TARGET_ARCH}-${TARGET_OS}
 	rm -f config
 	echo "ARCH = ${TARGET_ARCH}" > config
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index de339235c9..d8bf66873d 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.gz \
            file://gcc3.patch;patch=1"
@@ -20,7 +20,7 @@ do_install() {
 			   
 		install -m 644 pkg-pcellar/home/QtPalmtop/data/PocketCellar/* ${D}${palmtopdir}/data/PocketCellar/
 # BAD.  packages -never- install files into home directories.  ever. --CL
-#	cp -a pkg-pcellar/home/root/Settings/* ${D}home/root/Settings/
+#	cp -a pkg-pcellar/home/root/Settings/* ${D}/home/root/Settings/
         install -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}/bin/
         install -m 644 pocketcellar.desktop ${D}${palmtopdir}/apps/Applications/
         install -m 644 pocketcellar.png ${D}${palmtopdir}/pics/
diff --git a/packages/prism3-support/prism3-support_0.1.bb b/packages/prism3-support/prism3-support_0.1.bb
deleted file mode 100644
index e263d9f11a..0000000000
--- a/packages/prism3-support/prism3-support_0.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "meta-package for prism3 support through ifupdown and hostap_fw_load"
-SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "prism3-firmware hostap-utils"
-RDEPENDS = "prism3-firmware hostap-utils"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r0"
-
-do_install() {
-	install -d ${D}${sysconfdir}/network/if-pre-up.d/
-	cat >${D}${sysconfdir}/network/if-pre-up.d/hostap-fw-load <<EOF
-#!/bin/sh
-                                                       
-# Special case for prism3 cards needing firmware upload
-# Add more known manfids, if necessary          
-                                                       
-if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then
-  iwpriv "$IFACE" reset 1                             
-  hostap_fw_load "$IFACE"  
-fi                      
-  
-# lets hope that run-parts obeys the order :D
-EOF
-	chmod a+rx ${D}${sysconfdir}/network/if-pre-up.d/hostap-fw-load
-}
-
diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prism3-support/prism3-support_1.0.0.bb
diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb
index d1c9f458c2..bea4ae1a1e 100644
--- a/packages/rrdtool/rrdtool_1.0.49.bb
+++ b/packages/rrdtool/rrdtool_1.0.49.bb
@@ -3,6 +3,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool"
 LICENSE = "GPLv2"
 DEPENDS = "libpng zlib"
+PR = "r1"
 SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-${PV}.tar.gz \
 	file://perl-make-options.diff;patch=1;pnum=0"
 
@@ -12,12 +13,12 @@ EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --prog
 
 do_install_append() {
 	install -d ${D}${docdir}/rrdtool/
-	mv ${D}usr/html ${D}${docdir}/rrdtool/
-	mv ${D}usr/doc/* ${D}${docdir}/rrdtool/
-	mv ${D}usr/examples ${D}${docdir}/rrdtool/
-	mv ${D}usr/contrib ${D}${docdir}/rrdtool/
+	mv ${D}/usr/html ${D}${docdir}/rrdtool/
+	mv ${D}/usr/doc/* ${D}${docdir}/rrdtool/
+	mv ${D}/usr/examples ${D}${docdir}/rrdtool/
+	mv ${D}/usr/contrib ${D}${docdir}/rrdtool/
 }
 
 FILES_${PN} += "${libdir}/perl"
 
-DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
\ No newline at end of file
+DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
diff --git a/packages/setserial/setserial_2.17.bb b/packages/setserial/setserial_2.17.bb
index 3cb11dba32..5d774ff6a3 100644
--- a/packages/setserial/setserial_2.17.bb
+++ b/packages/setserial/setserial_2.17.bb
@@ -1,11 +1,12 @@
 SECTION = "console/utils"
 SRC_URI = "ftp://tsx-11.mit.edu/pub/linux/sources/sbin/setserial-2.17.tar.gz"
 LICENSE = "GPL"
+PR = "r1"
 inherit autotools
 
 do_install() {
 	install -d ${D}${base_bindir}
-	install -d ${D}usr/man/man8
+	install -d ${D}/usr/man/man8
 	install -d ${D}${mandir}
 	autotools_do_install
 }
diff --git a/packages/tinylogin/tinylogin_1.4.bb b/packages/tinylogin/tinylogin_1.4.bb
index 99ea0f6d07..33f1c32aed 100644
--- a/packages/tinylogin/tinylogin_1.4.bb
+++ b/packages/tinylogin/tinylogin_1.4.bb
@@ -5,7 +5,7 @@ changing passwords, and otherwise maintaining users \
 and groups on an embedded system."
 HOMEPAGE = "http://tinylogin.busybox.net/"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
 	file://cvs-20040608.patch;patch=1;pnum=1 \
@@ -22,7 +22,7 @@ do_install () {
 	install -d ${D}${base_bindir}
 	install -m 4755 tinylogin ${D}${base_bindir}/tinylogin
 	for i in `cat tinylogin.links`; do
-		mkdir -p ${D}`dirname $i`
+		mkdir -p ${D}/`dirname $i`
 		ln -sf /bin/tinylogin ${D}$i
 	done
 }
diff --git a/packages/uae/e-uae_0.8.27.bb b/packages/uae/e-uae_0.8.27.bb
index 7b66d45164..60b9b7d8e9 100644
--- a/packages/uae/e-uae_0.8.27.bb
+++ b/packages/uae/e-uae_0.8.27.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
            file://configure.patch;patch=1"
@@ -30,6 +31,6 @@ do_install_append() {
 # Either update a global config in /etc, install it into /etc/skel/ for
 # new users homedirs, rely on the user installing it to put it in place,
 # or dont install it at all.  --CL
-#	install -d ${D}home/root
-#	install ${FILESDIR}/uaerc ${D}home/root/.uaerc
+#	install -d ${D}/home/root
+#	install ${FILESDIR}/uaerc ${D}/home/root/.uaerc
 }
diff --git a/packages/uae/uae_0.8.23-20040129.bb b/packages/uae/uae_0.8.23-20040129.bb
index 10dd840283..c8e1d2fc47 100644
--- a/packages/uae/uae_0.8.23-20040129.bb
+++ b/packages/uae/uae_0.8.23-20040129.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://rcdrummond.net/uae/uae-${PV}/uae-${PV}.tar.bz2 \
            file://configure.patch;patch=1 \
@@ -30,6 +31,6 @@ do_install_append() {
 # Either update a global config in /etc, install it into /etc/skel/ for
 # new users homedirs, rely on the user installing it to put it in place,
 # or dont install it at all.  --CL
-#	install -d ${D}home/root
-#	install ${FILESDIR}/uaerc ${D}home/root/.uaerc
+#	install -d ${D}/home/root
+#	install ${FILESDIR}/uaerc ${D}/home/root/.uaerc
 }
diff --git a/packages/uclibc/uclibc-0.9.26/sh3/uClibc.config b/packages/uclibc/uclibc-0.9.26/sh3/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.26/sh3/uClibc.config
diff --git a/packages/uclibc/uclibc-0.9.27/sh3/uClibc.config b/packages/uclibc/uclibc-0.9.27/sh3/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.27/sh3/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/sh3/uClibc.config b/packages/uclibc/uclibc-cvs/sh3/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-cvs/sh3/uClibc.config
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index a308926b86..04b5492da3 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -152,16 +152,23 @@ do_install() {
 	# This conflicts with the c++ version of this header
 	rm -f ${D}${prefix}/include/bits/atomicity.h
 
-	install -d ${D}${includedir}
-	mv ${D}${prefix}/include/* ${D}${includedir}/
-	rmdir ${D}${prefix}/include
-
-	install -d ${D}${libdir}
-	mv ${D}${prefix}/lib/* ${D}${libdir}/
-	rmdir ${D}${prefix}/lib
-
-	install -d ${D}${bindir}
-	mv ${D}usr/bin/* ${D}${bindir}/
-	rmdir ${D}usr/bin
+	# ugh.. uclibc doesn't like obeying our path variables.
+	if [ "${includedir}" != "${prefix}/include" ]; then
+		install -d ${D}${includedir}
+		mv ${D}${prefix}/include/* ${D}${includedir}/
+		rmdir ${D}${prefix}/include
+	fi
+
+	if [ "${libdir}" != "${prefix}/lib" ]; then
+		install -d ${D}${libdir}
+		mv ${D}${prefix}/lib/* ${D}${libdir}/
+		rmdir ${D}${prefix}/lib
+	fi
+
+	if [ "${bindir}" != "/usr/bin" ]; then
+		install -d ${D}${bindir}
+		mv ${D}/usr/bin/* ${D}${bindir}/
+		rmdir ${D}/usr/bin
+	fi
 }
 
diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb
index 6dd5f28465..57f89be868 100644
--- a/packages/uclibc/uclibc_0.9.26.bb
+++ b/packages/uclibc/uclibc_0.9.26.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 include uclibc.inc
 
diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb
index e69de29bb2..96b1d34594 100644
--- a/packages/uclibc/uclibc_0.9.27.bb
+++ b/packages/uclibc/uclibc_0.9.27.bb
@@ -0,0 +1,9 @@
+DEFAULT_PREFERENCE = "1"
+PR = "r1"
+
+include uclibc.inc
+
+SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
+            file://dyn-ldconfig.patch;patch=1 \
+            file://nokernelheadercheck.patch;patch=1"
+S = "${WORKDIR}/uClibc-${PV}"
diff --git a/packages/uclibc/uclibc_cvs.bb b/packages/uclibc/uclibc_cvs.bb
index 954ad645f4..c7adc07c4e 100644
--- a/packages/uclibc/uclibc_cvs.bb
+++ b/packages/uclibc/uclibc_cvs.bb
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-PR = "r7"
+PR = "r8"
 
 include uclibc.inc
 
diff --git a/packages/xprint/xprint_0.9.001.bb b/packages/xprint/xprint_0.9.001.bb
index ce6c36b77e..fa7f617c71 100644
--- a/packages/xprint/xprint_0.9.001.bb
+++ b/packages/xprint/xprint_0.9.001.bb
@@ -1,5 +1,6 @@
 SECTION = "x11/base"
 LICENSE = "BSD-X"
+PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/xprint/xprint_mozdev_org_source-2004-07-07-release_009_001.tar.gz \
 	file://imake-staging.patch;patch=1"
 
@@ -22,7 +23,7 @@ do_compile() {
 do_install() {
 	make -C programs/Xserver DESTDIR="${D}" install
 	install -d ${D}${bindir}/
-	mv ${D}usr/X11R6/bin/* ${D}${bindir}/
-	rmdir ${D}usr/X11R6/bin/
+	mv ${D}/usr/X11R6/bin/* ${D}${bindir}/
+	rmdir ${D}/usr/X11R6/bin/
 }
 
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index 00ce146ff4..efb80ae9be 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -10,6 +10,7 @@ SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
 DESCRIPTION="*The* screensaver package for X11"
 LICENSE="BSD"
 HOMEPAGE="http://www.jwz.org/xscreensaver/"
+PR = "r1"
 SECTION="x11-misc"
 
 DEPENDS="intltool x11 gtk+ libxml2 libglade"
@@ -43,8 +44,8 @@ do_install() {
 	oe_runmake -C ${S}/hacks install_prefix=${D} install-program
 
 	# Install the defaults file
-	install -d ${D}usr/X11R6/lib/X11/app-defaults
-	install -m 0644 ${WORKDIR}/XScreenSaver ${D}usr/X11R6/lib/X11/app-defaults
+	install -d ${D}/usr/X11R6/lib/X11/app-defaults
+	install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
 }
 
 python populate_packages_prepend () {
diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb
index aba2bf2fd6..6eab86dbd8 100644
--- a/packages/zmerlin/zmerlin_0.9.1.bb
+++ b/packages/zmerlin/zmerlin_0.9.1.bb
@@ -3,6 +3,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://user.cs.tu-berlin.de/~karlb/zmerlin/zmerlin.tar.gz"
 S = "${WORKDIR}/zmerlin"
@@ -12,6 +13,6 @@ inherit palmtop
 do_install() {
         install -m 0755 zmerlin ${S}/ipk${palmtopdir}/bin/zmerlin
 	install -d ${D}${palmtopdir}/
-        cp -a ipk/opt/* ${D}opt
+        cp -a ipk/opt/* ${D}/opt
 }
 
diff --git a/packages/ztappy/ztappy_0.9.1.bb b/packages/ztappy/ztappy_0.9.1.bb
index 62883f2404..b204cc1c03 100644
--- a/packages/ztappy/ztappy_0.9.1.bb
+++ b/packages/ztappy/ztappy_0.9.1.bb
@@ -3,6 +3,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://user.cs.tu-berlin.de/~karlb/ztappy/ztappy.tar.gz"
 S = "${WORKDIR}/ztappy"
@@ -12,6 +13,6 @@ inherit palmtop
 do_install() {
         install -m 0755 ${PN} ${S}/ipk${palmtopdir}/bin/${PN}
 	install -d ${D}${palmtopdir}/
-        cp -a ipk/opt/* ${D}opt
+        cp -a ipk/opt/* ${D}/opt
 }