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

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

2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.

2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass.  Thanks to Jordan Crouse for reporting.

2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.

2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references.  As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.

2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.

BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg

216 files changed, 5320 insertions, 517 deletions

diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb
index e69de29bb2..f303232f26 100644
--- a/packages/appweb/appweb_1.2.0.bb
+++ b/packages/appweb/appweb_1.2.0.bb
@@ -0,0 +1,110 @@
+DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
+LICENSE="GPL"
+SRC_URI = "http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz \
+	   file://makerules.patch;patch=1 \
+	   file://nonrootinstall.patch;patch=1"
+S = "${WORKDIR}/appWeb-1.2.0"
+
+APPWEB_HOST = "${HOST_SYS}"
+APPWEB_BUILD = "${BUILD_SYS}"
+#  --buildNumber=NUMBER     Set the build number part of the version (1.0.0.X).
+#  --name=NAME              Set the full product name (BLD_NAME define).
+#  --port=PORT              Set the default HTTP port to use for the product.
+#  --product=NAME           Set the one word (no spaces) name of the product.
+#  --setLibVersion=X.X.X    Set the shared library version number.
+#  --setVersion=X.X.X       Set the product version number.
+#  --sslPort=PORT           Set the default SSL port to use for the product.
+#  --type=BUILD             Set the build type (DEBUG|RELEASE).
+#
+#  --enable-access-log      Enable logging of requests to the AppWeb access log.
+#  --enable-assert          Build with assert checking.
+#  --enable-config          Build with the ability to parse Apache-style config
+#  --enable-cookie          Build with cookie handling support.
+#  --enable-digest-auth     Build with digest authentication support.
+#  --enable-fast-malloc     Build with the Mbedthis fast malloc.
+#  --enable-if-modified     Build with HTTP If-Modified checking.
+#  --enable-keep-alive      Build with HTTP Keep-Alive support.
+#  --enable-log             Build with the AppWeb trace log facility.
+#  --enable-modules         Build with the dynamically loaded modules capability.
+#  --enable-multi-thread    Build AppWeb multi-threaded.
+#  --disable-multi-thread   Build AppWeb single threaded.
+#  --enable-rom-fs          Build with the ability to load web pages from ROM.
+#  --enable-run-as-service  Build with the ability to run as a service/daemon.
+#  --disable-run-as-service Do not include the ability to run as a service.
+#  --enable-safe-strings    Enforce safe string handling.
+#  --enable-session         Build with HTTP session support.
+#  --enable-shared          Build an appWeb shared library and program. [default]
+#  --enable-shared-libc     Link with the shared versions of libc.
+#  --disable-shared-libc    Link with the static versions of libc.
+#  --enable-squeeze         Build in squeeze mode for minimal memory footprint.
+#  --disable-squeeze        Build for speed.
+#  --enable-static          Build a static appWeb library and program. [default]
+#  --disable-static         Do not build a static appWeb library and program.
+#
+#  --with-admin             Include the admin handler.
+#  --with-auth              Include the authorization handler.
+#  --with-c_api             Include the C API.
+#  --with-cgi               Include the CGI handler.
+#  --with-gacompat          Include GoAhead WebServer API compatibility.
+#  --with-copy              Build support for the copy handler.
+#  --with-egi               Include the EGI handler.
+#  --with-esp               Include the ESP handler.
+#  --with-ssl               Build support for the SSL protocol.
+#  --with-upload            Build with the file upload handler
+#  --with-xdb               Build with XDB 
+#  Supported PACKAGE names: openssl, php4, php5
+#  --with-PACKAGE=[builtin|, module]       
+#                           Include support for the PACKAGE. Link into appWeb 
+#                           statically and/or build as a module
+#  --with-PACKAGE-dir=DIR   Set the source directory of the package
+#  --with-PACKAGE-libs=libs Set a list of libraries to use when linking with
+#                             the PACKAGE
+#  --without-PACKAGE        Do not include support for the PACKAGE
+EXTRA_OECONF = "--prefix=${prefix} \
+		--docDir=${docdir}/${P} \
+		--incDir=${includedir} \
+		--libDir=${libdir} \
+		--sbinDir=${sbindir} \
+		--webDir=${localstatedir}/www \
+		--build=${APPWEB_BUILD} \
+		--host=${APPWEB_HOST} \
+		--enable-keep-alive \
+		--enable-multi-thread \
+		--with-cgi=builtin \
+		--enable-cookie \
+		--enable-config \
+		--enable-digest-auth \
+		--without-ssl"
+
+export IFLAGS = "${CPPFLAGS}"
+export CC_FOR_BUILD = "${BUILD_CC}"
+export LD_FOR_BUILD = "${BUILD_LD}"
+
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
+do_configure () {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake build
+	oe_runmake compile
+}
+
+do_stage () {
+	:
+}
+
+do_install () {
+	oe_runmake 'PKG_DIR=${D}' install-all
+}
+
+#do_install () {
+#	install -d ${D}/${sbindir} ${D}/${sysconfdir}/appWeb/lib \
+#		   ${D}/${libexecdir}/appWeb ${D}/${libdir}
+#	install -m 0755 appWeb/appWeb ${D}/${sbindir}/
+#	install -m 0644 appWeb/appWeb.conf ${D}/${sysconfdir}/appWeb/
+#	install -m 0755 bin/${APPWEB_OS}/* ${D}/${libexecdir}/appWeb/
+#	install -m 0755 lib/lib*.so* ${D}/${sysconfdir}/appWeb/lib/
+#}
diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index e69de29bb2..a3ccc82e01 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -0,0 +1,99 @@
+apt-manpages="doc/apt-cache.8 \
+	      doc/apt-cdrom.8 \
+	      doc/apt-config.8 \
+	      doc/apt-get.8 \
+	      doc/apt.8 \
+	      doc/apt.conf.5 \
+	      doc/apt_preferences.5 \
+	      doc/fr/apt-cache.fr.8 \
+	      doc/fr/apt-cdrom.fr.8 \
+	      doc/fr/apt-config.fr.8 \
+	      doc/fr/apt-get.fr.8 \
+	      doc/fr/apt.conf.fr.5 \
+	      doc/fr/apt_preferences.fr.5 \
+	      doc/fr/sources.list.fr.5 \
+	      doc/es/apt.es.8 \
+	      doc/es/apt-cache.es.8 \
+	      doc/es/apt-cdrom.es.8 \
+	      doc/es/apt-config.es.8 \
+	      doc/es/apt-get.es.8 \
+	      doc/es/apt.conf.es.5 \
+	      doc/es/apt_preferences.es.5 \
+	      doc/es/sources.list.es.5 \
+	      doc/pt_BR/apt_preferences.pt_BR.5 \
+	      doc/ja/apt-cache.ja.8 \
+	      doc/ja/apt-cdrom.ja.8 \
+	      doc/ja/apt-get.ja.8 \
+	      doc/ja/apt.conf.ja.5 \
+	      doc/sources.list.5"
+apt-utils-manpages="doc/apt-extracttemplates.1 \
+		    doc/apt-sortpkgs.1 \
+		    doc/fr/apt-extracttemplates.fr.1 \
+		    doc/fr/apt-sortpkgs.fr.1"
+#		    doc/fr/apt-ftparchive.fr.1
+#		    doc/apt-ftparchive.1
+
+def get_files_apt_doc(d, bb, manpages):
+	import re
+	manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages)
+	manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\3/\1.\3', manpages)
+	return manpages
+
+def get_commands_apt_doc(d, bb, manpages):
+	import os
+	s = list()
+	__dir_cache__ = list()
+	for m in manpages.split():
+		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)
+			__dir_cache__.append(dir)
+		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
+	return "\n".join(s)
+
+PACKAGES += "${PN}-utils ${PN}-utils-doc"
+FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
+	       ${bindir}/apt-config ${bindir}/apt-cache \
+	       ${libdir}/apt ${libdir}/libapt*.so.* \
+	       ${localstatedir} ${sysconfdir} \
+	       ${libdir}/dpkg"
+FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
+FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \
+		   ${docdir}/apt"
+FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}"
+FILES_${PN}-dev = "${libdir}/libapt*.so"
+
+do_install () {
+	${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))}
+	${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}
+	install -d ${D}/${bindir}
+	install -m 0755 bin/apt-cdrom ${D}/${bindir}/
+	install -m 0755 bin/apt-get ${D}/${bindir}/
+	install -m 0755 bin/apt-config ${D}/${bindir}/
+	install -m 0755 bin/apt-cache ${D}/${bindir}/
+
+	install -m 0755 bin/apt-sortpkgs ${D}/${bindir}/
+	install -m 0755 bin/apt-extracttemplates ${D}/${bindir}/
+
+	oe_libinstall -so -C bin libapt-pkg--6 ${D}/${libdir}/
+	ln -sf libapt-pkg--6.so ${D}/${libdir}/libapt-pkg.so
+	oe_libinstall -so -C bin libapt-inst--6 ${D}/${libdir}/
+	ln -sf libapt-inst--6.so ${D}/${libdir}/libapt-inst.so
+
+	install -d ${D}/${libdir}/apt/methods
+	install -m 0755 bin/methods/* ${D}/${libdir}/apt/methods/
+
+	install -d ${D}/${libdir}/dpkg/methods/apt
+	install -m 0644 dselect/desc.apt ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0644 dselect/names ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/install ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/setup ${D}/${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/update ${D}/${libdir}/dpkg/methods/apt/ 
+
+	install -d ${D}/${sysconfdir}/apt
+	install -d ${D}/${localstatedir}/lib/apt/lists/partial
+	install -d ${D}/${localstatedir}/cache/apt/archives/partial
+	install -d ${D}/${docdir}/apt/examples
+	install -m 0644 doc/examples/* ${D}/${docdir}/apt/examples/
+}
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index e69de29bb2..025a20ee1d 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -0,0 +1,35 @@
+SECTION = "base"
+LICENSE = "GPL"
+SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
+	file://ipaq.patch;patch=1;pnum=0"
+S = "${WORKDIR}/at76c503a"
+PR = "r1"
+PV = "0.0cvs${CVSDATE}"
+
+inherit module
+
+MODULES = at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \
+          at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o
+
+pkg_postinst() {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+update-modules || true
+}
+
+pkg_postrm() {
+#!/bin/sh
+update-modules || true
+}
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+	for i in ${MODULES}; do install -m 0644 $i ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/$i; done
+
+	if [ "${MACHINE}" = "h3900" ]; then
+		install -d ${D}/${sysconfdir}/modutils
+		echo "at76c503-rfmd" > ${D}/${sysconfdir}/modutils/at76c503-rfmd
+	fi
+}
diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb
index 64af00d1a2..d7be74ee72 100644
--- a/packages/atd/atd_0.70.bb
+++ b/packages/atd/atd_0.70.bb
@@ -18,6 +18,6 @@ do_compile() {
 do_install() {
 	install -d ${D}${sbindir}
 	install atd ${D}${sbindir}/atd
-	install -d ${D}/etc/init.d
-	install dist/etc/init.d/atd ${D}/etc/init.d/atd
+	install -d ${D}/${sysconfdir}/init.d
+	install dist/etc/init.d/atd ${D}/${sysconfdir}/init.d/atd
 }
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
index e69de29bb2..fd156a31c7 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
@@ -0,0 +1,39 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
+	file://dotconfig \
+	file://pcmf502rd.conf \
+	file://makefile.patch;patch=1"
+S = "${WORKDIR}/atmelwlandriver"
+LICENSE = "GPL"
+
+inherit module
+SECTION = "base"
+
+do_configure() {
+	install ${WORKDIR}/dotconfig .config
+}
+
+CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+	export INC="${S}/src/includes"
+	export OBJDIR="${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
+	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
+	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
+	export CC="${KERNEL_CC}" 
+	export LD="${KERNEL_LD}"
+	export KERNEL_VERSION="${KERNEL_VERSION}"
+	export TOPDIR="${S}"
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	install -d ${OBJDIR}
+	#oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM' MODULE:='pcmf502r' LIB:=-RFMD-
+	oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_D' MODULE:='pcmf502rd' LIB:=-REVD-
+	#oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_E' MODULE:='pcmf502re' LIB:=-REVE-
+}
+
+do_install() {
+	install -d ${D}/${sysconfdir}/pcmcia
+	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/${sysconfdir}/pcmcia/
+
+	# remove any maps that were installed
+	rm -f ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
+}
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index e69de29bb2..fd156a31c7 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -0,0 +1,39 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
+	file://dotconfig \
+	file://pcmf502rd.conf \
+	file://makefile.patch;patch=1"
+S = "${WORKDIR}/atmelwlandriver"
+LICENSE = "GPL"
+
+inherit module
+SECTION = "base"
+
+do_configure() {
+	install ${WORKDIR}/dotconfig .config
+}
+
+CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+	export INC="${S}/src/includes"
+	export OBJDIR="${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
+	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
+	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
+	export CC="${KERNEL_CC}" 
+	export LD="${KERNEL_LD}"
+	export KERNEL_VERSION="${KERNEL_VERSION}"
+	export TOPDIR="${S}"
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	install -d ${OBJDIR}
+	#oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM' MODULE:='pcmf502r' LIB:=-RFMD-
+	oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_D' MODULE:='pcmf502rd' LIB:=-REVD-
+	#oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_E' MODULE:='pcmf502re' LIB:=-REVE-
+}
+
+do_install() {
+	install -d ${D}/${sysconfdir}/pcmcia
+	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/${sysconfdir}/pcmcia/
+
+	# remove any maps that were installed
+	rm -f ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
+}
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index a17ee67bb7..38c3bf7d32 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -98,36 +98,36 @@ do_install () {
 		install -m 0644 ${WORKDIR}/licenses/$license ${D}/${datadir}/common-licenses/
 	done
 
-	if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}/etc/fstab); then
+	if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}/${sysconfdir}/fstab); then
 		# /var is in a ramdisk
-		install -d ${D}/etc/init.d ${D}/etc/rcS.d
+		install -d ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/rcS.d
 		for d in ${dirs755}; do
 			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}/etc/init.d/populate-var.sh
-				echo "chmod 0775 $d" >> ${D}/etc/init.d/populate-var.sh
+				echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+				echo "chmod 0775 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
 			fi
 		done
 		for d in ${dirs1777}; do
 			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}/etc/init.d/populate-var.sh
-				echo "chmod 1777 $d" >> ${D}/etc/init.d/populate-var.sh
+				echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+				echo "chmod 1777 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
 			fi
 		done
 		for d in ${dirs2775}; do
 			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}/etc/init.d/populate-var.sh
-				echo "chmod 2775 $d" >> ${D}/etc/init.d/populate-var.sh
+				echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+				echo "chmod 2775 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
 			fi
 		done
 
 
-		echo ">/var/run/utmp" >> ${D}/etc/init.d/populate-var.sh
-		echo ">/var/log/wtmp" >> ${D}/etc/init.d/populate-var.sh
-		echo ">/var/log/lastlog" >> ${D}/etc/init.d/populate-var.sh
-		echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog"	>> ${D}/etc/init.d/populate-var.sh
-		echo "touch /var/run/resolv.conf"	>> ${D}/etc/init.d/populate-var.sh
+		echo ">/var/run/utmp" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+		echo ">/var/log/wtmp" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+		echo ">/var/log/lastlog" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+		echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog"	>> ${D}/${sysconfdir}/init.d/populate-var.sh
+		echo "touch /var/run/resolv.conf"	>> ${D}/${sysconfdir}/init.d/populate-var.sh
 
-#		rmdir ${D}/var/*
+#		rmdir ${D}/${localstatedir}/*
 		chmod 0755 ${D}/${sysconfdir}/init.d/populate-var.sh
 		ln -sf ../init.d/populate-var.sh ${D}/${sysconfdir}/rcS.d/S37populate-var.sh
 		ln -sf ${localstatedir}/run/resolv.conf ${D}/${sysconfdir}/resolv.conf
@@ -139,7 +139,7 @@ do_install () {
 
 do_install_append_ramses () {
 	rmdir ${D}/tmp
-	mkdir -p ${D}/var/tmp
+	mkdir -p ${D}/${localstatedir}/tmp
 	ln -s var/tmp ${D}/tmp
 }
 
diff --git a/packages/base-passwd/base-passwd_3.5.7.bb b/packages/base-passwd/base-passwd_3.5.7.bb
index a025b24041..54a3223215 100644
--- a/packages/base-passwd/base-passwd_3.5.7.bb
+++ b/packages/base-passwd/base-passwd_3.5.7.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Base system password/group files."
 SECTION = "base"
-PR="r2"
+PR = "r3"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
@@ -10,6 +10,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
 
 inherit autotools
 
+FILES_${PN}-doc += "${docdir}"
 
 do_install () {
 	install -d -m 755 ${D}/${sbindir}
@@ -28,11 +29,11 @@ do_install () {
 	install -p -m 644 group.master \
 		${D}/${datadir}/base-passwd/
 
-	install -d -m 755 ${D}/${docdir}/${P}
-	install -p -m 644 debian/changelog ${D}/${docdir}/${P}/
-	gzip -9 ${D}/${docdir}/${P}/*
-	install -p -m 644 README ${D}/${docdir}/${P}/
-	install -p -m 644 debian/copyright ${D}/${docdir}/${P}/
+	install -d -m 755 ${D}/${docdir}/${PN}
+	install -p -m 644 debian/changelog ${D}/${docdir}/${PN}/
+	gzip -9 ${D}/${docdir}/${PN}/*
+	install -p -m 644 README ${D}/${docdir}/${PN}/
+	install -p -m 644 debian/copyright ${D}/${docdir}/${PN}/
 }
 
 
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index add079f6d0..b079160e1b 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -22,6 +22,6 @@ do_compile (){
 }
 
 do_install () {
-        install -d ${D}/usr/bin
-        install -m4755 ${S}/bl ${D}/usr/bin/bl
+        install -d ${D}${bindir}
+        install -m4755 ${S}/bl ${D}${bindir}/bl
 }
diff --git a/packages/bluez-utils/bluez-utils-common_2.10.inc b/packages/bluez-utils/bluez-utils-common_2.10.inc
index 70de8def74..f1774a236b 100644
--- a/packages/bluez-utils/bluez-utils-common_2.10.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.10.inc
@@ -13,13 +13,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
index 4f4b8bf911..48f05d029c 100644
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.11.inc
@@ -13,13 +13,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.13.inc b/packages/bluez-utils/bluez-utils-common_2.13.inc
index 9b4f80902d..361903bab0 100644
--- a/packages/bluez-utils/bluez-utils-common_2.13.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.13.inc
@@ -17,13 +17,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index ed4f61e9c4..fae2efd3fa 100644
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -17,13 +17,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bootsplash/bootsplash_3.0.7.bb b/packages/bootsplash/bootsplash_3.0.7.bb
index e69de29bb2..da2290e202 100644
--- a/packages/bootsplash/bootsplash_3.0.7.bb
+++ b/packages/bootsplash/bootsplash_3.0.7.bb
@@ -0,0 +1,21 @@
+# bootsplash OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="Bootsplash shows pretty pictures during boot"
+HOMEPAGE="http://www.bootsplash.org"
+SECTION = "media-gfx"
+LICENSE = "GPL"
+SRC_URI="ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash-${PV}.tar.bz2"
+
+DEPENDS="freetype"
+
+do_compile() {
+	oe_runmake -C Utilities 
+}
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -m 0755 ${S}/Utilities/fbtruetype ${D}${bindir}
+	install -m 0755 ${S}/Utilities/splash ${D}${bindir}
+}
diff --git a/packages/bt950-cs/bt950-cs_0.1.bb b/packages/bt950-cs/bt950-cs_0.1.bb
index e69de29bb2..9da0752656 100644
--- a/packages/bt950-cs/bt950-cs_0.1.bb
+++ b/packages/bt950-cs/bt950-cs_0.1.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Linux driver for OX16C950 UART Bluetooth cards"
+SECTION = "kernel/modules"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://www.holtmann.org/linux/bluetooth/bt950.html"
+DEPENDS = "pcmcia-cs"
+RDEPENDS = "pcmcia-cs"
+
+SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \
+file://makefile.patch;patch=1"
+
+S = "${WORKDIR}/bt950-${PV}"
+
+PACKAGES = "kernel-module-bt950-cs"
+FILES_kernel-module-bt950-cs = "/etc/pcmcia/bt950.conf /lib/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/bt950_cs.o"
+
+inherit module
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/ \
+				${D}/${sysconfdir}/pcmcia/
+	install -m 0644 bt950_cs.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/
+	install -m 0644 bt950.conf ${D}/${sysconfdir}/pcmcia/
+}
+
+pkg_postinst() {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+update-modules || true
+}
+
+pkg_postrm() {
+#!/bin/sh
+update-modules || true
+}
+
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index fe136407b7..89b3206cb9 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -57,7 +57,7 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/etc/init.d
+	install -d ${D}/${sysconfdir}/init.d
 	oe_runmake 'PREFIX=${D}' install
 	install -m 0755 ${WORKDIR}/syslog ${D}/${sysconfdir}/init.d/
 	install -m 644 ${WORKDIR}/syslog.conf ${D}/${sysconfdir}/
@@ -79,10 +79,10 @@ do_install () {
 		install -m 0755 ${S}/examples/udhcp/simple.script ${D}/${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 	fi
-	rm ${D}/bin/mount
-	install -m 0755 ${WORKDIR}/mount.busybox ${D}/bin/
-	rm ${D}/bin/umount
-	install -m 0755 ${WORKDIR}/umount.busybox ${D}/bin/
+	rm ${D}/${base_bindir}/mount
+	install -m 0755 ${WORKDIR}/mount.busybox ${D}/${base_bindir}/
+	rm ${D}/${base_bindir}/umount
+	install -m 0755 ${WORKDIR}/umount.busybox ${D}/${base_bindir}/
 }
 
 pkg_postinst () {
diff --git a/packages/came/came_1.7.bb b/packages/came/came_1.7.bb
index e69de29bb2..9c90de47c7 100644
--- a/packages/came/came_1.7.bb
+++ b/packages/came/came_1.7.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "camE is a rewrite of the xawtv webcam app, which adds imlib2 \
+support and additional features."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "curl giblib"
+SECTION = "x11/utils"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://linuxbrit.co.uk/downloads/camE-${PV}.tar.gz \
+           file://make.patch;patch=1 \
+           file://compile.patch;patch=1"
+S = "${WORKDIR}/camE-${PV}"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' \
+		   'prefix=${prefix}' \
+		   'exec_prefix=${exec_prefix}' \
+		   'bindir=${bindir}' \
+		   'mandir=${mandir}' \
+		   'docdir=${docdir}/${P}' \
+		   install
+}
diff --git a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
index 629a627660..c221552747 100644
--- a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
+++ b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
@@ -23,6 +23,6 @@ rm -f /dev/changedfiles
 }
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
-	install -m 0644 changedfiles.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
+	install -m 0644 changedfiles.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
 }
diff --git a/packages/chkhinge/chkhinge_20040706.bb b/packages/chkhinge/chkhinge_20040706.bb
index e69de29bb2..2b3b55f0eb 100644
--- a/packages/chkhinge/chkhinge_20040706.bb
+++ b/packages/chkhinge/chkhinge_20040706.bb
@@ -0,0 +1,17 @@
+SECTION = "base"
+SRC_URI = "${HANDHELDS_CVS};module=apps/chkhinge;date=${PV}"
+LICENSE = "MIT"
+S = "${WORKDIR}/chkhinge"
+PR = "r1"
+
+FILES_${PN} = "/bin"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}/${base_bindir}
+	install -m 4755 chkhinge ${D}/${base_bindir}/
+}
+
diff --git a/packages/cpuspeed/cpuspeed_1.1.bb b/packages/cpuspeed/cpuspeed_1.1.bb
index e69de29bb2..f27df18992 100644
--- a/packages/cpuspeed/cpuspeed_1.1.bb
+++ b/packages/cpuspeed/cpuspeed_1.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Userspace cpufreq governor"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://carlthompson.net/dl/cpuspeed/cpuspeed-${PV}.tar.gz"
+S = "${WORKDIR}/cpuspeed-${PV}"
+
+FILES_${PN} = "/sbin/cpuspeed"
+
+do_compile() {
+	${CXX} ${TARGET_CXXFLAGS} ${LDFLAGS} -o cpuspeed cpuspeed.cc
+}
+
+do_install() {
+	install -d ${D}/${base_sbindir}
+	install -m 0755 cpuspeed ${D}/${base_sbindir}/cpuspeed
+}
+
diff --git a/packages/dbus/dbus_0.21.bb b/packages/dbus/dbus_0.21.bb
index e69de29bb2..fa45aac760 100644
--- a/packages/dbus/dbus_0.21.bb
+++ b/packages/dbus/dbus_0.21.bb
@@ -0,0 +1,68 @@
+SECTION = "base"
+PR = "r4"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+DEPENDS = "expat glib-2.0"
+LICENSE = "GPL"
+
+SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   file://dbus-1.init"
+
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} += "${libdir}/dbus-1.0/services"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
+		--disable-checks --disable-xml-docs --disable-doxygen-docs \
+		--with-xml=expat --without-x"
+
+headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
+
+do_stage () {
+	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+	oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
+	for i in ${headers}; do
+		install -m 0644 dbus/$i ${STAGING_INCDIR}/dbus-1.0/dbus/$i
+	done
+
+	install -m 0644 glib/dbus-glib.h ${STAGING_INCDIR}/dbus-1.0/dbus/
+
+	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+	install -d ${D}${libdir}/dbus-1.0/services
+}
+
+python populate_packages_prepend () {
+	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+		bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb
index a233930185..e490a550c2 100644
--- a/packages/dbus/dbus_0.22.bb
+++ b/packages/dbus/dbus_0.22.bb
@@ -61,7 +61,7 @@ do_stage () {
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-	install -d ${D}/usr/lib/dbus-1.0/services
+	install -d ${D}${libdir}/dbus-1.0/services
 }
 
 python populate_packages_prepend () {
diff --git a/packages/devlabel/devlabel_0.45.01.bb b/packages/devlabel/devlabel_0.45.01.bb
index e69de29bb2..d401ce2b2e 100644
--- a/packages/devlabel/devlabel_0.45.01.bb
+++ b/packages/devlabel/devlabel_0.45.01.bb
@@ -0,0 +1,24 @@
+SECTION = "base"
+HOMEPAGE = "http://linux.dell.com/devlabel/devlabel.html"
+DESCRIPTION = "tool for user-define static device labels"
+DEPENDS = "e2fsprogs-libs"
+LICENSE = "GPL"
+
+SRC_URI = "http://linux.dell.com/devlabel/permalink/devlabel-${PV}.tar.gz"
+
+do_compile () {
+	set -x
+	${CC} ${CFLAGS} ${LDFLAGS} -o scsi_unique_id scsi_unique_id.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o partition_uuid partition_uuid.c -luuid
+	set +x
+}
+
+do_install () {
+	install -d ${D}/${base_sbindir} ${D}/${bindir} ${D}/${mandir}/man8 \
+		   ${D}/${sysconfdir}/sysconfig/devlabel.d
+	install -m 755 devlabel ${D}/${base_sbindir}/devlabel
+	install -m 755 scsi_unique_id ${D}${bindir}/
+	install -m 755 partition_uuid ${D}${bindir}/
+	install -m 644 devlabel.8.gz ${D}${mandir}/man8/
+	install -m 644 sysconfig.devlabel ${D}${sysconfdir}/sysconfig/devlabel
+}
diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
index e69de29bb2..6b61b8a1e3 100644
--- a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
+++ b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
@@ -0,0 +1,27 @@
+SECTION = "console/network"
+DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between two \
+ networks with different broadcast domains. \
+ It works better with ppp - and especially with ipsec over ppp - than \
+ dhcp-relay from ISC and has a smaller foot print."
+HOMEPAGE = "http://www-user.tu-chemnitz.de/~ensc/dhcp-fwd/"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "GPLv2"
+ 
+SRC_URI = "http://www-user.tu-chemnitz.de/~ensc/dhcp-fwd/files/dhcp-forwarder-0.6.tar.bz2 \
+	file://init \
+	file://dhcp-fwd.cfg"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF="--disable-dietlibc"
+
+INITSCRIPT_NAME="dhcp-forwarder"
+INITSCRIPT_PARAMS="defaults"
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/dhcp-forwarder
+	install -m 0644 ${WORKDIR}/dhcp-fwd.cfg ${D}/${sysconfdir}
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/dhcp-fwd.cfg"
diff --git a/packages/dhcp/dhcp_3.0.1.bb b/packages/dhcp/dhcp_3.0.1.bb
index e69de29bb2..b7856a883a 100644
--- a/packages/dhcp/dhcp_3.0.1.bb
+++ b/packages/dhcp/dhcp_3.0.1.bb
@@ -0,0 +1,46 @@
+SECTION = "console/network"
+DESCRIPTION = "Internet Software Consortium DHCP package"
+HOMEPAGE = "http://www.isc.org/"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "BSD"
+PR = "r1"
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0.1.tar.gz \
+	   file://noattrmode.patch;patch=1 \
+	   file://init-relay file://default-relay \
+	   file://init-server file://default-server \
+	   file://dhclient.conf file://dhcpd.conf"
+
+do_configure() {
+	./configure
+}
+
+do_compile() {
+	make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
+        -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \
+        -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \
+        -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
+        -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"'
+}
+
+do_install() {
+	make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install
+	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}/${sysconfdir}/default
+	install -d ${D}/${sysconfdir}/dhcp
+	install -m 0755 ${WORKDIR}/init-relay ${D}/${sysconfdir}/init.d/dhcp-relay
+	install -m 0644 ${WORKDIR}/default-relay ${D}/${sysconfdir}/default/dhcp-relay
+	install -m 0755 ${WORKDIR}/init-server ${D}/${sysconfdir}/init.d/dhcp-server
+	install -m 0644 ${WORKDIR}/default-server ${D}/${sysconfdir}/default/dhcp-server
+	install -m 0644 ${WORKDIR}/dhclient.conf ${D}/${sysconfdir}/dhcp/dhclient.conf
+	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}/${sysconfdir}/dhcp/dhcpd.conf
+}
+
+PACKAGES = "dhcp-server dhcp-client dhcp-relay dhcp-omshell dhcp-dev dhcp-doc"
+FILES_dhcp-server = "${sbindir}/dhcpd /etc/init.d/dhcp-server /etc/default/dhcp-server /etc/dhcp/dhcpd.conf"
+FILES_dhcp-relay = "${sbindir}/dhcrelay /etc/init.d/dhcp-relay /etc/default/dhcp-relay"
+FILES_dhcp-client = "/sbin/ /etc/dhcp/dhclient.conf"
+FILES_dhcp-omshell = "${bindir}/omshell"
+
+CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
+CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
+CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb
index 7a1c7befa8..d869e9979f 100644
--- a/packages/dri/drm-kernel_cvs.bb
+++ b/packages/dri/drm-kernel_cvs.bb
@@ -14,9 +14,9 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/drm
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drm
 	cd linux
-	for i in *.ko; do install -m 0644 $i ${D}/lib/modules/${KERNEL_VERSION}/drm/; done
+	for i in *.ko; do install -m 0644 $i ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drm/; done
 }
 
 python populate_packages_prepend () {
diff --git a/packages/ebtables/ebtables_2.0.6.bb b/packages/ebtables/ebtables_2.0.6.bb
index e69de29bb2..5141da3a6d 100644
--- a/packages/ebtables/ebtables_2.0.6.bb
+++ b/packages/ebtables/ebtables_2.0.6.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
+PRIORITY = "optional"
+MAINTAINER = "Ned Ludd <solar@gentoo.org>"
+LICENSE = "GPL"
+SECTION = "console/network"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
+           file://gcc34.patch;patch=1 \
+           file://installnonroot.patch;patch=1 \
+           file://installcreatedirs.patch;patch=1"
+S = "${WORKDIR}/ebtables-v${PV}"
+
+do_compile () {
+	oe_runmake 'BINPATH=/sbin/' 'MANDIR=${mandir}/' \
+		   'ETHERTYPESPATH=${sysconfdir}/' 'KERNEL_INCLUDES=${STAGING_INCDIR}'
+}
+
+do_install () {
+	oe_runmake 'BINPATH=${D}/${base_sbindir}/' 'MANDIR=${D}/${mandir}/' \
+		   'ETHERTYPESPATH=${D}/${sysconfdir}/' install
+}
diff --git a/packages/faac/faac_1.24.bb b/packages/faac/faac_1.24.bb
index e69de29bb2..ceee00931d 100644
--- a/packages/faac/faac_1.24.bb
+++ b/packages/faac/faac_1.24.bb
@@ -0,0 +1,22 @@
+
+DESCRIPTION = "Library for reading some sort of media format."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = ""
+LICENSE = "LGPL"
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+PACKAGES = "${PN} lib${PN} lib${PN}-dev"
+
+FILES_${PN} = " ${bindir}/faac "
+FILES_lib${PN} = " ${libdir}/libfaac.so.0 ${libdir}/libfaac.so.0.0.0 " 
+FILES_lib${PN}-dev = " ${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la ${libdir}/libfaac.a "
+
+do_stage() {
+	oe_libinstall -a -so -C libfaac libfaac ${STAGING_LIBDIR}
+	install -m 0644 ${S}/include/faac.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/faaccfg.h ${STAGING_INCDIR}/
+}
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb
index 883cabc3b5..244b2f66fa 100644
--- a/packages/faad2/faad2_2.0.bb
+++ b/packages/faad2/faad2_2.0.bb
@@ -14,13 +14,13 @@ S="${WORKDIR}/${PN}"
 
 PACKAGES = "${PN} libfaad libfaad-dev libmp4ff libmp4ff-dev" 
 
-FILES_${PN} = "/usr/bin/faad"
+FILES_${PN} = "${bindir}/faad"
 
-FILES_libfaad = "/usr/lib/libfaad.so.0 /usr/lib/libfaad.so.0.0.0"
-FILES_libfaad-dev = "/usr/lib/libfaad.so /usr/lib/libfaad.la /usr/lib/libfaad.a /usr/include/faad.h"
+FILES_libfaad = "${libdir}/libfaad.so.0 ${libdir}/libfaad.so.0.0.0"
+FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${libdir}/libfaad.a ${includedir}/faad.h"
 
-FILES_libmp4ff = "/usr/lib/libmp4ff.so.0 /usr/lib/libmp4ff.so.0.0.0"
-FILES_libmp4ff-dev = "/usr/lib/libmp4ff.so /usr/lib/libmp4ff.la /usr/lib/libmp4ff.a /usr/include/mp4ff.h"
+FILES_libmp4ff = "${libdir}/libmp4ff.so.0 ${libdir}/libmp4ff.so.0.0.0"
+FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${libdir}/libmp4ff.a ${includedir}/mp4ff.h"
 
 do_stage() {
 	oe_libinstall -a -so -C libfaad libfaad ${STAGING_LIBDIR}
diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
index e69de29bb2..e5cbd0a5fb 100644
--- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "framebuffer VNC server keyboard events module"
+SECTION = "kernel"
+LICENSE = "GPL"
+
+SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
+           file://libvncs0.6.patch;patch=1 \
+	   file://paths.patch;patch=1 \
+	   file://kernelinclude.patch;patch=1"
+	  
+S = "${WORKDIR}/fbvncserver-${PV}"
+
+inherit module
+
+EXTRA_OEMAKE = "KERNEL_INCLUDES=-I${STAGING_KERNEL_DIR}/include zaurus_kbdsim.o"
+
+do_install () {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
+	install -m 0644 zaurus_kbdsim.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc/
+}
diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb
index 7fe905c95c..cdff17efa4 100644
--- a/packages/fbvncserver/fbvncserver_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver_0.9.4.bb
@@ -29,12 +29,12 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/usr/bin
-	install -m 0755 zaurus_fbvncserver ${D}/usr/bin/fbvncserver
-	install -m 0755 zaurus_tssimd ${D}/usr/bin/tssimd
+	install -d ${D}${bindir}
+	install -m 0755 zaurus_fbvncserver ${D}${bindir}/fbvncserver
+	install -m 0755 zaurus_tssimd ${D}${bindir}/tssimd
 	
-	install -d ${D}/usr/share/fbvncserver
-	install -m 0644 ${WORKDIR}/zaurus_panel.jpg ${D}/usr/share/fbvncserver/
+	install -d ${D}${datadir}/fbvncserver
+	install -m 0644 ${WORKDIR}/zaurus_panel.jpg ${D}${datadir}/fbvncserver/
 	
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/fbvncinput
diff --git a/packages/gammu/gammu_1.00.0.bb b/packages/gammu/gammu_1.00.0.bb
index e69de29bb2..967a551eb2 100644
--- a/packages/gammu/gammu_1.00.0.bb
+++ b/packages/gammu/gammu_1.00.0.bb
@@ -0,0 +1,73 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
+AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz \
+file://ldflags.patch;patch=1 \
+"
+
+inherit autotools
+
+do_compile () {
+	oe_runmake shared
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
+			   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+			   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+			   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \
+			   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+			   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+			   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+			   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+			   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+			   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+			   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+			   ${STAGING_INCDIR}/gammu/protocol/alcatel
+
+	oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
+	install -m 0644 common/*.h					${STAGING_INCDIR}/gammu/
+	install -m 0644 common/misc/*.h				${STAGING_INCDIR}/gammu/misc 
+    install -m 0644 common/misc/coding/*.h		${STAGING_INCDIR}/gammu/misc/coding 
+    install -m 0644 common/phone/*.h			${STAGING_INCDIR}/gammu/phone 
+    install -m 0644 common/phone/at/*.h			${STAGING_INCDIR}/gammu/phone/at 
+    install -m 0644 common/phone/obex/*.h		${STAGING_INCDIR}/gammu/phone/obex 
+    install -m 0644 common/phone/nokia/*.h		${STAGING_INCDIR}/gammu/phone/nokia 
+    install -m 0644 common/phone/nokia/dct3/*.h	${STAGING_INCDIR}/gammu/phone/nokia/dct3 
+    install -m 0644 common/phone/nokia/dct4/*.h	${STAGING_INCDIR}/gammu/phone/nokia/dct4 
+    install -m 0644 common/phone/symbian/*.h	${STAGING_INCDIR}/gammu/phone/symbian 
+    install -m 0644 common/phone/alcatel/*.h	${STAGING_INCDIR}/gammu/phone/alcatel 
+    install -m 0644 common/service/*.h			${STAGING_INCDIR}/gammu/service 
+    install -m 0644 common/service/sms/*.h		${STAGING_INCDIR}/gammu/service/sms 
+    install -m 0644 common/service/backup/*.h	${STAGING_INCDIR}/gammu/service/backup 
+    install -m 0644 common/device/*.h			${STAGING_INCDIR}/gammu/device 
+	install -m 0644 common/device/irda/*.h		${STAGING_INCDIR}/gammu/device/irda 
+    install -m 0644 common/device/bluetoth/*.h	${STAGING_INCDIR}/gammu/device/bluetoth 
+    install -m 0644 common/device/serial/*.h	${STAGING_INCDIR}/gammu/device/serial 
+    install -m 0644 common/protocol/*.h			${STAGING_INCDIR}/gammu/protocol 
+    install -m 0644 common/protocol/at/*.h		${STAGING_INCDIR}/gammu/protocol/at 
+    install -m 0644 common/protocol/obex/*.h	${STAGING_INCDIR}/gammu/protocol/obex 
+    install -m 0644 common/protocol/nokia/*.h	${STAGING_INCDIR}/gammu/protocol/nokia 
+    install -m 0644 common/protocol/symbian/*.h	${STAGING_INCDIR}/gammu/protocol/symbian 
+    install -m 0644 common/protocol/alcatel/*.h	${STAGING_INCDIR}/gammu/protocol/alcatel
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' installshared
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu"
+FILES_libgammu = "${libdir}/libGammu.so*"
+
+python populate_packages_prepend () {
+	help_dir = bb.data.expand('${datadir}/gammu/', d)
+	
+	do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
+}
diff --git a/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb b/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb
index e69de29bb2..d74fb4fa3d 100644
--- a/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb
+++ b/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb
@@ -0,0 +1,93 @@
+SECTION = "devel"
+include gcc-csl_${PV}.bb
+inherit cross
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-csl-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# Files for these are defined in the main gcc.oe
+PACKAGES = "libgcc libstdc++ libg2c"
+INHIBIT_PACKAGE_STRIP = "1"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		      --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
+
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
+
+do_configure () {
+	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/3.4.0/libgcc_eh.a
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_compile_prepend () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+
+	# These aren't useful on the cross toolchain
+	rm -f ${CROSS_DIR}/bin/*gcov
+	rm -f ${CROSS_DIR}/bin/*gccbug
+
+	# Fix a few include links so cross builds are happier
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
+		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+			${STAGING_INCDIR}/
+	fi
+
+	# We use libiberty from binutils
+	rm -f ${CROSS_DIR}/lib/libiberty.a
+
+	# We probably don't need these
+	rmdir ${CROSS_DIR}/include || :
+
+	# We don't really need to keep this around
+	rm -rf ${CROSS_DIR}/share
+}
+
+python do_package() {
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+	bb.build.exec_func('package_do_package', d)
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then
+		# Already in the right location
+		:
+	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
+		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	else
+		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+	fi
+
+	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+	mkdir -p ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+
+	# Manually run the target stripper since we won't get it run by
+	# the packaging.
+	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+	${TARGET_PREFIX}strip ${D}/${base_libdir}gcc_s.so.*
+}
diff --git a/packages/gcc-csl/gcc-csl_2004-q1a.bb b/packages/gcc-csl/gcc-csl_2004-q1a.bb
index e69de29bb2..c4839792c0 100644
--- a/packages/gcc-csl/gcc-csl_2004-q1a.bb
+++ b/packages/gcc-csl/gcc-csl_2004-q1a.bb
@@ -0,0 +1,230 @@
+SECTION = "devel"
+inherit autotools gettext
+
+DESCRIPTION = "The GNU cc and gcc C compilers."
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+BROKEN = "1"
+
+# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
+# packaged in the respective cross packages.
+PACKAGES = "${PN} ${PN}-symlinks \
+            ${PN}-c++ ${PN}-c++-symlinks \
+            ${PN}-f77 ${PN}-f77-symlinks \
+            libstdc++-dev libg2c-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}cpp \
+	       ${bindir}/${TARGET_PREFIX}gcov \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1 \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/collect2 \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/*.o \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/specs \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/lib* \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/include"
+
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/cpp \
+			${bindir}/gcov \
+			${bindir}/gccbug"
+
+FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/f771"
+
+FILES_${PN}-f77-symlinks = "${bindir}/g77 \
+			    ${bindir}/f77"
+
+# Called from within gcc-cross, so libdir is set wrong
+#FILES_libg2c = "${libdir}/libg2c.so.*"
+FILES_libg2c = "${libdir}/libg2c.so.*"
+
+FILES_libg2c-dev = "${libdir}/libg2c.so \
+			  ${libdir}/libg2c.a \
+			  ${libdir}/libfrtbegin.a"
+
+FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1plus"
+
+FILES_${PN}-c++-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+FILES_libgcc = "/lib/libgcc_s.so.*"
+
+# Called from within gcc-cross, so libdir is set wrong
+#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${libdir}/gcc/${TARGET_SYS}/${PV}/include/README"
+
+#	   file://gcc34-pre-modify.patch;patch=1
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2004-Q1A/gcc-${PV}.tar.gz \
+	   file://gcc34-reverse-compare.patch;patch=1 \
+	   file://gcc34-arm-ldm.patch;patch=1 \
+	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
+	   file://gcc34-arm-tune.patch;patch=1 \
+	   file://gcc34-15089.patch;patch=1 \
+	   file://gcc34-15666.patch;patch=1 \
+	   file://gcc-uclibc-3.4.0-100-conf.patch;patch=1 \
+	   file://gcc-uclibc-3.4.0-200-code.patch;patch=1 \
+	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
+	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1"
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('fix_perms', d)
+}
+
+fix_perms () {
+	chmod -R u+w ${S}
+}
+
+gccbuild_uclibc_do_patch () {
+	#
+	# Hack things to use the correct shared lib loader
+	#
+	#LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" .`
+	#if [ -n "$LIST" ] ; then
+	#	perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},-dynamic-linker /lib/ld-uClibc.so.0},;" $LIST
+	#fi
+
+	#
+	# Prevent system glibc start files from leaking in uninvited...
+	#
+	perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 = \"${CROSS_DIR}/${TARGET_SYS}/lib/\";,;" gcc/gcc.c
+	perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 = \"${CROSS_DIR}/${TARGET_SYS}/usr/lib/\";,;" gcc/gcc.c
+
+	#
+	# Prevent system glibc include files from leaking in uninvited...
+	#
+	perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=${CROSS_DIR}/${TARGET_SYS}/include,;" gcc/Makefile.in
+	perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=${CROSS_DIR}/${TARGET_SYS}/include,;" gcc/Makefile.in
+	perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \"${CROSS_DIR}/${TARGET_SYS}/include\",;" gcc/cppdefault.h
+
+	#
+	# Prevent system glibc libraries from being found by collect2 
+	# when it calls locatelib() and rummages about the system looking 
+	# for libraries with the correct name...
+	#
+	perl -i -p -e "s,\"/lib,\"${CROSS_DIR}/${TARGET_SYS}/lib,g;" \
+		gcc/collect2.c
+	perl -i -p -e "s,\"/usr/,\"${CROSS_DIR}/${TARGET_SYS}/usr/,g;" \
+		gcc/collect2.c
+
+	#
+	# Prevent gcc from using the unwind-dw2-fde-glibc code
+	#
+	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc
+#ifndef inhibit_libc,g;" gcc/unwind-dw2-fde-glibc.c
+}
+
+python do_patch () {
+    import bb, re
+    bb.build.exec_func('base_do_patch', d)
+    if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.build.exec_func('gccbuild_uclibc_do_patch', d)
+}
+
+S = "${WORKDIR}/gcc-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-multilib \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS} \
+                ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+EXTRA_OECONF_DEP = ""
+EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
+EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+EXTRA_OECONF_append_ramses = " --with-float=soft "
+
+python __anonymous () {
+    import bb, re
+    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+}
+
+do_configure () {
+	# Setup these vars for cross building only
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
+		export AS_FOR_TARGET="${HOST_PREFIX}as"
+		export LD_FOR_TARGET="${HOST_PREFIX}ld"
+		export NM_FOR_TARGET="${HOST_PREFIX}nm"
+		export AR_FOR_TARGET="${HOST_PREFIX}ar"
+		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+	fi
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
+	rm ${D}/${libdir}/libgcc_s.so
+	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
+		| tr -s / \
+		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
+		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
+
+	# We don't need libtool libraries
+	rm ${D}/${libdir}/libg2c.la
+
+	# Cleanup manpages..
+	rm -r ${D}/${mandir}/man7
+
+	# We use libiberty from binutils
+	rm ${D}/${libdir}/libiberty.a
+
+	cd ${D}/${bindir}
+
+	# We care about g++ not c++
+	rm *c++
+
+	# We don't care about the gcc-<version> ones for this
+	rm *gcc-?.?*
+
+	# These sometimes show up, they are strange, we remove them
+	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+	# Symlinks so we can use these trivially on the target
+	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g++ g++
+	ln -sf ${TARGET_SYS}-gcc gcc
+	ln -sf g77 f77
+	ln -sf g++ c++
+	ln -sf gcc cc
+}
diff --git a/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb b/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb
index e69de29bb2..d92b09f2b3 100644
--- a/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb
+++ b/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb
@@ -0,0 +1,93 @@
+SECTION = "devel"
+include gcc-snapshot_cvs.bb
+inherit cross
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# Files for these are defined in the main gcc.oe
+PACKAGES = "libgcc libstdc++ libg2c"
+INHIBIT_PACKAGE_STRIP = "1"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		      --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
+
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
+
+do_configure () {
+	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV}/libgcc_eh.a
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_compile_prepend () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+
+	# These aren't useful on the cross toolchain
+	rm -f ${CROSS_DIR}/bin/*gcov
+	rm -f ${CROSS_DIR}/bin/*gccbug
+
+	# Fix a few include links so cross builds are happier
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
+		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+			${STAGING_INCDIR}/
+	fi
+
+	# We use libiberty from binutils
+	rm -f ${CROSS_DIR}/lib/libiberty.a
+
+	# We probably don't need these
+	rmdir ${CROSS_DIR}/include || :
+
+	# We don't really need to keep this around
+	rm -rf ${CROSS_DIR}/share
+}
+
+python do_package() {
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+	bb.build.exec_func('package_do_package', d)
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then
+		# Already in the right location
+		:
+	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
+		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	else
+		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+	fi
+
+	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+	mkdir -p ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+
+	# Manually run the target stripper since we won't get it run by
+	# the packaging.
+	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+	${TARGET_PREFIX}strip ${D}/${base_libdir}gcc_s.so.*
+}
diff --git a/packages/gcc-snapshot/gcc-snapshot_cvs.bb b/packages/gcc-snapshot/gcc-snapshot_cvs.bb
index e69de29bb2..f7c1a0ec09 100644
--- a/packages/gcc-snapshot/gcc-snapshot_cvs.bb
+++ b/packages/gcc-snapshot/gcc-snapshot_cvs.bb
@@ -0,0 +1,209 @@
+SECTION = "devel"
+inherit autotools gettext
+
+PV = "${CVSDATE}"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+
+# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
+# packaged in the respective cross packages.
+PACKAGES = "${PN} ${PN}-symlinks \
+            ${PN}-c++ ${PN}-c++-symlinks \
+            ${PN}-f77 ${PN}-f77-symlinks \
+            libstdc++-dev libg2c-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}cpp \
+	       ${bindir}/${TARGET_PREFIX}gcov \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1 \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/collect2 \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/*.o \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/specs \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/lib* \
+	       ${libdir}/gcc/${TARGET_SYS}/${PV}/include"
+
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/cpp \
+			${bindir}/gcov \
+			${bindir}/gccbug"
+
+FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/f771"
+
+FILES_${PN}-f77-symlinks = "${bindir}/g77 \
+			    ${bindir}/f77"
+
+# Called from within gcc-cross, so libdir is set wrong
+#FILES_libg2c = "${libdir}/libg2c.so.*"
+FILES_libg2c = "${libdir}/libg2c.so.*"
+
+FILES_libg2c-dev = "${libdir}/libg2c.so \
+			  ${libdir}/libg2c.a \
+			  ${libdir}/libfrtbegin.a"
+
+FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1plus"
+
+FILES_${PN}-c++-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+FILES_libgcc = "/lib/libgcc_s.so.*"
+
+# Called from within gcc-cross, so libdir is set wrong
+#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${libdir}/gcc/${TARGET_SYS}/${PV}/include/README"
+
+SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/gcc;module=gcc;method=ext;rsh=ssh"
+
+gccbuild_uclibc_do_patch () {
+	#
+	# Hack things to use the correct shared lib loader
+	#
+	#LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" .`
+	#if [ -n "$LIST" ] ; then
+	#	perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},-dynamic-linker /lib/ld-uClibc.so.0},;" $LIST
+	#fi
+
+	#
+	# Prevent system glibc start files from leaking in uninvited...
+	#
+	perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 = \"${CROSS_DIR}/${TARGET_SYS}/lib/\";,;" gcc/gcc.c
+	perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 = \"${CROSS_DIR}/${TARGET_SYS}/usr/lib/\";,;" gcc/gcc.c
+
+	#
+	# Prevent system glibc include files from leaking in uninvited...
+	#
+	perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=${CROSS_DIR}/${TARGET_SYS}/include,;" gcc/Makefile.in
+	perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=${CROSS_DIR}/${TARGET_SYS}/include,;" gcc/Makefile.in
+	perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \"${CROSS_DIR}/${TARGET_SYS}/include\",;" gcc/cppdefault.h
+
+	#
+	# Prevent system glibc libraries from being found by collect2 
+	# when it calls locatelib() and rummages about the system looking 
+	# for libraries with the correct name...
+	#
+	perl -i -p -e "s,\"/lib,\"${CROSS_DIR}/${TARGET_SYS}/lib,g;" \
+		gcc/collect2.c
+	perl -i -p -e "s,\"/usr/,\"${CROSS_DIR}/${TARGET_SYS}/usr/,g;" \
+		gcc/collect2.c
+
+	#
+	# Prevent gcc from using the unwind-dw2-fde-glibc code
+	#
+	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc
+#ifndef inhibit_libc,g;" gcc/unwind-dw2-fde-glibc.c
+}
+
+python do_patch () {
+    import bb, re
+    bb.build.exec_func('base_do_patch', d)
+    if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.build.exec_func('gccbuild_uclibc_do_patch', d)
+}
+
+S = "${WORKDIR}/gcc"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-multilib \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS} \
+                ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+EXTRA_OECONF_DEP = ""
+EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
+EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+
+python __anonymous () {
+    import bb, re
+    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+}
+
+do_configure () {
+	# Setup these vars for cross building only
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
+		export AS_FOR_TARGET="${HOST_PREFIX}as"
+		export LD_FOR_TARGET="${HOST_PREFIX}ld"
+		export NM_FOR_TARGET="${HOST_PREFIX}nm"
+		export AR_FOR_TARGET="${HOST_PREFIX}ar"
+		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+	fi
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
+	rm ${D}/${libdir}/libgcc_s.so
+	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
+		| tr -s / \
+		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
+		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
+
+	# We don't need libtool libraries
+	rm ${D}/${libdir}/libg2c.la
+
+	# Cleanup manpages..
+	rm -r ${D}/${mandir}/man7
+
+	# We use libiberty from binutils
+	rm ${D}/${libdir}/libiberty.a
+
+	cd ${D}/${bindir}
+
+	# We care about g++ not c++
+	rm *c++
+
+	# We don't care about the gcc-<version> ones for this
+	rm *gcc-?.?*
+
+	# These sometimes show up, they are strange, we remove them
+	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+	# Symlinks so we can use these trivially on the target
+	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g++ g++
+	ln -sf ${TARGET_SYS}-gcc gcc
+	ln -sf g77 f77
+	ln -sf g++ c++
+	ln -sf gcc cc
+}
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index e69de29bb2..c59ea0d37a 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -0,0 +1,97 @@
+SECTION = "devel"
+include gcc_${PV}.bb
+inherit cross
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# Files for these are defined in the main gcc.oe
+PACKAGES = "libgcc libstdc++ libg2c"
+INHIBIT_PACKAGE_STRIP = 1
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
+
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
+
+do_configure () {
+	export CC="${BUILD_CC}"
+	export AR="${TARGET_SYS}-ar"
+	export RANLIB="${TARGET_SYS}-ranlib"
+	export LD="${TARGET_SYS}-ld"
+	export NM="${TARGET_SYS}-nm"
+	rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_compile_prepend () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+
+	# These aren't useful on the cross toolchain
+	rm -f ${CROSS_DIR}/bin/*gcov
+	rm -f ${CROSS_DIR}/bin/*gccbug
+
+	# Fix a few include links so cross builds are happier
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
+		rm -f ${STAGING_INCDIR}/c++
+		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+			${STAGING_INCDIR}/
+	fi
+
+	# We use libiberty from binutils
+	rm -f ${CROSS_DIR}/lib/libiberty.a
+
+	# We probably don't need these
+	rmdir ${CROSS_DIR}/include || :
+
+	# We don't really need to keep this around
+	rm -rf ${CROSS_DIR}/share
+}
+
+python do_package() {
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+	bb.build.exec_func('package_do_package', d)
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
+		# native builds drop one pathname component
+		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	else
+		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+	fi
+
+	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+	mkdir -p ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+
+	# Manually run the target stripper since we won't get it run by
+	# the packaging.
+	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+	${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.*
+}
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index e69de29bb2..3abf6f0103 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -0,0 +1,100 @@
+SECTION = "devel"
+include gcc_${PV}.bb
+inherit cross
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# Files for these are defined in the main gcc.oe
+PACKAGES = "libgcc libstdc++ libg2c"
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
+INHIBIT_PACKAGE_STRIP = 1
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
+
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
+
+do_configure () {
+	export CC="${BUILD_CC}"
+	export AR="${TARGET_SYS}-ar"
+	export RANLIB="${TARGET_SYS}-ranlib"
+	export LD="${TARGET_SYS}-ld"
+	export NM="${TARGET_SYS}-nm"
+	rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_compile_prepend () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+
+	# These aren't useful on the cross toolchain
+	rm -f ${CROSS_DIR}/bin/*gcov
+	rm -f ${CROSS_DIR}/bin/*gccbug
+
+	# Fix a few include links so cross builds are happier
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
+		rm -f ${STAGING_INCDIR}/c++
+		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+			${STAGING_INCDIR}/
+	fi
+
+	# We use libiberty from binutils
+	rm -f ${CROSS_DIR}/lib/libiberty.a
+
+	# We probably don't need these
+	rmdir ${CROSS_DIR}/include || :
+
+	# We don't really need to keep this around
+	rm -rf ${CROSS_DIR}/share
+}
+
+python do_package() {
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+	bb.build.exec_func('package_do_package', d)
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
+		# native builds drop one pathname component
+		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	else
+		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+	fi
+
+	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+	mkdir -p ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+
+	# Manually run the target stripper since we won't get it run by
+	# the packaging.
+	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+		${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.*
+	fi
+}
diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc
index e69de29bb2..205c40587b 100644
--- a/packages/gcc/gcc-package.inc
+++ b/packages/gcc/gcc-package.inc
@@ -0,0 +1,110 @@
+gcclibdir ?= "${libdir}/gcc"
+
+# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
+# packaged in the respective cross packages.
+PACKAGES = "${PN} ${PN}-symlinks \
+            ${PN}-c++ ${PN}-c++-symlinks \
+            ${PN}-f77 ${PN}-f77-symlinks \
+            libstdc++-dev libg2c-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}cpp \
+	       ${bindir}/${TARGET_PREFIX}gcov \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1 \
+	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/collect2 \
+	       ${gcclibdir}/${TARGET_SYS}/${PV}/*.o \
+	       ${gcclibdir}/${TARGET_SYS}/${PV}/specs \
+	       ${gcclibdir}/${TARGET_SYS}/${PV}/lib* \
+	       ${gcclibdir}/${TARGET_SYS}/${PV}/include"
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/cpp \
+			${bindir}/gcov \
+			${bindir}/gccbug"
+
+FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/f771"
+FILES_${PN}-f77-symlinks = "${bindir}/g77 \
+			    ${bindir}/f77"
+
+PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
+PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
+# Called from within gcc-cross, so libdir is set wrong
+FILES_libg2c = "${libdir}/libg2c.so.*"
+FILES_libg2c-dev = "${libdir}/libg2c.so \
+		    ${libdir}/libg2c.a \
+		    ${libdir}/libfrtbegin.a"
+
+FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1plus"
+FILES_${PN}-c++-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
+FILES_libgcc = "/lib/libgcc_s.so.1"
+
+PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
+PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
+# Called from within gcc-cross, so libdir is set wrong
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${gcclibdir}/${TARGET_SYS}/${PV}/include/README"
+
+
+do_install () {
+	autotools_do_install
+
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+
+	# Hack around specs file assumptions
+	sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/specs
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
+	rm ${D}/${libdir}/libgcc_s.so
+	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
+		| tr -s / \
+		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
+		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
+
+	# We don't need libtool libraries
+	rm ${D}/${libdir}/libg2c.la
+
+	# Cleanup manpages..
+	rm -r ${D}/${mandir}/man7
+
+	# We use libiberty from binutils
+	rm ${D}/${libdir}/libiberty.a
+
+	cd ${D}/${bindir}
+
+	# We care about g++ not c++
+	rm *c++
+
+	# We don't care about the gcc-<version> ones for this
+	rm *gcc-?.?*
+
+	# These sometimes show up, they are strange, we remove them
+	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+	# Symlinks so we can use these trivially on the target
+	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g++ g++
+	ln -sf ${TARGET_SYS}-gcc gcc
+	ln -sf g77 f77
+	ln -sf g++ c++
+	ln -sf gcc cc
+}
diff --git a/packages/gcc/gcc3-cross-build.inc b/packages/gcc/gcc3-cross-build.inc
index e69de29bb2..611b021b11 100644
--- a/packages/gcc/gcc3-cross-build.inc
+++ b/packages/gcc/gcc3-cross-build.inc
@@ -0,0 +1,79 @@
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
+INHIBIT_PACKAGE_STRIP = "1"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		      --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
+
+do_configure_prepend () {
+	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV}/libgcc_eh.a
+}
+
+do_compile_prepend () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+
+	# These aren't useful on the cross toolchain
+	rm -f ${CROSS_DIR}/bin/*gcov
+	rm -f ${CROSS_DIR}/bin/*gccbug
+
+	# Fix a few include links so cross builds are happier
+	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
+		mkdir -p ${STAGING_INCDIR}
+		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+			${STAGING_INCDIR}/
+	fi
+
+	# We use libiberty from binutils
+	rm -f ${CROSS_DIR}/lib/libiberty.a
+
+	# We probably don't need these
+	rmdir ${CROSS_DIR}/include || :
+
+	# We don't really need to keep this around
+	rm -rf ${CROSS_DIR}/share
+}
+
+python do_package() {
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+	bb.build.exec_func('package_do_package', d)
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}/${base_libdir}
+	if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then
+		# Already in the right location
+		:
+	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
+		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	else
+		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+	fi
+
+	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+	mkdir -p ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
+	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+
+	# Manually run the target stripper since we won't get it run by
+	# the packaging.
+	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+		${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.*
+	fi
+}
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index de6574d119..f69dedf29b 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -45,7 +45,7 @@ PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
 PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
 # Called from within gcc-cross, so libdir is set wrong
 #FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++ = "/usr/lib/libstdc++.so.*"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 
 FILES_libstdc++-dev = "${includedir}/c++/${PV} \
 		       ${libdir}/libstdc++.so \
@@ -160,8 +160,8 @@ do_install () {
 	rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/lib
+	mkdir -p ${D}/${base_libdir}
+	mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
 	rm -f ${D}/${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
 		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index 4258d58476..c93bda0e7a 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -45,7 +45,7 @@ PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
 PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
 # Called from within gcc-cross, so libdir is set wrong
 #FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++ = "/usr/lib/libstdc++.so.*"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 
 FILES_libstdc++-dev = "${includedir}/c++/${PV} \
 		       ${libdir}/libstdc++.so \
@@ -138,8 +138,8 @@ do_install () {
 	rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/lib
+	mkdir -p ${D}/${base_libdir}
+	mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
 	rm -f ${D}/${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
 		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb
index e69de29bb2..37617e8030 100644
--- a/packages/gchub/gchub-module_svn.bb
+++ b/packages/gchub/gchub-module_svn.bb
@@ -0,0 +1,17 @@
+SECTION = "base"
+PRIORITY = "optional"
+DESCRIPTION = "Kernel module for the GameCube Hub input device"
+DEPENDS = "virtual/kernel"
+MAINTAINER = "Micah Dowty <micah@navi.cx>"
+LICENSE = "GPL"
+PV = "svn-${CVSDATE}"
+SRC_URI = "svn://navi.cx/svn/misc/trunk/wasabi/devices;module=gchub"
+
+S = "${WORKDIR}/gchub/kernel"
+
+inherit module
+
+do_install() {
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb
+	install gchub.ko -m 0644 ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/gchub.ko
+}
diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb
index e69de29bb2..dac4dc0656 100644
--- a/packages/gdb/gdb_6.1.bb
+++ b/packages/gdb/gdb_6.1.bb
@@ -0,0 +1,54 @@
+LICENSE = GPL
+DESCRIPTION = "gdb - GNU debugger"
+SECTION = "devel"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "ncurses readline"
+
+PACKAGES =+ 'gdbserver '
+FILES_gdbserver = '${bindir}/gdbserver'
+
+inherit autotools gettext
+
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
+	   file://uclibc.patch;patch=1"
+
+LDFLAGS_append = " -s"
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CXX_FOR_BUILD = "${BUILD_CXX}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+export CFLAGS_append=" -L${STAGING_LIBDIR}"
+EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
+
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
+                --with-curses --with-readline --disable-sim \
+                --program-prefix=''"
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+	gnu-configize
+	oe_runconf
+}
+
+do_install () {
+	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
+	oe_runmake install \
+	    'prefix=${D}/${prefix}' 'exec_prefix=${D}/${prefix}' 'bindir=${D}/${bindir}' \
+	    'sbindir=${D}/${sbindir}' 'infodir=${D}/${infodir}' 'libdir=${D}/${libdir}' \
+	    'mandir=${D}/${mandir}' 'includedir=${D}/${includedir}'
+	install -d ${D}${bindir}
+	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
+}
+
+#
+# patch description
+#
+# readline.patch:
+#   gdb 5.3 provides its own readline source which tends to conflict with
+#   readline package. we override readline included from gdb source
+#   with packaged readline and fix up extern tilde_expand in gdb/defs.h
+#
diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb
index e69de29bb2..3c1490c8d1 100644
--- a/packages/gdb/gdb_6.2.bb
+++ b/packages/gdb/gdb_6.2.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "gdb - GNU debugger"
+LICENSE="GPL"
+SECTION = "devel"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "ncurses readline"
+
+PACKAGES =+ 'gdbserver '
+FILES_gdbserver = '${bindir}/gdbserver'
+
+inherit autotools gettext
+
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
+	   file://uclibc.patch;patch=1"
+
+LDFLAGS_append = " -s"
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CXX_FOR_BUILD = "${BUILD_CXX}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+export CFLAGS_append=" -L${STAGING_LIBDIR}"
+EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
+
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
+                --with-curses --disable-multilib --with-readline --disable-sim \
+                --program-prefix=''"
+
+S = "${WORKDIR}/gdb-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        CPPFLAGS="" oe_runconf
+}
+
+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'
+	install -d ${D}${bindir}
+	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
+}
diff --git a/packages/giac/giac_0.5.0.bb b/packages/giac/giac_0.5.0.bb
index e69de29bb2..642a851553 100644
--- a/packages/giac/giac_0.5.0.bb
+++ b/packages/giac/giac_0.5.0.bb
@@ -0,0 +1,39 @@
+SECTION = "console/utils"
+DESCRIPTION = "A free computer algebra system"
+HOMEPAGE = "http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+DEPENDS = "fltk gmp mpfr gsl"
+#          ntl pari"
+
+SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/giac_unstable.tgz"
+
+inherit autotools
+
+PACKAGES += " lib${PN}"
+FILES_${PN} = "${bindir} \
+               ${datadir}/${PN}"
+FILES_lib${PN} = "${libdir}"
+
+# breaks the build...
+#EXTRA_OECONF = "--enable-debug=no"
+
+# skip autoreconf for now (fails due to improper local macros)
+do_configure() {
+	oe_runconf
+}
+
+do_install () {
+	oe_runmake prefix="${D}/${prefix}" \
+		bindir="${D}/${bindir}" \
+		libdir="${D}/${libdir}" \
+		includedir="${D}/${includedir}" \
+		install
+
+	# put the docs where they belong
+	# might need further investigation in case giac needs
+	# them in the original place
+	install -d ${D}/${docdir}
+	mv ${D}/${datadir}/${PN}/doc ${D}/${docdir}/${PN}
+}
diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb
index 8722cfd02e..efdda949cf 100644
--- a/packages/gnome/gnome-common_2.4.0.bb
+++ b/packages/gnome/gnome-common_2.4.0.bb
@@ -19,9 +19,9 @@ do_stage () {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
 	make DESTDIR="${STAGE_TEMP}" install
-	cp -a ${STAGE_TEMP}/usr/bin/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	cp -a ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
 	install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -a ${STAGE_TEMP}/usr/share/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -a ${STAGE_TEMP}/usr/share/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
+	cp -a ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
+	cp -a ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
 	rm -rf ${STAGE_TEMP}
 }
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
index e69de29bb2..bcf50ae7d2 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
@@ -0,0 +1,19 @@
+inherit gpe
+
+DEPENDS = "gtk+ librsvg"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI += "file://splash-p.svg file://splash-l.svg"
+
+FILES_${PN} += "${datadir}/gpe"
+
+do_install_append() {
+	install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-p.svg
+	install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-l.svg
+	mv ${D}/${sysconfdir}/rcS.d/S00bootsplash ${D}/${sysconfdir}/rcS.d/S02bootsplash
+}
+
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index ab096f4426..a2bda8b6e0 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -14,6 +14,6 @@ FILES_${PN} += "${datadir}/gpe"
 do_install_append() {
 	install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-p.svg
 	install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-l.svg
-	mv ${D}/etc/rcS.d/S00bootsplash ${D}/etc/rcS.d/S02bootsplash
+	mv ${D}/${sysconfdir}/rcS.d/S00bootsplash ${D}/${sysconfdir}/rcS.d/S02bootsplash
 }
 
diff --git a/packages/gpe-edit/gpe-edit_0.21.bb b/packages/gpe-edit/gpe-edit_0.21.bb
index ed0a660d2d..54bdcbe3b9 100644
--- a/packages/gpe-edit/gpe-edit_0.21.bb
+++ b/packages/gpe-edit/gpe-edit_0.21.bb
@@ -5,4 +5,4 @@ DEPENDS = "gtk+ libdisplaymigration libgpewidget"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 DESCRIPTION = "Editor for the GPE Palmtop Environment"
-FILES_${PN} = "/etc /usr/bin /usr/share/pixmaps /usr/share/applications"
+FILES_${PN} = "/etc ${bindir} ${datadir}/pixmaps ${datadir}/applications"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
index a2463753bb..ef503e4dde 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
@@ -14,9 +14,9 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question
 SRC_URI += "file://change-default-applets.patch;patch=1"
 
 do_install_append() {
-	install -d ${D}/etc/gpe/xsettings-default.d
+	install -d ${D}/${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}/${sysconfdir}/gpe/xsettings-default.d/toolbar
 	fi
 }
 
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index df14b2baf3..0dacd7a7de 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -21,20 +21,20 @@ SRC_URI += "file://zaurus.sh \
 	file://disable-composite.xsettings"
 
 do_install_append() {
-	install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus
-	install ${WORKDIR}/keymap.sh ${D}/etc/X11/Xinit.d/12keymap
+	install ${WORKDIR}/zaurus.sh ${D}/${sysconfdir}/X11/Xinit.d/11zaurus
+	install ${WORKDIR}/keymap.sh ${D}/${sysconfdir}/X11/Xinit.d/12keymap
 	for m in simpad shepherd collie; do
-		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/etc/X11/
+		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/${sysconfdir}/X11/
 	done
-	install -d ${D}/etc/gpe/xsettings-default.d
+	install -d ${D}/${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}/${sysconfdir}/gpe/xsettings-default.d/toolbar
 	fi
-	install -d ${D}/etc/matchbox
-	install ${WORKDIR}/matchbox-session ${D}/etc/matchbox/session
+	install -d ${D}/${sysconfdir}/matchbox
+	install ${WORKDIR}/matchbox-session ${D}/${sysconfdir}/matchbox/session
 
-	install -d ${D}/etc/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}/etc/gpe/xsettings-default.d/disable-composite
+	install -d ${D}/${sysconfdir}/gpe/xsettings-default.d
+	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}/${sysconfdir}/gpe/xsettings-default.d/disable-composite
 }
 
 # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
diff --git a/packages/gpsd/gpsd_2.6.bb b/packages/gpsd/gpsd_2.6.bb
index e89d775928..90f51c65d7 100644
--- a/packages/gpsd/gpsd_2.6.bb
+++ b/packages/gpsd/gpsd_2.6.bb
@@ -31,20 +31,20 @@ do_stage () {
 
 do_install () {
 	install -d ${D}/${sbindir}
-	install -d ${D}/${datadir}/man/man1
-	install -d ${D}/${datadir}/man/man3
+	install -d ${D}/${mandir}/man1
+	install -d ${D}/${mandir}/man3
 	install -d ${D}/${incdir}
 	install -d ${D}/${libdir}
 	install -d ${D}/${sysconfdir}/init.d
 
 	install -m 0755 ${S}/.libs/gpsd ${D}${sbindir}
 	oe_libinstall -so -C ${S}/.libs libgps ${D}${libdir}
-	install -m 755 gpsd.1 ${D}/usr/share/man/man1/gpsd.1
+	install -m 755 gpsd.1 ${D}${mandir}/man1/gpsd.1
 	install -m 0755 ${S}/libgps.la ${D}${libdir}libgps.la
 	install -m 0755 ${S}/gps.h ${S}/gpsd.h ${D}/${incdir}
-	install -m 755 libgps.3 libgpsd.3 ${D}/${datadir}/man/man3/
+	install -m 755 libgps.3 libgpsd.3 ${D}/${mandir}/man3/
 	install -m 755 gpsd.init ${D}${sysconfdir}/init.d/gpsd
 }
 
 PACKAGES =+ "gpsd-devdoc "
-FILES_${PN}-devdoc = "${datadir}/man/man3 "
+FILES_${PN}-devdoc = "${mandir}/man3 "
diff --git a/packages/gputty/gputty_0.9.7.bb b/packages/gputty/gputty_0.9.7.bb
index e69de29bb2..51cc98fbdb 100644
--- a/packages/gputty/gputty_0.9.7.bb
+++ b/packages/gputty/gputty_0.9.7.bb
@@ -0,0 +1,26 @@
+#  OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="GPuTTY is a PuTTY clone using the Gnome environment"
+HOMEPAGE="http://www.defora.org/index.php?page=gputty"
+LICENSE="GPL"
+SECTION="net-misc"
+
+SRC_URI="http://www.defora.org/projects/GPuTTY/files/gputty-${PV}.tar.gz \
+	file://conf.patch;patch=1 \
+	file://gputty"
+
+# Save the configuration file in the package
+FILES_${PN} += " /etc/gputty"
+
+do_compile() {
+	oe_runmake -C src
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	oe_runmake -C src BINDIR="${bindir}" DESTDIR="${D}" install
+	install -d ${D}/${sysconfdir}/
+	install -m 0644 ${WORKDIR}/gputty ${D}/${sysconfdir}/
+}
diff --git a/packages/gsl/gsl_1.4.bb b/packages/gsl/gsl_1.4.bb
index e69de29bb2..60619a9697 100644
--- a/packages/gsl/gsl_1.4.bb
+++ b/packages/gsl/gsl_1.4.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GNU Scientific Library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.mirror.ac.uk/sites/sources.redhat.com/pub/gsl/gsl-${PV}.tar.gz"
+
+inherit autotools pkgconfig binconfig
+
+LEAD_SONAME = "libgsl.so"
+
+do_stage() {
+	oe_runmake DESTDIR=${S}/.install install
+	oe_libinstall -so -C cblas/.libs/ libgslcblas ${STAGING_LIBDIR}
+	oe_libinstall -so -C .libs/ libgsl ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/gsl
+	install -m 0644 .install${includedir}/gsl/* ${STAGING_INCDIR}/gsl
+}
diff --git a/packages/gstreamer/gstreamer_0.8.5.bb b/packages/gstreamer/gstreamer_0.8.5.bb
index e69de29bb2..2e5ef2a53a 100644
--- a/packages/gstreamer/gstreamer_0.8.5.bb
+++ b/packages/gstreamer/gstreamer_0.8.5.bb
@@ -0,0 +1,34 @@
+LICENSE = LGPL
+PR = "r0"
+
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+DEPENDS = "glib-2.0  libxml2 popt"
+SECTION = "x11/network"
+PRIORITY = "optional"
+
+FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+	file://gstreamer.xsession \
+	file://configure-largefile.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
+
+inherit autotools pkgconfig gettext
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}/${sysconfdir}/X11/Xsession.d/90gst-register
+}
+
diff --git a/packages/gstreamer/gstreamer_0.8.7.bb b/packages/gstreamer/gstreamer_0.8.7.bb
index e69de29bb2..3f0ce7c307 100644
--- a/packages/gstreamer/gstreamer_0.8.7.bb
+++ b/packages/gstreamer/gstreamer_0.8.7.bb
@@ -0,0 +1,33 @@
+LICENSE = LGPL
+PR = "r0"
+
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+DEPENDS = "glib-2.0 gettext-native libxml2 popt"
+SECTION = "base"
+PRIORITY = "optional"
+
+FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+	file://gstreamer.xsession"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}/${sysconfdir}/X11/Xsession.d/90gst-register
+}
+
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index e69de29bb2..089f13e996 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -0,0 +1,57 @@
+LICENSE = LGPL
+DESCRIPTION = "GTK+1.2 is a deprecated library provided for running programs not yet converted to GTK+2.0"
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
+DEPENDS = "glib-1.2 jpeg libpng xext"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
+           file://gtk+1.2-reconf-fix;patch=1 \
+           file://no-xwc;patch=1"
+S = "${WORKDIR}/gtk+-${PV}"
+
+inherit autotools pkgconfig flow-lossage
+
+do_configure_prepend() {
+	install -d m4
+	rm -f ltconfig libtool ltmain.sh aclocal.m4
+}
+
+FILES_${PN} += "${datadir}/themes"
+FILES_${PN}-dev += "${datadir}/gtk-1.2/include ${libdir}/gtk-1.2/include"
+
+
+EXTRA_OECONF = "--enable-debug=no --disable-glibtest --disable-xim"
+# --disable-cruft
+
+LIBV = "1.2.10"
+
+gtk_include = "fnmatch.h gtk.h gtkaccelgroup.h gtkaccellabel.h gtkadjustment.h gtkalignment.h gtkarg.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclist.h gtkcolorsel.h gtkcombo.h gtkcompat.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdata.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkimage.h gtkinputdialog.h gtkintl.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenufactory.h gtkmenuitem.h gtkmenushell.h gtkmisc.h gtknotebook.h gtkobject.h gtkoptionmenu.h gtkpacker.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtksignal.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h makeenums.h stamp-gtkmarshal.h stamp-gtktypebuiltins.h"
+gdk_include = "MwmUtil.h gdk.h gdkcursors.h gdki18n.h gdkinput.h gdkinputcommon.h gdkinputgxi.h gdkinputnone.h gdkinputxfree.h gdkkeysyms.h gdkprivate.h gdkrgb.h gdktypes.h gdkx.h gxid_lib.h gxid_proto.h"
+
+do_stage () {
+	oe_libinstall -so -C gtk libgtk ${STAGING_LIBDIR}
+	oe_libinstall -so -C gdk libgdk ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gtk-1.2/gtk
+	for i in ${gtk_include}; do
+		install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-1.2/gtk/$i
+	done
+
+	mkdir -p ${STAGING_INCDIR}/gtk-1.2/gdk
+	for i in ${gdk_include}; do
+		install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-1.2/gdk/$i
+	done
+
+	mkdir -p ${STAGING_LIBDIR}/gtk-1.2/include
+
+	install -m 0644 gtk.m4 ${STAGING_DATADIR}/aclocal/
+	install -m 0755 gtk-config ${STAGING_BINDIR}
+}
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/gtk-1.2
+}
+
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index a51872de7b..3d37fda14d 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -52,6 +52,6 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/etc/gtk-1.2
+	install -d ${D}/${sysconfdir}/gtk-1.2
 }
 
diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb
index e69de29bb2..3eff8adf27 100644
--- a/packages/gtk+/gtk+_2.2.4.bb
+++ b/packages/gtk+/gtk+_2.2.4.bb
@@ -0,0 +1,76 @@
+LICENSE = LGPL
+DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
+set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "pango atk jpeg libpng xext"
+
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
+           http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \
+           file://automake-lossage.patch;patch=1;pnum=0 \
+           file://configure-lossage.patch;patch=1;pnum=0 \
+           file://no-demos.patch;patch=1 \
+           file://libtool-lossage.patch;patch=1;pnum=0 \
+           file://no-xwc.patch;patch=1;pnum=0 \
+           file://glib-2.0.m4 \
+           file://glib-gettext.m4"
+
+inherit autotools  pkgconfig
+
+do_configure_prepend() {
+	install -d m4
+	install ${WORKDIR}/glib-2.0.m4 m4/
+	install ${WORKDIR}/glib-gettext.m4 m4/
+}
+
+EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft"
+
+LIBV = "2.2.0"
+
+gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h"
+gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h gdkdrawable.h gdkenumtypes.h gdkevents.h gdkfont.h gdkgc.h gdki18n.h gdkimage.h gdkinput.h gdkkeys.h gdkkeysyms.h gdkpango.h gdkpixbuf.h gdkpixmap.h gdkprivate.h gdkproperty.h gdkregion.h gdkrgb.h gdkscreen.h gdkselection.h gdktypes.h gdkvisual.h gdkwindow.h x11/gdkx.h"
+gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h"
+
+do_stage () {
+	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk
+	for i in ${gtk_include}; do
+		install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-2.0/gtk/$i
+	done
+
+	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk
+	for i in ${gdk_include}; do
+		install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-2.0/gdk/`basename $i`
+	done
+
+	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf
+	for i in ${gdk_pixbuf_include}; do
+		install -m 0644 gdk-pixbuf/$i ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf/$i
+	done
+
+	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
+	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
+
+	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/gtk-2.0
+}
+
+python populate_packages_prepend () {
+	import os.path
+
+	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+	loaders_root = os.path.join(gtk_libdir, 'loaders')
+	immodules_root = os.path.join(gtk_libdir, 'immodules')
+
+	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+}
diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
index d8a0aa107b..968851d951 100644
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ b/packages/gtk+/gtk+_2.4.13.bb
@@ -59,7 +59,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/etc/gtk-2.0
+	install -d ${D}/${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb
index e69de29bb2..7830c759c9 100644
--- a/packages/gtk+/gtk+_2.4.4.bb
+++ b/packages/gtk+/gtk+_2.4.4.bb
@@ -0,0 +1,86 @@
+LICENSE = LGPL
+DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
+set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
+PR = "r7"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
+           file://no-demos.patch;patch=1 \
+           file://no-xwc.patch;patch=1;pnum=0 \
+           file://automake-lossage.patch;patch=1 \
+	   file://single-click.patch;patch=1 \
+           file://gtk+-handhelds.patch;patch=1 \
+           file://hardcoded_libtool.patch;patch=1 \
+	   file://spinbutton.patch;patch=1 \
+	   file://disable-tooltips.patch;patch=1 \
+	   file://gtklabel-resize-patch;patch=1 \
+           file://gtk-doc.m4 \
+	   file://small-gtkfilesel.patch;patch=1"
+
+inherit autotools pkgconfig flow-lossage
+
+do_configure_prepend() {
+	install -d m4
+	install ${WORKDIR}/gtk-doc.m4 m4/
+}
+
+FILES_${PN} += "${datadir}/themes"
+FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include"
+
+EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-xkb --disable-glibtest"
+# --disable-cruft
+
+LIBV = "2.4.0"
+
+gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h gtkentrycompletion.h gtkcomboboxentry.h gtkcolorbutton.h gtkcombobox.h gtkcelllayout.h gtkactiongroup.h gtkaction.h gtkexpander.h gtkfilechooserdialog.h gtkfilechooserwidget.h gtkfontbutton.h gtkicontheme.h gtkradioaction.h gtkradiotoolbutton.h gtkseparatortoolitem.h gtktoggleaction.h gtktoggletoolbutton.h gtktoolitem.h gtkuimanager.h gtktreemodelfilter.h gtktoolbutton.h gtkfilechooser.h gtkfilefilter.h gtkfilesystem.h"
+gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h gdkdrawable.h gdkenumtypes.h gdkevents.h gdkfont.h gdkgc.h gdki18n.h gdkimage.h gdkinput.h gdkkeys.h gdkkeysyms.h gdkpango.h gdkpixbuf.h gdkpixmap.h gdkprivate.h gdkproperty.h gdkregion.h gdkrgb.h gdkscreen.h gdkselection.h gdktypes.h gdkvisual.h gdkwindow.h x11/gdkx.h gdkspawn.h"
+gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h"
+
+do_stage () {
+	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk
+	for i in ${gtk_include}; do
+		install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-2.0/gtk/$i
+	done
+
+	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk
+	for i in ${gdk_include}; do
+		install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-2.0/gdk/`basename $i`
+	done
+
+	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf
+	for i in ${gdk_pixbuf_include}; do
+		install -m 0644 gdk-pixbuf/$i ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf/$i
+	done
+
+	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
+	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
+
+	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/gtk-2.0
+}
+
+python populate_packages_prepend () {
+	import os.path
+
+	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+	loaders_root = os.path.join(gtk_libdir, 'loaders')
+	immodules_root = os.path.join(gtk_libdir, 'immodules')
+
+	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
+}
diff --git a/packages/gtk+/gtk+_2.6.0.bb b/packages/gtk+/gtk+_2.6.0.bb
index e25a9b4b85..bc6c4e27d7 100644
--- a/packages/gtk+/gtk+_2.6.0.bb
+++ b/packages/gtk+/gtk+_2.6.0.bb
@@ -53,7 +53,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/etc/gtk-2.0
+	install -d ${D}/${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.6.1.bb b/packages/gtk+/gtk+_2.6.1.bb
index 7e910768c1..20a6bf3d7a 100644
--- a/packages/gtk+/gtk+_2.6.1.bb
+++ b/packages/gtk+/gtk+_2.6.1.bb
@@ -54,7 +54,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/etc/gtk-2.0
+	install -d ${D}/${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.6.2.bb b/packages/gtk+/gtk+_2.6.2.bb
index 32833a8aba..b84425217f 100644
--- a/packages/gtk+/gtk+_2.6.2.bb
+++ b/packages/gtk+/gtk+_2.6.2.bb
@@ -53,7 +53,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/etc/gtk-2.0
+	install -d ${D}/${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/hostap/hostap-modules_0.1.3.bb b/packages/hostap/hostap-modules_0.1.3.bb
index cb288631ad..d88da7e971 100644
--- a/packages/hostap/hostap-modules_0.1.3.bb
+++ b/packages/hostap/hostap-modules_0.1.3.bb
@@ -14,12 +14,12 @@ inherit module
 MAKE_TARGETS = "hostap pccard"
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
-		   ${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
         	   ${D}/${sysconfdir}/pcmcia
-	install -m 0755 driver/modules/hostap_crypt_wep${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-	install -m 0755 driver/modules/hostap${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-	install -m 0755 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0755 driver/modules/hostap_crypt_wep${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+	install -m 0755 driver/modules/hostap${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+	install -m 0755 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
         install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf                
         cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
 
diff --git a/packages/hostap/hostap-modules_0.2.6.bb b/packages/hostap/hostap-modules_0.2.6.bb
index 902d4d1a47..6b4007425d 100644
--- a/packages/hostap/hostap-modules_0.2.6.bb
+++ b/packages/hostap/hostap-modules_0.2.6.bb
@@ -21,20 +21,20 @@ MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
 NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
-		   ${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
         	   ${D}/${sysconfdir}/pcmcia
 	for i in ${NET_MODULES}
 	do
-		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
 	done
-	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
 	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
 	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
 
 	if [ "${MACHINE}" = "mtx-1" ]; then
-		install -d ${D}/etc/modutils
-		echo "hostap_pci" > ${D}/etc/modutils/hostap
+		install -d ${D}/${sysconfdir}/modutils
+		echo "hostap_pci" > ${D}/${sysconfdir}/modutils/hostap
 	fi
 }
 
diff --git a/packages/hostap/hostap-modules_0.3.5.bb b/packages/hostap/hostap-modules_0.3.5.bb
index e69de29bb2..6db38c4f35 100644
--- a/packages/hostap/hostap-modules_0.3.5.bb
+++ b/packages/hostap/hostap-modules_0.3.5.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r3"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
+           file://hostap_cs.conf \
+	   file://Makefile.patch;patch=1"
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
+	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+
+S = "${WORKDIR}/hostap-driver-${PV}"
+
+inherit module
+
+# Hack Alert :D
+ARCH_mipsel = "mips"
+MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'"
+
+NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}/${sysconfdir}/pcmcia
+	for i in ${NET_MODULES}
+	do
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+	done
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+}
+
+PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
+FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
+FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}"
+FILES_hostap-modules = "/lib/modules/"
+RDEPENDS_hostap-modules-cs = "hostap-modules"
+RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb
index e69de29bb2..a68d8b959b 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
+           file://hostap_cs.conf \
+	   file://Makefile.patch;patch=1"
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
+	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+
+S = "${WORKDIR}/hostap-driver-${PV}"
+
+inherit module
+
+# Hack Alert :D
+ARCH_mipsel = "mips"
+MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'"
+
+NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}/${sysconfdir}/pcmcia
+	for i in ${NET_MODULES}
+	do
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+	done
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+}
+
+PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
+FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
+FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}"
+FILES_hostap-modules = "/lib/modules/"
+RDEPENDS_hostap-modules-cs = "hostap-modules"
+RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.4.bb
index e69de29bb2..e2d21f10d4 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.4.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "High level tools to configure network interfaces \
+This package provides the tools ifup and ifdown which may be used to \
+configure (or, respectively, deconfigure) network interfaces, based on \
+the file /etc/network/interfaces."
+LICENSE = "GPL"
+
+SECTION = "base"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \
+           ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \
+           file://busybox.patch;patch=1 \
+           file://udhcpc.patch;patch=1 \
+           file://zeroconf.patch;patch=1 \
+           file://gcc34-fix.patch;patch=1 \
+           file://init \
+           file://interfaces"
+
+EXTRA_OEMAKE = ""
+
+do_compile () {
+	chmod a+rx *.pl *.sh
+	oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'"
+}
+
+do_install () {
+	install -d ${D}/${sysconfdir}/init.d \
+		   ${D}/${sysconfdir}/network \
+		   ${D}/${base_sbindir}
+	install -m 0755 ifup ${D}/${base_sbindir}/
+	ln ${D}/${base_sbindir}/ifup ${D}/${base_sbindir}/ifdown
+	install -m 0644 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/networking
+	install -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
+}
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 2003c63094..076a69576c 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -63,80 +63,80 @@ do_install () {
 		   ${D}/${sysconfdir}/rc6.d \
 		   ${D}/${sysconfdir}/default
 
-	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/checkroot.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/finish		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/halt		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/hostname.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/mountall.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/mountnfs.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/ramdisk		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/reboot		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/rmnologin	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/sendsigs		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/single		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/urandom		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/devpts.sh	${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/devpts		${D}/etc/default
-	install -m 0755    ${WORKDIR}/sysfs.sh		${D}/etc/init.d
+	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/checkroot.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/finish		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/halt		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/hostname.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/mountall.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/mountnfs.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/ramdisk		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/reboot		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rmnologin	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/sendsigs		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/single		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/urandom		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/devpts.sh	${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/devpts		${D}/${sysconfdir}/default
+	install -m 0755    ${WORKDIR}/sysfs.sh		${D}/${sysconfdir}/init.d
 	if [ "${TARGET_ARCH}" = "arm" ]; then
-		install -m 0755 ${WORKDIR}/alignment.sh	${D}/etc/init.d
+		install -m 0755 ${WORKDIR}/alignment.sh	${D}/${sysconfdir}/init.d
 	fi
 #
 # Install device dependent scripts
 #
 
 	if [ "${DISTRO}" == "openzaurus" ]; then
-		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}/etc/init.d/checkversion
-        	chmod 0755 				${D}/etc/init.d/checkversion
-		ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S00version
+		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}/${sysconfdir}/init.d/checkversion
+        	chmod 0755 				${D}/${sysconfdir}/init.d/checkversion
+		ln -sf          ../init.d/checkversion  ${D}/${sysconfdir}/rcS.d/S00version
 	fi
 
 	if [ "${MACHINE}" == "c7x0" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/etc
-		install -m 0755    ${WORKDIR}/keymap				${D}/etc/init.d
-		ln -sf          ../init.d/keymap  				${D}/etc/rcS.d/S04keymap
+		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/${sysconfdir}
+		install -m 0755    ${WORKDIR}/keymap				${D}/${sysconfdir}/init.d
+		ln -sf          ../init.d/keymap  				${D}/${sysconfdir}/rcS.d/S04keymap
 	fi
 
 
-	install -m 0755 ${WORKDIR}/banner	${D}/etc/init.d/banner
-	install -m 0755 ${WORKDIR}/devices	${D}/etc/init.d/devices
-	install -m 0755 ${WORKDIR}/umountfs	${D}/etc/init.d/umountfs
+	install -m 0755 ${WORKDIR}/banner	${D}/${sysconfdir}/init.d/banner
+	install -m 0755 ${WORKDIR}/devices	${D}/${sysconfdir}/init.d/devices
+	install -m 0755 ${WORKDIR}/umountfs	${D}/${sysconfdir}/init.d/umountfs
 #
 # Create runlevel links
 #
-	ln -sf		../init.d/rmnologin	${D}/etc/rc2.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/etc/rc3.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/etc/rc4.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/etc/rc5.d/S99rmnologin
-	ln -sf		../init.d/sendsigs	${D}/etc/rc6.d/S20sendsigs
-#	ln -sf		../init.d/urandom	${D}/etc/rc6.d/S30urandom
-	ln -sf		../init.d/umountnfs.sh	${D}/etc/rc6.d/S31umountnfs.sh
-#	ln -sf		../init.d/umountfs	${D}/etc/rc6.d/S40umountfs
-	ln -sf          ../init.d/ramdisk       ${D}/etc/rcS.d/S30ramdisk 
-	ln -sf		../init.d/reboot	${D}/etc/rc6.d/S90reboot
-	ln -sf		../init.d/sendsigs	${D}/etc/rc0.d/S20sendsigs
-#	ln -sf		../init.d/urandom	${D}/etc/rc0.d/S30urandom
-	ln -sf		../init.d/umountnfs.sh	${D}/etc/rc0.d/S31umountnfs.sh
-#	ln -sf		../init.d/umountfs	${D}/etc/rc0.d/S40umountfs
-	ln -sf		../init.d/halt		${D}/etc/rc0.d/S90halt
-	ln -sf		../init.d/banner	${D}/etc/rcS.d/S01banner
-	ln -sf		../init.d/checkroot.sh	${D}/etc/rcS.d/S10checkroot.sh
-#	ln -sf		../init.d/checkfs.sh	${D}/etc/rcS.d/S30checkfs.sh
-	ln -sf		../init.d/mountall.sh	${D}/etc/rcS.d/S35mountall.sh
-	ln -sf		../init.d/hostname.sh	${D}/etc/rcS.d/S40hostname.sh
-	ln -sf		../init.d/mountnfs.sh	${D}/etc/rcS.d/S45mountnfs.sh
-	ln -sf		../init.d/bootmisc.sh	${D}/etc/rcS.d/S55bootmisc.sh
-#	ln -sf		../init.d/urandom	${D}/etc/rcS.d/S55urandom
-	ln -sf		../init.d/finish	${D}/etc/rcS.d/S99finish
-	ln -sf		../init.d/devices	${D}/etc/rcS.d/S04devices
+	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc2.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc3.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc4.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc5.d/S99rmnologin
+	ln -sf		../init.d/sendsigs	${D}/${sysconfdir}/rc6.d/S20sendsigs
+#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rc6.d/S30urandom
+	ln -sf		../init.d/umountnfs.sh	${D}/${sysconfdir}/rc6.d/S31umountnfs.sh
+#	ln -sf		../init.d/umountfs	${D}/${sysconfdir}/rc6.d/S40umountfs
+	ln -sf          ../init.d/ramdisk       ${D}/${sysconfdir}/rcS.d/S30ramdisk 
+	ln -sf		../init.d/reboot	${D}/${sysconfdir}/rc6.d/S90reboot
+	ln -sf		../init.d/sendsigs	${D}/${sysconfdir}/rc0.d/S20sendsigs
+#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rc0.d/S30urandom
+	ln -sf		../init.d/umountnfs.sh	${D}/${sysconfdir}/rc0.d/S31umountnfs.sh
+#	ln -sf		../init.d/umountfs	${D}/${sysconfdir}/rc0.d/S40umountfs
+	ln -sf		../init.d/halt		${D}/${sysconfdir}/rc0.d/S90halt
+	ln -sf		../init.d/banner	${D}/${sysconfdir}/rcS.d/S01banner
+	ln -sf		../init.d/checkroot.sh	${D}/${sysconfdir}/rcS.d/S10checkroot.sh
+#	ln -sf		../init.d/checkfs.sh	${D}/${sysconfdir}/rcS.d/S30checkfs.sh
+	ln -sf		../init.d/mountall.sh	${D}/${sysconfdir}/rcS.d/S35mountall.sh
+	ln -sf		../init.d/hostname.sh	${D}/${sysconfdir}/rcS.d/S40hostname.sh
+	ln -sf		../init.d/mountnfs.sh	${D}/${sysconfdir}/rcS.d/S45mountnfs.sh
+	ln -sf		../init.d/bootmisc.sh	${D}/${sysconfdir}/rcS.d/S55bootmisc.sh
+#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rcS.d/S55urandom
+	ln -sf		../init.d/finish	${D}/${sysconfdir}/rcS.d/S99finish
+	ln -sf		../init.d/devices	${D}/${sysconfdir}/rcS.d/S04devices
 	# udev will run at S03 if installed
-	ln -sf		../init.d/sysfs.sh	${D}/etc/rcS.d/S02sysfs
-	ln -sf		../init.d/devpts.sh	${D}/etc/rcS.d/S38devpts.sh
+	ln -sf		../init.d/sysfs.sh	${D}/${sysconfdir}/rcS.d/S02sysfs
+	ln -sf		../init.d/devpts.sh	${D}/${sysconfdir}/rcS.d/S38devpts.sh
 	if [ "${TARGET_ARCH}" = "arm" ]; then
-		ln -sf	../init.d/alignment.sh	${D}/etc/rcS.d/S05alignment
+		ln -sf	../init.d/alignment.sh	${D}/${sysconfdir}/rcS.d/S05alignment
 	fi
 
-	install -m 0755    ${WORKDIR}/device_table.txt		${D}/etc/device_table
+	install -m 0755    ${WORKDIR}/device_table.txt		${D}/${sysconfdir}/device_table
 }
diff --git a/packages/ipkg/ipkg_0.99.129.bb b/packages/ipkg/ipkg_0.99.129.bb
index 4bb025c487..dcf513d81f 100644
--- a/packages/ipkg/ipkg_0.99.129.bb
+++ b/packages/ipkg/ipkg_0.99.129.bb
@@ -29,12 +29,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/ipkg/ipkg_0.99.130.bb b/packages/ipkg/ipkg_0.99.130.bb
index a270c48fa6..6431a61ccf 100644
--- a/packages/ipkg/ipkg_0.99.130.bb
+++ b/packages/ipkg/ipkg_0.99.130.bb
@@ -29,12 +29,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
index 4e948a7a42..0c1fc69ee6 100644
--- a/packages/ipkg/ipkg_0.99.135.bb
+++ b/packages/ipkg/ipkg_0.99.135.bb
@@ -32,12 +32,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/ipkg/ipkg_0.99.138.bb b/packages/ipkg/ipkg_0.99.138.bb
index e69de29bb2..70bb45d7a7 100644
--- a/packages/ipkg/ipkg_0.99.138.bb
+++ b/packages/ipkg/ipkg_0.99.138.bb
@@ -0,0 +1,52 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+PR = "r0"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+	file://terse.patch;patch=1"
+
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	# this happens at S98 where our good 'ole packages script used to run
+	echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
+}
+
+do_stage() {
+	oe_libinstall -so libipkg ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/replace/
+	install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+	install -d ${STAGING_INCDIR}/libipkg/
+	for f in *.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+	done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#
diff --git a/packages/ipkg/ipkg_0.99.140.bb b/packages/ipkg/ipkg_0.99.140.bb
index aae1780823..1a6bb08317 100644
--- a/packages/ipkg/ipkg_0.99.140.bb
+++ b/packages/ipkg/ipkg_0.99.140.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Itsy Package Manager"
 DESCRIPTION_libipkg = "Itsy Package Manager Library"
 LICENSE = "GPL"
 PROVIDES = "virtual/ipkg libipkg"
-PR = "r0"
+PR = "r2"
 
 PACKAGES =+ "libipkg-dev libipkg"
 FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
@@ -29,12 +29,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/iproute2/iproute2_2.6.8.bb b/packages/iproute2/iproute2_2.6.8.bb
index e69de29bb2..d904ea5a97 100644
--- a/packages/iproute2/iproute2_2.6.8.bb
+++ b/packages/iproute2/iproute2_2.6.8.bb
@@ -0,0 +1,14 @@
+SECTION = "base"
+DESCRIPTION = "kernel routing and traffic control utilities"
+LICENSE = "GPL"
+
+SRC_URI="http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.8-ss040730.tar.gz \
+	file://iproute2-2.6.8_no_strip.diff;patch=1;pnum=0"
+
+PR="r1"
+	
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+
+do_install () {
+	oe_runmake DESTDIR=${D} install
+}
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
index e69de29bb2..028be89aff 100644
--- a/packages/iptables/iptables_1.2.9.bb
+++ b/packages/iptables/iptables_1.2.9.bb
@@ -0,0 +1,20 @@
+SECTION = "console/network"
+DESCRIPTION = "iptables network filtering tools"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+
+S = "${WORKDIR}/iptables-${PV}"
+
+export COPT_FLAGS = "${CFLAGS}"
+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
+}
+
+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
+}
diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 874013268b..54f783ea81 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -18,13 +18,13 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/bin ${D}${sbindir} \
-		   ${D}/${mandir}/man8 ${D}/${datadir}/doc/${P}
-	install -m 0755 ping ${D}/bin/
+	install -d ${D}/${base_bindir} ${D}${sbindir} \
+		   ${D}/${mandir}/man8 ${D}/${docdir}/${P}
+	install -m 0755 ping ${D}/${base_bindir}/
 	for f in ipg tracepath clockdiff rdisc arping \
 		tftpd rarpd tracepath6 traceroute6 ping6; do
 		install -m 0755 $f ${D}/${sbindir}/
 	done
 	install -m 0644 doc/*.8 ${D}/${mandir}/man8/
-	install -m 0644 doc/*.html ${D}/${datadir}/doc/${P}/
+	install -m 0644 doc/*.html ${D}/${docdir}/${P}/
 }
diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb
index e69de29bb2..36b80a1b71 100644
--- a/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/packages/irda-utils/irda-utils_0.9.16.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Provides common files needed to use IrDA. \
+IrDA allows communication over Infrared with other devices \
+such as phones and laptops."
+SECTION = "base"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
+	   file://configure.patch;patch=1 \
+	   file://m4.patch;patch=1 \
+	   file://init"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "irattach"
+INITSCRIPT_PARAMS = "defaults 20"
+
+do_compile () {
+	oe_runmake -e -C irattach
+	oe_runmake -e -C irdaping
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	oe_runmake -C irattach ROOT="${D}" install
+	oe_runmake -C irdaping ROOT="${D}" install
+
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/irattach
+}
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 6e852bed17..f77a7c0172 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -42,6 +42,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net
-	install -m 0644 ixp425_eth.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
+	install -m 0644 ixp425_eth.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
 }
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index e69de29bb2..fcf25e01b4 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -0,0 +1,45 @@
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/download_ixp400.htm"
+LICENSE = "${PN}"
+LICENSE_HOMEPAGE = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.htm"
+SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip \
+	   http://www.wnk.at/ixp400_accesslib_kernel26/data/patch_accesslib_kernel26_20040811.diff;patch=1 \
+	   file://badpaths.patch;patch=1 \
+	   file://build-timing-annoyance.patch;patch=1"
+S = "${WORKDIR}/ixp400_xscale_sw"
+PR = "r1"
+
+COMPATIBLE_HOST = "^armeb-linux.*"
+
+inherit module
+
+#LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale
+CFLAGS = "-fno-common -D__KERNEL__ -DMODULE -D__linux -DCPU=33 -DXSCALE=33 \
+	  -D__LINUX_ARM_ARCH__=5 \
+	  -I${S}/src/linux -I${S}/src/include \
+	  ${BUILD_OPTIMIZATION} \
+	  -I${STAGING_KERNEL_DIR}/include"
+
+EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
+		'CC=${KERNEL_CC}' \
+		'LD=${KERNEL_LD}' \
+		'IX_TARGET=linuxbe' \
+		'LINUX_SRC=${STAGING_KERNEL_DIR}' \
+		'ARCH=${ARCH}'"
+#EXTRA_OEMAKE = "'LINUX_SRC=${STAGING_KERNEL_DIR}' 'IX_TARGET=${IX_TARGET}' \
+#	        'ARCH=${TARGET_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}'"
+
+do_compile () {
+	oe_runmake ixp400.ko
+}
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/linux/ixp4xx-csr
+	install -m 0644 src/include/*.h ${STAGING_INCDIR}/linux/ixp4xx-csr/
+	cp -rf --dereference src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
+}
+
+do_install () {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400
+	install -m 0644 lib/linuxbe/ixp400.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400/
+}
diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index d2a0080285..9436c83671 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -31,6 +31,6 @@ do_install() {
 }
 
 PACKAGES = "${PN} ${PN}-help"
-FILES_${PN} = " ${palmtopdir}/bin ${palmtopdir}/apps ${palmtopdir}/pics"
+FILES_${PN} = " ${palmtopdir}${base_bindir} ${palmtopdir}/apps ${palmtopdir}/pics"
 FILES_${PN}-help = " ${palmtopdir}/help/html"
 
diff --git a/packages/kismet/kismet_2004-04-R1.bb b/packages/kismet/kismet_2004-04-R1.bb
index e69de29bb2..5f03366541 100644
--- a/packages/kismet/kismet_2004-04-R1.bb
+++ b/packages/kismet/kismet_2004-04-R1.bb
@@ -0,0 +1,34 @@
+SECTION = "console/network"
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+LICENSE = "GPLv2"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+DEPENDS = "expat gmp"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-2004-04-R1.tar.gz \
+	file://no-strip.diff;patch=1;pnum=0 \
+	file://no-chmod.diff;patch=1;pnum=0 \
+	file://no-lib-modules-uname-include.diff;patch=1;pnum=0"
+	
+SRC_URI_append_mipsel = " file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
+SRC_URI_append_mtx-1 = " file://kismet.conf"
+
+EXTRA_OECONF = "--with-pcap=linux --disable-setuid"
+
+inherit autotools
+
+do_configure() {
+	unset CFLAGS CPPFLAGS
+	oe_runconf
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}/${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "kismet-sounds"
+FILES_kismet-sounds = "${datadir}/kismet/wav"
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/liba52/liba52_0.7.4.bb b/packages/liba52/liba52_0.7.4.bb
index e69de29bb2..cc66182d9a 100644
--- a/packages/liba52/liba52_0.7.4.bb
+++ b/packages/liba52/liba52_0.7.4.bb
@@ -0,0 +1,30 @@
+LICENSE = GPL
+
+DESCRIPTION = "Library for reading some sort of media format."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = ""
+
+inherit autotools
+
+SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz"
+S="${WORKDIR}/a52dec-${PV}"
+
+EXTRA_OECONF = " --enable-shared "
+
+PACKAGES = "${PN} ${PN}-dev a52dec a52dec-doc"
+
+FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " 
+FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
+FILES_a52dec = " ${bindir}/* "
+FILES_a52dec-doc = " ${mandir}/man1/* "
+
+do_stage() {
+	oe_libinstall -a -so -C liba52 liba52 ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/a52dec
+	install -m 0644 ${S}/include/a52.h ${STAGING_INCDIR}/a52dec/a52.h
+	install -m 0644 ${S}/include/attributes.h ${STAGING_INCDIR}/a52dec/attributes.h
+	install -m 0644 ${S}/include/audio_out.h ${STAGING_INCDIR}/a52dec/audio_out.h
+	install -m 0644 ${S}/include/mm_accel.h ${STAGING_INCDIR}/a52dec/mm_accel.h
+}
diff --git a/packages/libao/libao_0.8.4.bb b/packages/libao/libao_0.8.4.bb
index cd167159dc..46ff7a938b 100644
--- a/packages/libao/libao_0.8.4.bb
+++ b/packages/libao/libao_0.8.4.bb
@@ -24,4 +24,4 @@ do_stage() {
 	install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/
 }
 
-FILES_${PN} += "/usr/lib/ao/plugins-2/*.so"
+FILES_${PN} += "${libdir}/ao/plugins-2/*.so"
diff --git a/packages/libgtkstylus/libgtkstylus_0.1.bb b/packages/libgtkstylus/libgtkstylus_0.1.bb
index 87d654f178..4558a1551d 100644
--- a/packages/libgtkstylus/libgtkstylus_0.1.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.1.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 PR = "r1"
 LICENSE = "LGPL"
-FILES_${PN} = "/etc /usr/lib/gtk-2.0"
+FILES_${PN} = "/etc ${libdir}/gtk-2.0"
 
 inherit autotools
 
@@ -12,7 +12,7 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
 	file://gtkstylus.sh"
 
 do_install_append() {
-	install -d ${D}/etc/profile.d
-	install ${WORKDIR}/gtkstylus.sh ${D}/etc/profile.d/
+	install -d ${D}/${sysconfdir}/profile.d
+	install ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/profile.d/
 }
 
diff --git a/packages/libgtkstylus/libgtkstylus_0.3.bb b/packages/libgtkstylus/libgtkstylus_0.3.bb
index c3f4787b0c..a331e17c6b 100644
--- a/packages/libgtkstylus/libgtkstylus_0.3.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 LICENSE = "LGPL"
-FILES_${PN} = "/etc /usr/lib/gtk-2.0"
+FILES_${PN} = "/etc ${libdir}/gtk-2.0"
 PR = "r1"
 
 inherit autotools
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
 	file://gtkstylus.sh"
 
 do_install_append() {
-	install -d ${D}/etc/profile.d
-	install ${WORKDIR}/gtkstylus.sh ${D}/etc/profile.d/
+	install -d ${D}/${sysconfdir}/profile.d
+	install ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/profile.d/
 }
 
diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/libmikey/libmikey0_0.3.2.bb
index e69de29bb2..524ef940ef 100644
--- a/packages/libmikey/libmikey0_0.3.2.bb
+++ b/packages/libmikey/libmikey0_0.3.2.bb
@@ -0,0 +1,23 @@
+LICENSE = LGPL
+
+DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmikey-${PV}.tar.gz"
+S="${WORKDIR}/libmikey-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmikey
+	install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey
+}
diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb
index e69de29bb2..5e38783712 100644
--- a/packages/libmikey/libmikey0_svn.bb
+++ b/packages/libmikey/libmikey0_svn.bb
@@ -0,0 +1,26 @@
+PV = "0.3.2svn${CVSDATE}"
+LICENSE = LGPL
+
+DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+DEFAULT_PREFERENCE=-1
+
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmikey"
+S="${WORKDIR}/libmikey"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmikey
+	install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey
+}
diff --git a/packages/libmnetutil/libmnetutil0_0.2.2.bb b/packages/libmnetutil/libmnetutil0_0.2.2.bb
index e69de29bb2..de61bf2215 100644
--- a/packages/libmnetutil/libmnetutil0_0.2.2.bb
+++ b/packages/libmnetutil/libmnetutil0_0.2.2.bb
@@ -0,0 +1,23 @@
+LICENSE = LGPL
+
+DESCRIPTION = "Networking class library for C++ programming"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmnetutil-${PV}.tar.gz"
+S="${WORKDIR}/libmnetutil-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmnetutil
+	install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil
+}
diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb
index e69de29bb2..8f3334df04 100644
--- a/packages/libmnetutil/libmnetutil0_svn.bb
+++ b/packages/libmnetutil/libmnetutil0_svn.bb
@@ -0,0 +1,25 @@
+PV = "0.2.2svn${CVSDATE}"
+LICENSE = LGPL
+
+DESCRIPTION = "Networking class library for C++ programming"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+DEFAULT_PREFERENCE=-1
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil"
+S="${WORKDIR}/libmnetutil"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmnetutil
+	install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil
+}
diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/libmsip/libmsip0_0.2.2.bb
index e69de29bb2..2dbcd6e87e 100644
--- a/packages/libmsip/libmsip0_0.2.2.bb
+++ b/packages/libmsip/libmsip0_0.2.2.bb
@@ -0,0 +1,23 @@
+LICENSE = LGPL
+
+DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmnetutil0 libmutil0"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmsip-${PV}.tar.gz"
+S="${WORKDIR}/libmsip-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmsip
+	install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip
+}
diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb
index e69de29bb2..b8550fb6ee 100644
--- a/packages/libmsip/libmsip0_svn.bb
+++ b/packages/libmsip/libmsip0_svn.bb
@@ -0,0 +1,25 @@
+PV = "0.2.2svn${CVSDATE}"
+LICENSE = LGPL
+
+DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmnetutil0 libmutil0"
+DEFAULT_PREFERENCE=-1
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmsip"
+S="${WORKDIR}/libmsip"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmsip
+	install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip
+}
diff --git a/packages/libmutil/libmutil0_0.2.2.bb b/packages/libmutil/libmutil0_0.2.2.bb
index e69de29bb2..b6feff53f4 100644
--- a/packages/libmutil/libmutil0_0.2.2.bb
+++ b/packages/libmutil/libmutil0_0.2.2.bb
@@ -0,0 +1,23 @@
+LICENSE = LGPL
+
+DESCRIPTION = "Class library implementing utilities for C++ programming"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "openssl"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmutil-${PV}.tar.gz"
+S="${WORKDIR}/libmutil-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmutil.so.0 ${libdir}/libmutil.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmutil ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmutil
+	install -m 0644 ${S}/include/libmutil/* ${STAGING_INCDIR}/libmutil
+}
diff --git a/packages/libmutil/libmutil0_svn.bb b/packages/libmutil/libmutil0_svn.bb
index e69de29bb2..31145983a7 100644
--- a/packages/libmutil/libmutil0_svn.bb
+++ b/packages/libmutil/libmutil0_svn.bb
@@ -0,0 +1,25 @@
+PV = "0.2.2svn${CVSDATE}"
+LICENSE = LGPL
+
+DESCRIPTION = "Class library implementing utilities for C++ programming"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "openssl"
+DEFAULT_PREFERENCE=-1
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmutil"
+S="${WORKDIR}/libmutil"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmutil.so.0 ${libdir}/libmutil.so.0.0.0 " 
+
+do_stage() {
+	oe_libinstall -a -so libmutil ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmutil
+	install -m 0644 ${S}/include/libmutil/* ${STAGING_INCDIR}/libmutil
+}
diff --git a/packages/libsamplerate/libsamplerate0_0.1.2.bb b/packages/libsamplerate/libsamplerate0_0.1.2.bb
index e69de29bb2..1855efcf0a 100644
--- a/packages/libsamplerate/libsamplerate0_0.1.2.bb
+++ b/packages/libsamplerate/libsamplerate0_0.1.2.bb
@@ -0,0 +1,20 @@
+LICENSE = GPL
+
+DESCRIPTION = "An audio Sample Rate Conversion library"
+SECTION = "libs"
+PRIORITY = "optional"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
+S="${WORKDIR}/libsamplerate-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libsamplerate.so.0 ${libdir}/libsamplerate.so.0.1.1 " 
+
+do_stage() {
+	oe_libinstall -a -so -C src libsamplerate ${STAGING_LIBDIR}
+	install -m 0644 ${S}/src/samplerate.h ${STAGING_INCDIR}/
+}
diff --git a/packages/libssh/libssh_0.1.bb b/packages/libssh/libssh_0.1.bb
index e69de29bb2..f55ea09f3b 100644
--- a/packages/libssh/libssh_0.1.bb
+++ b/packages/libssh/libssh_0.1.bb
@@ -0,0 +1,33 @@
+SECTION = "libs"
+DESCRIPTION = "The SSH library is a C library to authenticate in a \
+simple manner to one or more SSH servers. The goal of this project \
+is to provide a library much simpler to use than OpenSSHs one. It \
+includes SFTP support, and a sample SSH client is provided."
+DEPENDS = "openssl"
+LICENSE = "LGPL"
+
+SRC_URI = "http://www.0xbadc0de.be/projects/libssh/libssh-${PV}.tgz"
+
+inherit autotools
+
+EXTRA_OECONF = "--cache-file=${S}/config.cache"
+
+do_stage () {
+	set -x
+	install -d ${STAGING_INCDIR}/libssh
+	for i in crypto.h libssh.h sftp.h ssh2.h; do
+		install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/
+	done
+	oe_libinstall -so -C libssh libssh ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_runmake "prefix=${D}/${prefix}" \
+		   "exec_prefix=${D}/${exec_prefix}" \
+		   "bindir=${D}/${bindir}" \
+		   "incldir=${D}/${includedir}" \
+		   "infodir=${D}/${infodir}" \
+		   "mandir=${D}/${mandir}/man1" \
+		   "libdir=${D}/${libdir}" \
+		   install
+}
diff --git a/packages/libusb/libusb_0.1.8.bb b/packages/libusb/libusb_0.1.8.bb
index d908646f6a..2ad1c8ff30 100644
--- a/packages/libusb/libusb_0.1.8.bb
+++ b/packages/libusb/libusb_0.1.8.bb
@@ -15,7 +15,7 @@ do_stage() {
 
         install -d ${STAGING_BINDIR}
 	install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
-	perl -pi -e 's:\-L/usr/lib :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+	perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
 
         install -d ${STAGING_INCDIR}/
         for X in usb.h
diff --git a/packages/libvisual/libvisual-plugins_0.1.3.bb b/packages/libvisual/libvisual-plugins_0.1.3.bb
index 03558c7e90..c76483b466 100644
--- a/packages/libvisual/libvisual-plugins_0.1.3.bb
+++ b/packages/libvisual/libvisual-plugins_0.1.3.bb
@@ -11,4 +11,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libvisual/libvisual-plugins-${PV}.tar.gz"
 
 inherit autotools
 
-FILES_${PN} += "/usr/lib/libvisual/actor/*.so /usr/lib/libvisual/morph/*.so"
+FILES_${PN} += "${libdir}/libvisual/actor/*.so ${libdir}/libvisual/morph/*.so"
diff --git a/packages/libxine/libxine-opie_1.0.bb b/packages/libxine/libxine-opie_1.0.bb
index e69de29bb2..246b3705f5 100644
--- a/packages/libxine/libxine-opie_1.0.bb
+++ b/packages/libxine/libxine-opie_1.0.bb
@@ -0,0 +1,97 @@
+LICENSE = GPL
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+DESCRIPTION = "libxine compiled for Opie"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg tremor libmad"
+PROVIDES = "virtual/libxine"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-${PV}"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \
+	file://cpu-${PV}.patch;patch=1 \
+	file://configure-${PV}.patch;patch=1 \
+	file://demuxogg.patch;patch=1 \
+	file://fix-syntax.patch;patch=1 \
+	file://libxine-cut-memusage.patch;patch=1 \
+	file://libxine-ffmpeg-enable-arm.patch;patch=1 \
+	file://libxine-libvorbis.patch;patch=1 \
+	file://libxine-tremor-autoconf.patch;patch=1 \
+	file://mpegvideo-static-inlinine.patch;patch=1 \
+	file://libxine-arm-configure.patch;patch=1 "
+
+
+
+SOV = "1.0.7"
+
+# Omit the annoying xine-config in ${bindir}
+FILES_${PN}="${libdir}/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " ${bindir}"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-oggtest \
+	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-altivec --disable-vis --disable-mlib \
+	--enable-shared --disable-static \
+	--disable-fb --disable-alsa --disable-vcd \
+	--disable-asf --disable-faad --disable-iconv \
+	--disable-aalib                            \
+	--without-v4l --without-arts --without-sdl \
+	--disable-dxr3 --without-xv --without-xvmc \
+	--without-xxmc --without-Xshm --without-x "
+			      
+do_compile() {
+	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h            \
+	src/xine-engine/xine_internal.h  src/xine-engine/xine_plugin.h    \
+	src/xine-utils/xine_buffer.h     src/xine-engine/video_out.h      \
+	src/xine-engine/buffer.h         src/xine-engine/vo_scale.h       \
+	src/xine-engine/configfile.h     src/xine-utils/attributes.h      \
+	src/xine-engine/info_helper.h    src/xine-engine/scratch.h        \
+	src/xine-engine/audio_decoder.h  src/input/input_plugin.h         \
+	src/xine-engine/spu_decoder.h    src/xine-engine/audio_out.h      \
+	src/xine-engine/io_helper.h      src/xine-engine/video_decoder.h  \
+	src/xine-engine/broadcaster.h    src/xine-engine/metronom.h       \
+	src/xine-utils/xmllexer.h        src/xine-engine/osd.h            \
+	src/xine-engine/video_overlay.h  src/xine-utils/xmlparser.h       \
+	src/xine-utils/compat.h          src/xine-engine/plugin_catalog.h \
+	src/xine-engine/post.h           src/demuxers/demux.h             \
+	src/xine-engine/resample.h	 lib/os_types.h                   \
+	src/xine-engine/refcounter.h"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xine
+
+	install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+	for file in ${HEADERS}; do
+		cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+	done
+
+	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+	plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
+	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+	postdir = bb.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+	do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+	fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d)
+	do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
+}
diff --git a/packages/libxine/libxine_1.0.0-beta12.bb b/packages/libxine/libxine_1.0.0-beta12.bb
index e69de29bb2..6f3558c095 100644
--- a/packages/libxine/libxine_1.0.0-beta12.bb
+++ b/packages/libxine/libxine_1.0.0-beta12.bb
@@ -0,0 +1,90 @@
+LICENSE = GPL
+DESCRIPTION = "libxine is a library for multimedia players. \
+It plays back CDs, DVDs, and VCDs. It also decodes multimedia \
+files like AVI, MOV, WMV, and MP3 from local disk drives, \
+and displays multimedia streamed over the Internet. It interprets \
+many of the most common multimedia formats available - \
+and some of the most uncommon formats, too."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib libogg tremor libmad"
+PR = "r4"
+
+inherit autotools pkgconfig binconfig gettext
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-1-beta12.tar.gz \
+	   file://full.patch;patch=1 \
+	   file://libvorbis.patch;patch=1 \
+	   file://demux_ogg.patch;patch=1 \
+	   file://configure.ac.patch;patch=1 \
+	   file://vo_scale.patch;patch=1 \
+	   file://oss.patch;patch=1;pnum=0 \
+	   file://fix-oss-plugin.patch;patch=1 \
+	   file://mpegvideo-static-inlining.patch;patch=1 \
+	   file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \
+	   file://fftscope-static-inlining.patch;patch=1"
+S = "${WORKDIR}/xine-lib-1-beta12"
+
+SOV = "1.0.6"
+
+do_configure() {
+	./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \
+	      --enable-shared --disable-static --prefix=${prefix} \
+	      --with-zlib-path=${STAGING_DIR}/${HOST_SYS} --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	      --disable-oggtest --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} --without-x \
+	--disable-iconv --without-arts --without-sdl \
+	--disable-aalib
+}
+
+do_compile() {
+	oe_runmake LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool OGG_LIBS=${STAGING_LIBDIR}/libogg.so
+}
+
+do_stage() {
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
+	  -C src install-data \
+	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+	  'libdir=${STAGING_LIBDIR}' \
+	  'includedir=${STAGING_INCDIR}'
+
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
+	  -C include install-data \
+	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+	  'libdir=${STAGING_LIBDIR}' \
+	  'includedir=${STAGING_INCDIR}'
+
+	for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+	  dir=`dirname $plugin`
+	  libname=`basename $plugin|sed -e's,\.la,,'` 
+	  oe_libinstall -so -C $dir $libname ${STAGING_LIBDIR}/xine/plugins/1.0.0
+	done
+
+	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+do_install() {
+        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
+          -C src install-data \
+          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+          'includedir=${D}/${includedir}' 
+
+        oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
+          -C include install-data \
+          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+          'includedir=${D}/${includedir}'
+
+        for plugin in `find ${S}/src -type f -name xineplug*.la`; do
+          dir=`dirname $plugin`
+          libname=`basename $plugin|sed -e's,\.la,,'`
+          oe_libinstall -so -C $dir $libname ${D}/${libdir}/xine/plugins/1.0.0
+        done
+
+        oe_libinstall -so -C src/xine-engine libxine ${D}/${libdir}
+}
+
+python populate_packages_prepend () {
+	plugins_dir = bb.data.expand('${libdir}/xine/plugins/1.0.0/', d)
+	
+	do_split_packages(d, plugins_dir, file_regex='^xineplug_(.*).so$', output_pattern='libxine-plugin-%s', description='Xine plugin - %s')
+}
+
diff --git a/packages/libxine/libxine_1.0.0-rc5.bb b/packages/libxine/libxine_1.0.0-rc5.bb
index e69de29bb2..ee85eb12a3 100644
--- a/packages/libxine/libxine_1.0.0-rc5.bb
+++ b/packages/libxine/libxine_1.0.0-rc5.bb
@@ -0,0 +1,70 @@
+LICENSE = GPL
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+DESCRIPTION = "libxine"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg libvorbis libmad"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-1-rc5"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc5.tar.gz \
+	file://cpu.patch;patch=1 \
+	file://configure.patch;patch=1"
+
+SOV = "1.0.6"
+
+# Omit the annoying xine-config in ${bindir}
+FILES_${PN}="${libdir}/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " ${bindir}"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-oggtest \
+	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-altivec --disable-vis --disable-mlib \
+	--disable-fb --disable-alsa --disable-vcd \
+	--disable-asf --disable-faad --disable-iconv \
+	--disable-aalib \
+	--without-v4l --without-arts --without-sdl"
+			      
+do_compile() {
+	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \
+	src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \
+	src/xine-utils/xine_buffer.h"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xine
+
+	install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+	for file in ${HEADERS}; do
+		cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+	done
+
+	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+	plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
+	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+
+	postdir = bb.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+	do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+
+	fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d)
+	do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s')
+}
diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb
index e69de29bb2..0d77d48b38 100644
--- a/packages/libxine/libxine_1.0.bb
+++ b/packages/libxine/libxine_1.0.bb
@@ -0,0 +1,108 @@
+LICENSE = GPL
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+#FIXME: libxine doesn't build when X11 has been built before:
+#| In file included from video_out_dxr3.c:55:
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:16: error: parse error before "Bool"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:17: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: type defaults to `int' in declaration of 
+#`XineramaQueryExtension'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:20: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:22: error: parse error before "XineramaQueryVersion"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:23: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: type defaults to `int' in declaration of 
+#`XineramaQueryVersion'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:26: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before "XineramaIsActive"
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: error: parse error before '*' token
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: type defaults to `int' in declaration of 
+#`XineramaIsActive'
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:28: warning: data definition has no type or storage class
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/X11/extensions/Xinerama.h:41: error: parse error before '*' token
+#| In file included from /local/pkg/oe/collie/tmp/staging/arm-linux/include/inttypes.h:28,
+#|                  from ../../src/xine-engine/xine_internal.h:31,
+#|                  from video_out_dxr3.c:65:
+#| /local/pkg/oe/collie/tmp/staging/arm-linux/include/stdint.h:49: error: syntax error before "typedef"
+
+DESCRIPTION = "libxine"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg libvorbis libmad"
+PROVIDES = "virtual/libxine"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-${PV}"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \
+	file://cpu-${PV}.patch;patch=1 \
+	file://configure-${PV}.patch;patch=1"
+
+SOV = "1.0.7"
+
+# Omit the annoying xine-config in ${bindir}
+FILES_${PN}="${libdir}/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " ${bindir}"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-oggtest \
+	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-altivec --disable-vis --disable-mlib \
+	--enable-shared --disable-static \
+	--disable-fb --disable-alsa --disable-vcd \
+	--disable-asf --disable-faad --disable-iconv \
+	--disable-aalib --with-xv-path=${STAGING_LIBDIR} \
+	--without-v4l --without-arts --without-sdl"
+			      
+do_compile() {
+	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h            \
+	src/xine-engine/xine_internal.h  src/xine-engine/xine_plugin.h    \
+	src/xine-utils/xine_buffer.h     src/xine-engine/video_out.h      \
+	src/xine-engine/buffer.h         src/xine-engine/vo_scale.h       \
+	src/xine-engine/configfile.h     src/xine-utils/attributes.h      \
+	src/xine-engine/info_helper.h    src/xine-engine/scratch.h        \
+	src/xine-engine/audio_decoder.h  src/input/input_plugin.h         \
+	src/xine-engine/spu_decoder.h    src/xine-engine/audio_out.h      \
+	src/xine-engine/io_helper.h      src/xine-engine/video_decoder.h  \
+	src/xine-engine/broadcaster.h    src/xine-engine/metronom.h       \
+	src/xine-utils/xmllexer.h        src/xine-engine/osd.h            \
+	src/xine-engine/video_overlay.h  src/xine-utils/xmlparser.h       \
+	src/xine-utils/compat.h          src/xine-engine/plugin_catalog.h \
+	src/xine-engine/post.h           src/demuxers/demux.h             \
+	src/xine-engine/resample.h	 lib/os_types.h                   \
+	src/xine-engine/refcounter.h"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xine
+
+	install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+	for file in ${HEADERS}; do
+		cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+	done
+
+	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+	plugindir = bb.data.expand('${libdir}/xine/plugins/1.0.0', d)
+	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+	postdir = bb.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+	do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+	fontdir = bb.data.expand('${datadir}/xine/libxine1/fonts', d)
+	do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
+}
diff --git a/packages/libxsettings-client/libxsettings-client_0.12.bb b/packages/libxsettings-client/libxsettings-client_0.12.bb
index 661e894c57..efef97dfb1 100644
--- a/packages/libxsettings-client/libxsettings-client_0.12.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.12.bb
@@ -20,6 +20,6 @@ do_stage () {
 
 do_install () {
         gpe_do_install
-	install -d ${D}/usr/include/
-	install xsettings-client.h ${D}/usr/include/
+	install -d ${D}${includedir}/
+	install xsettings-client.h ${D}${includedir}/
 }
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index e69de29bb2..764cca82e9 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -0,0 +1,67 @@
+DESCRIPTION = "This package contains the scripts necessary \
+for hotplug Linux support, and lets you plug in new devices \
+and use them immediately."
+HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
+LICENSE = "GPL"
+RPROVIDES = "hotplug"
+RCONFLICTS = "hotplug"
+RREPLACES = "hotplug"
+SECTION = "base"
+RSUGGESTS = "pciutils usbutils"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
+	   file://userspecified_hcd.patch;patch=1 \
+	   file://hotplug-net-agent-usb.patch;patch=1 \
+           file://fix-net.agent \
+           file://update-usb.usermap \
+           file://logcheck-ignore \
+	   file://sleeve.agent \
+	   file://sleeve.rc \
+	   file://mmc.agent \
+	   file://usbd.agent \
+	   file://usbd \
+	   file://sysconfig-hotplug \
+	   file://sysconfig-usb \
+	   file://isapnp-exit.diff;patch=1 \
+	   file://usb-storage"
+	   
+S = "${WORKDIR}/hotplug-2004_09_20"
+
+INITSCRIPT_NAME = "hotplug"
+INITSCRIPT_PARAMS = "start 40 S . stop 89 0 6 ."
+
+inherit update-rc.d
+
+do_compile () {
+	:
+}
+
+oldmandir := "${mandir}"
+oldsbindir := "${sbindir}"
+prefix = ""
+exec_prefix = ""
+FILES_hotplug_append = " ${oldsbindir}"
+FILES_hotplug-doc_append = " ${oldmandir}"
+
+export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
+do_install () {
+	install -d ${D}/${sysconfdir}/logcheck/ignore.d
+	install -d ${D}/${oldmandir}
+	install -d ${D}/${oldsbindir}
+	#install -d ${D}/${sysconfdir}/default
+	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
+		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
+		   mandir=${D}${oldmandir} install
+	sh ${WORKDIR}/fix-net.agent ${D} || :
+	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}/${oldsbindir}/
+	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
+	install -m 0755 ${WORKDIR}/sleeve.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/sleeve.rc ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/mmc.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/usbd.agent ${D}${sysconfdir}/hotplug/
+	#install -m 0755 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
+	install -d ${D}${sysconfdir}/sysconfig
+	install -m 0644 ${WORKDIR}/sysconfig-hotplug ${D}${sysconfdir}/sysconfig/hotplug
+	install -m 0644 ${WORKDIR}/sysconfig-usb ${D}/${sysconfdir}/sysconfig/usb
+	install -m 0755 ${WORKDIR}/usb-storage ${D}${sysconfdir}/hotplug/usb
+}
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 e69de29bb2..bdbbd85fb8 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
@@ -0,0 +1,58 @@
+DESCRIPTION = "User Mode Linux Kernel"
+SECTION = "kernel"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+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"
+
+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 \
+           http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;patch=1 \
+           file://defconfig"
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-core-on-panic;patch=1 \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-pretend-to-be-i586;patch=1 \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-general-protection-fault;patch=1 \
+#http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-x11-fb;patch=1 \
+
+S = "${WORKDIR}/linux-${LV}"
+
+inherit kernel
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+export OS = "Linux"
+ARCH = "um"
+SUBARCH = "${TARGET_ARCH}"
+KERNEL_IMAGETYPE = "linux"
+EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \
+		'SUBARCH=${SUBARCH}'"
+EXTRA_CFLAGS += "-I${includedir}"
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig .config
+	oe_runmake oldconfig
+}
+
+do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        install -d arch/um/include/linux/
+        install -m 0644 include/linux/inet.h arch/um/include/linux/
+	kernel_do_compile
+}
+
+do_stage_prepend() {
+	install -d arch/um/boot/
+	ln -sf ${S}/linux arch/um/boot/linux
+}
+
+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}
+}
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
index 03149b10f4..3238f1d96b 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -60,6 +60,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}/etc/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+	install -d ${D}/${sysconfdir}/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
 }
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
index 2a3b86a6cd..e808cecbee 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -63,6 +63,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}/etc/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+	install -d ${D}/${sysconfdir}/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
 }
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
index 9e3b387401..bc9982374c 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
@@ -62,6 +62,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}/etc/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+	install -d ${D}/${sysconfdir}/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
 }
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
index a3d9af9268..e0af79d39a 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
@@ -53,6 +53,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-        install -d ${D}/etc/init.d
-        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+        install -d ${D}/${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
 }
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
index 3984a65a9c..3d9029b73b 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -52,6 +52,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-        install -d ${D}/etc/init.d
-        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+        install -d ${D}/${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
 }
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index a29541a766..6cc5e1a023 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -50,6 +50,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-        install -d ${D}/etc/init.d
-        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+        install -d ${D}/${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
 }
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 4b3169b80d..7e14473036 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -61,5 +61,5 @@ kernel_do_install() {
 	install -d ${D}/boot
 	install -m 0644 .config ${D}/boot/config-${PV}
 	bzip2 -9 ${D}/boot/*
-	install -d ${D}/etc/modutils
+	install -d ${D}/${sysconfdir}/modutils
 }
diff --git a/packages/lirc/lirc-modules_0.6.6.bb b/packages/lirc/lirc-modules_0.6.6.bb
index e69de29bb2..6235156148 100644
--- a/packages/lirc/lirc-modules_0.6.6.bb
+++ b/packages/lirc/lirc-modules_0.6.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "linux-${KERNEL_VERSION}"
+DEPENDS = "virtual/kernel"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools module-base
+
+EXTRA_OECONF_collie = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+
+export TOPDIR = "${STAGING_KERNEL_DIR}"
+
+do_compile() {
+	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+}
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char
+	install -m 0644 drivers/lirc_sir/lirc_sir.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char/lirc_sir.o
+}
+
+pkg_postinst() {
+#!/bin/sh
+ mknod /dev/lirc c 61 0
+ if [ -n $D ]; then exit 1; fi
+}
+
+FILES_${PN}="/lib/modules"
diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb
index e69de29bb2..9949c0a4dd 100644
--- a/packages/lirc/lirc_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc_0.6.6+cvs20040918.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "kernel lirc-modules-${PV}"
+DEPENDS = "virtual/kernel"
+PR = "r7"
+
+S = "${WORKDIR}/lirc"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/lirc;module=lirc;date=20040918;method=pserver \
+	file://split-hauppauge.patch;patch=1 \
+	file://lircd.init file://lircmd.init"
+
+inherit autotools module-base update-rc.d
+
+INITSCRIPT_NAME = "lirc"
+INITSCRIPT_PARAMS = "defaults 20"
+
+EXTRA_OECONF_epia = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=serial"
+EXTRA_OECONF_collie = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+
+EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
+
+do_stage() {
+        oe_libinstall -so -C tools liblirc_client ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/lirc/
+	install -m 0644 tools/lirc_client.h ${STAGING_INCDIR}/lirc/
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+
+	install -m 755 daemons/irrecord ${D}/${bindir}/irrecord
+	install -m 755 daemons/lircd ${D}/${bindir}/lircd
+
+	oe_libinstall -so -C tools liblirc_client ${D}${libdir}/
+	install -d ${D}${includedir}
+	install -m 0644 tools/lirc_client.h ${D}${includedir}/
+
+	install -d ${D}/${sysconfdir}/init.d
+	install ${WORKDIR}/lircd.init ${D}/${sysconfdir}/init.d/lircd
+
+	install -d ${D}${datadir}/lirc/
+	cp -a remotes ${D}${datadir}/lirc/
+	find ${D}${datadir}/lirc -name CVS -o -name '*~*' | xargs rm -rf
+}
+
diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb
index e69de29bb2..eb062770bc 100644
--- a/packages/lirc/lirc_0.7.0.bb
+++ b/packages/lirc/lirc_0.7.0.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+PR = "r5"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
+      file://split-hauppauge.patch;patch=1 \
+      file://lircd.init file://lircmd.init"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools module-base update-rc.d
+
+INITSCRIPT_NAME = "lirc"
+INITSCRIPT_PARAMS = "defaults 20"
+
+EXTRA_OECONF_epia = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=serial"
+EXTRA_OECONF_collie = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+
+EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
+
+do_stage() {
+        oe_libinstall -so -C tools liblirc_client ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/lirc/
+	install -m 0644 tools/lirc_client.h ${STAGING_INCDIR}/lirc/
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install ${WORKDIR}/lircd.init ${D}/${sysconfdir}/init.d/lircd
+
+        install -d ${D}${datadir}/lirc/
+        cp -a ${S}/remotes ${D}${datadir}/lirc/
+}
+
diff --git a/packages/logrotate-script/logrotate-script_cvs.bb b/packages/logrotate-script/logrotate-script_cvs.bb
index e69de29bb2..a9dd380596 100644
--- a/packages/logrotate-script/logrotate-script_cvs.bb
+++ b/packages/logrotate-script/logrotate-script_cvs.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "simple logrotate bash script"
+RDEPENDS = "busybox"
+SECTION = "admin"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "GPL"
+
+SRC_URI = "svn://meshcube.org/svn/scripts;module=logrotate"
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+	(cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf -
+}
+
+pkg_postinst() {
+#!/bin/sh -e
+ROOTCRON=/etc/cron/crontabs/root
+
+test -e /etc/cron/crontabs/root \
+ && grep '^[^#].*logrotate' $ROOTCRON > /dev/null \
+ || echo "*/5 * * * *       /bin/bash ${sbindir}/logrotate -m 0600 -o root -g root -s 800 -l 3 /tmp/messages" >> $ROOTCRON
+
+/etc/init.d/cron restart
+
+exit 0
+}
diff --git a/packages/madplay/madplay_0.15.2b.bb b/packages/madplay/madplay_0.15.2b.bb
index e69de29bb2..ba2d184a22 100644
--- a/packages/madplay/madplay_0.15.2b.bb
+++ b/packages/madplay/madplay_0.15.2b.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
+MAINTAINER = "Maciej Swiniarski <luzik@gda.pl>"
+SECTION = "console/multimedia"
+DEPENDS = "libmad"
+LICENSE = "GPL"
+AUTHOR = "Robert Leslie <rob@mars.org>"
+HOMEPAGE = "http://www.mars.org/home/rob/proj/mpeg/"
+
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+FILES_${PN} = "${bindir}/madplay"
diff --git a/packages/makedevs/makedevs_1.0.0.bb b/packages/makedevs/makedevs_1.0.0.bb
index e69de29bb2..da41240b5c 100644
--- a/packages/makedevs/makedevs_1.0.0.bb
+++ b/packages/makedevs/makedevs_1.0.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "A tool to make device nodes"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "required"
+SRC_URI = "file://makedevs.c"
+S = "${WORKDIR}/makedevs-${PV}"
+PR = "r2"
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/makedevs.c ${S}/
+}
+
+do_compile() {
+	${CC} ${CFLAGS} -o ${S}/makedevs ${S}/makedevs.c
+}
+
+do_install() {
+	install -d ${D}/${base_sbindir}
+	install -m 0755 ${S}/makedevs ${D}/${base_sbindir}/makedevs
+}
diff --git a/packages/maradns/maradns_1.0.23.bb b/packages/maradns/maradns_1.0.23.bb
index e69de29bb2..abb0de5dd7 100644
--- a/packages/maradns/maradns_1.0.23.bb
+++ b/packages/maradns/maradns_1.0.23.bb
@@ -0,0 +1,44 @@
+SECTION = "console/network"
+DESCRIPTION = "A security-aware DNS server"
+HOMEPAGE = "http://www.maradns.org"
+LICENSE = "PD"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+
+SRC_URI = "http://www.maradns.org/download/maradns-${PV}.tar.bz2 \
+	file://init \
+	file://rng-makefile-build-cc.patch;patch=1;pnum=0"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -d ${D}/${sbindir}
+	install -d ${D}/${sysconfdir}
+	install -d ${D}/${sysconfdir}/mararc
+	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}/${mandir}/man1
+	install -d ${D}/${mandir}/man5
+	install -d ${D}/${mandir}/man8
+
+	sed -i -e "s:PREFIX/man:PREFIX/share/man:" \
+                -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
+                build/install.locations
+	
+	oe_runmake \
+                TOPLEVEL=${S} \
+                BUILDDIR=${S}/build \
+                RPM_BUILD_ROOT=${D} \
+                PREFIX=${D}/usr \
+                MAN1=${D}${mandir}/man1 \
+                MAN5=${D}${mandir}/man5 \
+                MAN8=${D}${mandir}/man8 \
+                install
+	
+	mv ${D}/${sysconfdir}/mararc/example_mararc ${D}/${sysconfdir}/maradns/mararc
+	rm -r ${D}/${sysconfdir}/mararc/
+	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/maradns
+}
+
+PACKAGES = "maradns-zone maradns-ask maradns maradns-doc"
+FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone"
+FILES_maradns-ask = "${bindir}/askmara"
+
+CONFFILES_${PN}_nylon = "/etc/maradns/mararc"
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
index e69de29bb2..0a005d1f81 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
@@ -0,0 +1,27 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
+	file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0"
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox \
+	       ${datadir}/themes/blondie/matchbox \
+	       ${datadir}/themes/bluebox/matchbox \
+	       ${datadir}/themes/borillo/matchbox"
+
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
+
+pkg_postinst() {
+update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+}
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
index e69de29bb2..0a005d1f81 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
@@ -0,0 +1,27 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
+	file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0"
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox \
+	       ${datadir}/themes/blondie/matchbox \
+	       ${datadir}/themes/bluebox/matchbox \
+	       ${datadir}/themes/borillo/matchbox"
+
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
+
+pkg_postinst() {
+update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+}
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
index f8db87358f..9bf7be1e69 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
@@ -22,10 +22,10 @@ FILES_${PN} = "${bindir} \
 EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
 
 pkg_postinst() {
-update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/matchbox-session 10
+update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
 }
 
 pkg_postrm() {
-update-alternatives --remove x-window-manager /usr/bin/matchbox-session
+update-alternatives --remove x-window-manager ${bindir}/matchbox-session
 }
 
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
index e69de29bb2..9bf7be1e69 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
@@ -0,0 +1,31 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+PR = "r1" 
+
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
+
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox \
+	       ${sysconfdir}/matchbox \
+	       ${datadir}/themes/blondie/matchbox \
+	       ${datadir}/themes/Default/matchbox \
+	       ${datadir}/themes/MBOpus/matchbox"
+
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
+
+pkg_postinst() {
+update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+}
+
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb
index e69de29bb2..8a581b0c93 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.bb
@@ -0,0 +1,26 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz"
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox \
+	       ${datadir}/themes/blondie/matchbox \
+	       ${datadir}/themes/bluebox/matchbox \
+	       ${datadir}/themes/borillo/matchbox"
+
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
+
+pkg_postinst() {
+update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+}
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index d9148d436d..ad6b67414b 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -21,9 +21,9 @@ FILES_${PN} = "${bindir} \
 EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
 
 pkg_postinst() {
-update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/matchbox-session 10
+update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
 }
 
 pkg_postrm() {
-update-alternatives --remove x-window-manager /usr/bin/matchbox-session
+update-alternatives --remove x-window-manager ${bindir}/matchbox-session
 }
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index dd15eacb1c..757c72ecb3 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -148,8 +148,8 @@ EOF
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
-	rm -rf ${SDK_OUTPUT}/usr/lib/ipkg
+	mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
 
 	# remove unwanted executables
 	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb
index 2226d8251c..8435388174 100644
--- a/packages/meta/task-bootstrap-unionroot.bb
+++ b/packages/meta/task-bootstrap-unionroot.bb
@@ -35,10 +35,13 @@ def bootstrap_modutils_rdepends(d):
                 r.append('module-init-tools-depmod')
         return ' '.join(r)
 
+HOTPLUG ?= "linux-hotplug"
+
 DEPENDS = 'base-files base-passwd-3.5.7 \
 	busybox dropbear initscripts modutils netbase \
 	sysvinit tinylogin portmap \
 	modutils-initscripts \
+	${HOTPLUG} \
 	${BOOTSTRAP_EXTRA_DEPENDS} \
 	${@bootstrap_modutils_depends(d)} \
 	unionfs-modules \
@@ -50,6 +53,7 @@ RDEPENDS = 'base-files base-passwd busybox \
 	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
 	modutils-initscripts \
+	${HOTPLUG} \
 	${BOOTSTRAP_EXTRA_RDEPENDS} \
 	${@bootstrap_modutils_rdepends(d)} \
 	unionfs-modules \
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 00074b679d..ccd57b8661 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -31,10 +31,13 @@ def bootstrap_modutils_rdepends(d):
                 r.append('module-init-tools-depmod')
         return ' '.join(r)
 
+HOTPLUG ?= "linux-hotplug"
+
 DEPENDS = 'base-files base-passwd-3.5.7 \
 	busybox dropbear initscripts modutils netbase \
 	sysvinit tinylogin portmap \
 	modutils-initscripts \
+	${HOTPLUG} \
 	${BOOTSTRAP_EXTRA_DEPENDS} \
 	${@bootstrap_modutils_depends(d)}'
 
@@ -42,6 +45,7 @@ RDEPENDS = 'base-files base-passwd busybox \
 	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
 	modutils-initscripts \
+	${HOTPLUG} \
 	${BOOTSTRAP_EXTRA_RDEPENDS} \
 	${@bootstrap_modutils_rdepends(d)}'
 
diff --git a/packages/meta/unslung-standard-image.bb b/packages/meta/unslung-standard-image.bb
index 413a51037f..ae2bfd44fb 100644
--- a/packages/meta/unslung-standard-image.bb
+++ b/packages/meta/unslung-standard-image.bb
@@ -27,7 +27,7 @@ inherit image_ipk
 # Note that anything in this function must be repeatable without having to rebuild the rootfs
 unslung_clean_image () {
 	# Remove info from the local feed used to build the image
-	rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
 	rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
 }
 
diff --git a/packages/mgetty/mgetty_1.1.30.bb b/packages/mgetty/mgetty_1.1.30.bb
index d2708dc3a8..2041f40450 100644
--- a/packages/mgetty/mgetty_1.1.30.bb
+++ b/packages/mgetty/mgetty_1.1.30.bb
@@ -49,7 +49,7 @@ do_compile () {
         -DFAX_OUT_USER=\"uucp\" \
         -DVARRUNDIR=\"/var/run\" \
         -DAWK=\"awk\" \
-        -DPERL=\""/usr/bin/perl -w"\" -DTKPERL=\"/usr/bin/tkperl\" \
+        -DPERL=\""${bindir}/perl -w"\" -DTKPERL=\"${bindir}/tkperl\" \
         -DECHO=\""echo -e"\" \
         -DSHELL=\"/bin/bash\" \
 	-o mksed mksed.c
diff --git a/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb b/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb
index a380941e9d..6edcc9e7ba 100644
--- a/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb
+++ b/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb
@@ -19,5 +19,5 @@ do_compile() {
 do_install() {
 	install -d ${D}${sbindir}
 	install -d ${D}${sysconfdir}/init.d
-	oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${datadir}/man" docdir="${D}${datadir}/doc/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install
+	oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install
 }
diff --git a/packages/modutils/modutils-initscripts.bb b/packages/modutils/modutils-initscripts.bb
index e69de29bb2..eb22255a27 100644
--- a/packages/modutils/modutils-initscripts.bb
+++ b/packages/modutils/modutils-initscripts.bb
@@ -0,0 +1,18 @@
+SECTION = "base"
+DESCRIPTION = "modutils configuration files"
+LICENSE = "PD"
+SRC_URI = "file://modutils.sh"
+PR = "r1"
+
+INITSCRIPT_NAME = "modutils.sh"
+INITSCRIPT_PARAMS = "start 20 S ."
+
+inherit update-rc.d
+
+do_compile () {
+}
+
+do_install () {
+	install -d ${D}/${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/modutils.sh ${D}/${sysconfdir}/init.d/
+}
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index 17fbb2f44d..f878e6869b 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -23,9 +23,9 @@ export BUILDCFLAGS = "${BUILD_CFLAGS}"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}/${sysconfdir}
-	rm ${D}/sbin/lsmod
-	install -d ${D}/bin/
-	ln -s ../sbin/insmod ${D}/bin/lsmod
+	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
         done
 }
diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index e227eb3664..f22b7a23e6 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -19,16 +19,16 @@ S = "${WORKDIR}/MPlayer-${PV}"
 
 PACKAGES =+ "postproc postproc-dev"
 
-FILES_${PN} = "/usr/bin/mplayer /usr/lib/mplayer/vidix/w100_vid.so"
+FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
 
-FILES_postproc = " /usr/lib/libpostproc.so.0.0.0 /usr/lib/libpostproc.so.0"
-FILES_postproc-dev = " /usr/include/postproc/postprocess.h /usr/lib/libpostproc.so /usr/lib/libpostproc.a"
+FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
+FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
 
 inherit autotools 
 
 EXTRA_OECONF = " \
         --prefix=/usr \
-		--mandir=/usr/share/man \
+		--mandir=${mandir} \
         --target=${TARGET_ARCH} \
         --enable-shared-pp \
         \
@@ -64,11 +64,11 @@ do_configure() {
 }
 
 do_install_append () {
-        install -d ${D}/${libdir} ${D}/usr/include ${D}/usr/include/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}/usr/include/postproc/
+        install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc
+        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
         oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}/usr/lib/libpostproc.so.0.0.0
-        cd ${D}/usr/lib
+        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
+        cd ${D}${libdir}
         ln -sf libpostproc.so.0.0.0 libpostproc.so.0
         ln -sf libpostproc.so.0 libpostproc.so
 }
diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb
index 95c44961a4..5dd6702e48 100644
--- a/packages/mplayer/mplayer_1.0pre6.bb
+++ b/packages/mplayer/mplayer_1.0pre6.bb
@@ -21,16 +21,16 @@ S = "${WORKDIR}/MPlayer-${PV}"
 
 PACKAGES =+ "postproc postproc-dev"
 
-FILES_${PN} = "/usr/bin/mplayer /usr/lib/mplayer/vidix/w100_vid.so"
+FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
 
-FILES_postproc = " /usr/lib/libpostproc.so.0.0.0 /usr/lib/libpostproc.so.0"
-FILES_postproc-dev = " /usr/include/postproc/postprocess.h /usr/lib/libpostproc.so /usr/lib/libpostproc.a"
+FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
+FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
 
 inherit autotools 
 
 EXTRA_OECONF = " \
         --prefix=/usr \
-		--mandir=/usr/share/man \
+		--mandir=${mandir} \
         --target=${TARGET_ARCH} \
         --enable-shared-pp \
         \
@@ -67,11 +67,11 @@ do_configure() {
 }
 
 do_install_append () {
-        install -d ${D}/${libdir} ${D}/usr/include ${D}/usr/include/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}/usr/include/postproc/
+        install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc
+        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
         oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}/usr/lib/libpostproc.so.0.0.0
-        cd ${D}/usr/lib
+        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
+        cd ${D}${libdir}
         ln -sf libpostproc.so.0.0.0 libpostproc.so.0
         ln -sf libpostproc.so.0 libpostproc.so
 }
diff --git a/packages/murasaki/murasaki_0.8.8.bb b/packages/murasaki/murasaki_0.8.8.bb
index 36edad880b..505a7947e8 100644
--- a/packages/murasaki/murasaki_0.8.8.bb
+++ b/packages/murasaki/murasaki_0.8.8.bb
@@ -9,9 +9,9 @@ SRC_URI = "http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-${PV}.tar
 EXTRA_OEMAKE = 'OPT="-DPATH_MAX" DEBUG= INC="-I ../inc ${CFLAGS}"'
 
 do_install () {
-	install -d ${D}/sbin ${D}/etc/${PN} \
+	install -d ${D}/${base_sbindir} ${D}/${sysconfdir}/${PN} \
 		   ${D}/${sysconfdir}/init.d
-	oe_runmake install 'BIN_DIR=${D}/sbin' 'CONF_DIR=${D}/etc/${PN}' \
+	oe_runmake install 'BIN_DIR=${D}/${base_sbindir}' 'CONF_DIR=${D}/${sysconfdir}/${PN}' \
 		   'RC_DIR=${D}/${sysconfdir}/rc.d' \
 		   'RC_INIT_DIR=${D}/${sysconfdir}/init.d' \
 		   'INST_SCRIPT_DIR=${D}/${sysconfdir}/murasaki' \
diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb
index cf89514a71..d3b7d10980 100644
--- a/packages/mythfront/mythfront-config.bb
+++ b/packages/mythfront/mythfront-config.bb
@@ -8,25 +8,25 @@ SRC_URI = "file://tftp.sh file://xorg.conf"
 SRC_URI_append_epia = " file://serial.sh"
 
 do_install() {
-	install -d ${D}/etc/udhcpc.d/
-	install ${WORKDIR}/tftp.sh ${D}/etc/udhcpc.d/80tftp
+	install -d ${D}/${sysconfdir}/udhcpc.d/
+	install ${WORKDIR}/tftp.sh ${D}/${sysconfdir}/udhcpc.d/80tftp
 
-	install -d ${D}/etc/mythtv
-	ln -sf /var/lib/config/mysql.txt ${D}/etc/mythtv
+	install -d ${D}/${sysconfdir}/mythtv
+	ln -sf /var/lib/config/mysql.txt ${D}/${sysconfdir}/mythtv
 
-	install -d ${D}/etc/X11
-	install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11
+	install -d ${D}/${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11
 
-	ln -sf /var/lib/config/lircd.conf ${D}/etc/lircd.conf
+	ln -sf /var/lib/config/lircd.conf ${D}/${sysconfdir}/lircd.conf
 
 	install -d ${D}/dev
 	ln -sf lirc0 ${D}/dev/lirc
 
 	if [ -f ${WORKDIR}/serial.sh ]; then
-		install -d ${D}/etc/init.d
-		install -d ${D}/etc/rc2.d
-		install ${WORKDIR}/serial.sh ${D}/etc/init.d/mythfront-serial
-		ln -sf ../init.d/mythfront-serial ${D}/etc/rc2.d/S10mythfront-serial
+		install -d ${D}/${sysconfdir}/init.d
+		install -d ${D}/${sysconfdir}/rc2.d
+		install ${WORKDIR}/serial.sh ${D}/${sysconfdir}/init.d/mythfront-serial
+		ln -sf ../init.d/mythfront-serial ${D}/${sysconfdir}/rc2.d/S10mythfront-serial
 	fi
 }
 
diff --git a/packages/mythfront/mythfront-session.bb b/packages/mythfront/mythfront-session.bb
index 5f66164a2f..6f669170bf 100644
--- a/packages/mythfront/mythfront-session.bb
+++ b/packages/mythfront/mythfront-session.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SRC_URI = "file://mythfront.sh"
 
 do_install() {
-	install -d ${D}/etc/X11/Xinit.d
-	install ${WORKDIR}/mythfront.sh ${D}/etc/X11/Xinit.d/90mythfront
+	install -d ${D}/${sysconfdir}/X11/Xinit.d
+	install ${WORKDIR}/mythfront.sh ${D}/${sysconfdir}/X11/Xinit.d/90mythfront
 }
 
diff --git a/packages/nasm/nasm_0.98.38.bb b/packages/nasm/nasm_0.98.38.bb
index 8edabcde1e..0d5f7a10b4 100644
--- a/packages/nasm/nasm_0.98.38.bb
+++ b/packages/nasm/nasm_0.98.38.bb
@@ -11,7 +11,7 @@ inherit autotools
 
 do_install() {
 	install -d ${D}/${bindir}
-	install -d ${D}/${datadir}/man/man1
+	install -d ${D}/${mandir}/man1
 
 	oe_runmake 'INSTALLROOT=${D}' install
 }
diff --git a/packages/native/native-kernel.bb b/packages/native/native-kernel.bb
index e69de29bb2..d85cdbb3ff 100644
--- a/packages/native/native-kernel.bb
+++ b/packages/native/native-kernel.bb
@@ -0,0 +1,13 @@
+SECTION = "base"
+COMPATIBLE_HOST = "${BUILD_SYS}"
+
+PROVIDES = "virtual/kernel"
+
+do_stage() {
+	install -d ${STAGING_KERNEL_DIR}/include/
+	install -m 0755 ${includedir}/linux/wireless.h ${STAGING_KERNEL_DIR}/include/wireless.h
+	echo `uname -r` >${STAGING_KERNEL_DIR}/kernel-abiversion
+	echo /usr/src/linux >${STAGING_KERNEL_DIR}/kernel-source
+	echo >${STAGING_KERNEL_DIR}/kernel-ccsuffix
+	echo >${STAGING_KERNEL_DIR}/kernel-ldsuffix
+}
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index e69de29bb2..a3c051f376 100644
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -0,0 +1,76 @@
+DESCRIPTION = "Ncurses library"
+HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
+LICENSE = "MIT"
+SECTION = "libs"
+DEPENDS = "ncurses-native"
+PACKAGES_prepend = "ncurses-tools "
+PACKAGES_append = " ncurses-terminfo"
+FILES_ncurses_append = " ${datadir}/tabset"
+RSUGGESTS_${PN} = "ncurses-terminfo"
+
+inherit autotools
+
+# This keeps only tput/tset in ncurses
+# clear/reset are in already busybox
+FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear ${bindir}/reset ${bindir}/tack "
+FILES_ncurses-terminfo = "${datadir}/terminfo"
+FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo"
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = "--with-shared \
+	        --without-profile \
+	        --without-debug \
+	        --disable-rpath \
+	        --enable-echo \
+	        --enable-const \
+	        --without-ada \
+	        --enable-termcap \
+	        --without-cxx-binding \
+	        --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
+	        --enable-overwrite"
+export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
+export BUILD_LDFLAGS = ""
+export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
+
+do_stage () {
+	for i in libncurses libpanel libform libmenu; do
+		oe_libinstall -so -a -C lib $i ${STAGING_LIBDIR}
+	done
+	for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
+		termcap.h term.h unctrl.h; do
+		       install -m 0644 include/$h ${STAGING_INCDIR}/
+	done
+	ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
+	ln -sf libncurses.so ${STAGING_LIBDIR}/libtermcap.so
+	ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a
+}
+
+do_install() {
+	autotools_do_install
+
+	# our ncurses has termcap support
+	ln -sf libncurses.so ${D}/${libdir}/libtermcap.so
+	ln -sf libncurses.a ${D}/${libdir}/libtermcap.a
+
+	# include some basic terminfo files
+	# stolen ;) from gentoo and modified a bit
+	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm-color xterm-xfree86
+        do
+                local termfile="$(find "${D}${datadir}/terminfo/" -name "${x}" 2>/dev/null)"
+                local basedir="$(basename $(dirname "${termfile}"))"
+
+                if [ -n "${termfile}" ]
+                then
+                        install -d ${D}/${sysconfdir}/terminfo/${basedir}
+                        mv ${termfile} ${D}/${sysconfdir}/terminfo/${basedir}/
+                        ln -s /etc/terminfo/${basedir}/${x} \
+                                ${D}${datadir}/terminfo/${basedir}/${x}
+                fi
+        done
+	# i think we can use xterm-color as default xterm
+	if [ -e ${D}/${sysconfdir}/terminfo/x/xterm-color ]
+	then
+		ln -sf xterm-color ${D}/${sysconfdir}/terminfo/x/xterm
+	fi
+}
diff --git a/packages/netperf/netperf_2.3.bb b/packages/netperf/netperf_2.3.bb
index e69de29bb2..02465402db 100644
--- a/packages/netperf/netperf_2.3.bb
+++ b/packages/netperf/netperf_2.3.bb
@@ -0,0 +1,49 @@
+SECTION = "console/network"
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+
+SRC_URI="${DEBIAN_MIRROR}/non-free/n/netperf/netperf_${PV}.orig.tar.gz \
+	file://init"
+
+inherit update-rc.d
+
+S = "${WORKDIR}/netperf-${PV}.orig"
+
+CFLAGS_append = " -DDO_UNIX -DDO_IPV6"
+
+do_compile() {	 
+	oe_runmake
+        sed -i 's:^\(NETHOME=\).*:
${bindir}:' *_script
+}
+
+do_install() {
+	install -d ${D}/${sbindir} ${D}/${bindir} ${D}/${sysconfdir}/init.d
+        install -m 4755 netperf ${D}/${bindir}
+	install -m 4755 netserver ${D}/${sbindir}
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/netperf
+    
+	# man
+	install -d ${D}/${mandir}/man1/
+    	install -m 0644 netserver.man ${D}/${mandir}/man1/netserver.1
+	install -m 0644 netperf.man ${D}/${mandir}/man1/netperf.1
+
+	# move scripts to examples directory
+	install -d ${D}/${docdir}/netperf/examples
+	install -m 0644 tcp_range_script ${D}/${docdir}/netperf/examples/
+	install -m 0644 tcp_stream_script ${D}/${docdir}/netperf/examples/
+	install -m 0644 tcp_rr_script ${D}/${docdir}/netperf/examples/
+	install -m 0644 udp_stream_script ${D}/${docdir}/netperf/examples/
+	install -m 0644 udp_rr_script ${D}/${docdir}/netperf/examples/
+	install -m 0644 snapshot_script ${D}/${docdir}/netperf/examples/
+	
+	# docs ..
+	install -m 0644 ACKNWLDGMNTS ${D}/${docdir}/netperf
+	install -m 0644 COPYRIGHT ${D}/${docdir}/netperf
+	install -m 0644 Release_Notes ${D}/${docdir}/netperf
+	install -m 0644 README ${D}/${docdir}/netperf
+	install -m 0644 netperf.ps ${D}/${docdir}/netperf
+}
+
+INITSCRIPT_NAME="netperf"
+INITSCRIPT_PARAMS="defaults"
diff --git a/packages/ntp/ntp-ssl_4.1.2.bb b/packages/ntp/ntp-ssl_4.1.2.bb
index 937a0e20a4..fc661a240d 100644
--- a/packages/ntp/ntp-ssl_4.1.2.bb
+++ b/packages/ntp/ntp-ssl_4.1.2.bb
@@ -22,7 +22,7 @@ CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
 PACKAGES = "ntpdate ntp"
 
-FILES_ntpdate = "/usr/bin/ntpdate /etc/init.d/ntpdate"
+FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index 6f52699191..f77112bdfc 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -20,7 +20,7 @@ CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
 PACKAGES = "ntpdate ntp"
 
-FILES_ntpdate = "/usr/bin/ntpdate /etc/init.d/ntpdate"
+FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
@@ -34,7 +34,7 @@ else
 	if ! grep -q ntpdate /etc/cron/crontabs/root; then
 		echo "adding crontab"
 		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
-		echo "30 * * * *    /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
+		echo "30 * * * *    ${bindir}/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
 	update-rc.d -s ntpdate defaults 30
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index 060e6182d0..b89c0b395c 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -24,7 +24,7 @@ else
 	if ! grep -q collect.sh /etc/cron/crontabs/root; then
 		echo "adding crontab"
 		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
-		echo "*/5 * * * *    /usr/sbin/collect.sh" >> /etc/cron/crontabs/root
+		echo "*/5 * * * *    ${sbindir}/collect.sh" >> /etc/cron/crontabs/root
 	fi
 	update-rc.d -s busybox-cron defaults
 	/etc/init.d/busybox-cron reload
diff --git a/packages/olsrd/olsrd_0.4.7.bb b/packages/olsrd/olsrd_0.4.7.bb
index e69de29bb2..9b2acb2ffb 100644
--- a/packages/olsrd/olsrd_0.4.7.bb
+++ b/packages/olsrd/olsrd_0.4.7.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "OLSR mesh routing daemon"
+DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
+HOMEPAGE = "http://www.olsr.org"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI="http://www.olsr.org/downloadolsr.cgi?file=olsrd-${PV}.tar.bz2 \
+	file://init \
+	file://lib.diff;patch=1"
+
+PACKAGES =+ "olsrd-libs"
+FILES_olsrd-libs = "${libdir}"
+
+S = "${WORKDIR}/olsrd-${PV}"
+
+do_compile() {
+	oe_runmake all libs
+}
+
+do_install () {
+	oe_runmake INSTALL_PREFIX=${D} install install_libs
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
+}
+
+CONFFILES_${PN} = "/etc/olsrd.conf"
+
diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb
index 7f6a3c45bc..88428dd99a 100644
--- a/packages/openssh/openssh_3.8p1.bb
+++ b/packages/openssh/openssh_3.8p1.bb
@@ -46,16 +46,16 @@ do_compile_append () {
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/etc/init.d/sshd
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/sshd
 }
 
 PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc"
-FILES_openssh-scp = "/usr/bin/scp"
-FILES_openssh-ssh = "/usr/bin/ssh /usr/bin/slogin /${sysconfdir}/ssh/ssh_config"
-FILES_openssh-sshd = "/usr/sbin/sshd /${sysconfdir}/init.d/sshd /usr/bin/ssh-keygen"
+FILES_openssh-scp = "${bindir}/scp"
+FILES_openssh-ssh = "${bindir}/ssh ${bindir}/slogin /${sysconfdir}/ssh/ssh_config"
+FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen"
 FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd"
-FILES_openssh-sftp = "/usr/bin/sftp /usr/libexec/sftp-server"
-FILES_openssh-misc = "/usr/bin /usr/libexec/"
+FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server"
+FILES_openssh-misc = "${bindir} ${libdir}exec/"
 RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd"
 DEPENDS_openssh-sshd += " update-rc.d"
 RDEPENDS_openssh-sshd += " update-rc.d"
diff --git a/packages/openswan/openswan_2.1.2.bb b/packages/openswan/openswan_2.1.2.bb
index e69de29bb2..3346445b86 100644
--- a/packages/openswan/openswan_2.1.2.bb
+++ b/packages/openswan/openswan_2.1.2.bb
@@ -0,0 +1,27 @@
+LICENSE = GPL
+SECTION = "console/network"
+DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
+Linux operating system."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "gmp"
+
+SRC_URI = "http://www.openswan.org/code/openswan-${PV}.tar.gz \
+	   file://flags.patch;patch=1"
+S = "${WORKDIR}/openswan-${PV}"
+
+EXTRA_OEMAKE = "-e DESTDIR=${D} \
+                USERCOMPILE="${CFLAGS}" \
+                FINALCONFDIR=${sysconfdir}/ipsec \
+                INC_RCDEFAULT=${sysconfdir}/init.d \
+                INC_USRLOCAL=${prefix} \
+                INC_MANDIR=share/man"
+
+do_compile () {
+	oe_runmake programs
+}
+
+do_install () {
+	oe_runmake install
+}
+
+FILES_${PN} += "${libdir}/ipsec/"
diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb
index 110cc12b6e..f09f6c9faa 100644
--- a/packages/openswan/openswan_2.2.0.bb
+++ b/packages/openswan/openswan_2.2.0.bb
@@ -29,6 +29,6 @@ do_install () {
 	oe_runmake install
 }
 
-FILES_${PN} += "/usr/lib/ipsec/"
+FILES_${PN} += "${libdir}/ipsec/"
 
 CONFFILES_${PN}_nylon = "${sysconfdir}/ipsec/ipsec.conf"
diff --git a/packages/opie-networksettings/opie-networksettings_1.1.9.bb b/packages/opie-networksettings/opie-networksettings_1.1.9.bb
index bc9b0672b3..1db0c97e78 100644
--- a/packages/opie-networksettings/opie-networksettings_1.1.9.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.1.9.bb
@@ -46,7 +46,7 @@ do_install() {
 	done
 
 	# install changedns script
-	install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/
+	install -m 0755 ${WORKDIR}/root${bindir}/changedns ${D}${bindir}/
 	install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers
 }
 
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index 44094b3794..aabba348d4 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -46,7 +46,7 @@ do_install() {
 	done
 
 	# install changedns script
-	install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/
+	install -m 0755 ${WORKDIR}/root${bindir}/changedns ${D}${bindir}/
 	install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers
 }
 
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.9.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
index 768503685e..2574cd0ef7 100644
--- a/packages/opie-taskbar/opie-taskbar_1.1.9.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
@@ -67,8 +67,8 @@ do_install() {
 	install -d ${D}/${palmtopdir}/pics/launcher
 	install -d ${D}/${palmtopdir}/pics/logo
 	install -d ${D}/${palmtopdir}/pics/RoH/star/
-	install -d ${D}/etc/init.d
-	install -d ${D}/etc/profile.d
+	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}/${sysconfdir}/profile.d
 	install -d ${D}/${palmtopdir}/etc/colors
 	install -d ${D}/${palmtopdir}/etc/skel
 
@@ -76,7 +76,7 @@ do_install() {
 	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
 	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
 	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}/${sysconfdir}/profile.d/
 
 	for p in ${PICS}
 	do
@@ -89,9 +89,9 @@ do_install() {
 	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
 
 	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/${sysconfdir}/
 
-	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+	install -m 0755 ${WORKDIR}/opie ${D}/${sysconfdir}/init.d/opie
 	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
 
 	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 286abdb459..113787b460 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -65,8 +65,8 @@ do_install() {
 	install -d ${D}/${palmtopdir}/pics/launcher
 	install -d ${D}/${palmtopdir}/pics/logo
 	install -d ${D}/${palmtopdir}/pics/RoH/star/
-	install -d ${D}/etc/init.d
-	install -d ${D}/etc/profile.d	
+	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}/${sysconfdir}/profile.d	
 	install -d ${D}/${palmtopdir}/etc/colors
 	install -d ${D}/${palmtopdir}/etc/skel
 
@@ -74,7 +74,7 @@ do_install() {
 	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
 	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
 	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}/${sysconfdir}/profile.d/
 
 	for p in ${PICS}
 	do
@@ -87,9 +87,9 @@ do_install() {
 	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
 
 	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/${sysconfdir}/
 
-	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+	install -m 0755 ${WORKDIR}/opie ${D}/${sysconfdir}/init.d/opie
 	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
 
 	if [ -s ${WORKDIR}/locale.conf ]; then
diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index 2e289a7480..f39ba65f76 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -20,13 +20,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-        install -d ${D}/etc/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}/${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index 3174ca094f..74a269d6d9 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -24,13 +24,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-        install -d ${D}/etc/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}/${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index 26cb60473e..a81dbdd424 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -27,13 +27,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-        install -d ${D}/etc/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}/${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb
index e69de29bb2..d268f6d646 100644
--- a/packages/orinoco/orinoco-modules_cvs.bb
+++ b/packages/orinoco/orinoco-modules_cvs.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
+Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+PROVIDES = "spectrum-modules"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"'
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
+SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/orinoco;module=orinoco;method=ext;rsh=ssh \
+           file://list-move.patch;patch=1 \
+           file://spectrum-firmware.patch;patch=1 \
+           file://spectrum.conf \
+           file://spectrum_fw.h \
+	   file://orinoco_cs.conf"
+S = "${WORKDIR}/orinoco"
+
+inherit module
+
+do_compile_prepend() {
+	install ${WORKDIR}/spectrum_fw.h ${S}/
+}
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+	install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+	install -d ${D}/${sysconfdir}/modutils
+	install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
+}
+
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+				/lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
diff --git a/packages/oz-compat/oz-compat_0.5.bb b/packages/oz-compat/oz-compat_0.5.bb
index fed22b9b85..41ca32049e 100644
--- a/packages/oz-compat/oz-compat_0.5.bb
+++ b/packages/oz-compat/oz-compat_0.5.bb
@@ -29,7 +29,7 @@ do_install() {
 	install -d ${D}/opt/QtPalmtop.compat/binlib
 	install -d ${D}/opt/QtPalmtop.compat/lib
 	
-	install -d ${D}/etc/init.d
+	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
@@ -38,7 +38,7 @@ do_install() {
 	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}/etc/init.d
+	install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}/${sysconfdir}/init.d
 			
 	cd ${D}/opt/QtPalmtop/bin
 	for file in chkhinge makecompat qeserver quickexec runcompat
diff --git a/packages/perl/perl_5.8.3.bb b/packages/perl/perl_5.8.3.bb
index e82438f169..44f39a56fb 100644
--- a/packages/perl/perl_5.8.3.bb
+++ b/packages/perl/perl_5.8.3.bb
@@ -38,7 +38,7 @@ do_compile() {
 do_install() {
 	oe_runmake install
 	mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
-	( cd ${D}/usr/bin/; rm perl; ln -s perl${PV} perl )
+	( cd ${D}${bindir}/; rm perl; ln -s perl${PV} perl )
 }
 
 do_stage() {
@@ -56,8 +56,8 @@ python populate_packages_prepend () {
 }
 
 PACKAGES = "perl perl-misc perl-lib perl-dev perl-pod"
-FILES_${PN} = "/usr/bin/perl /usr/bin/perl${PV}"
-FILES_${PN}-lib = "/usr/lib/libperl.so*"
-FILES_${PN}-dev = "/usr/lib/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/"
-FILES_${PN}-pod = "/usr/lib/perl5/${PV}/pod"
-FILES_perl-misc = "/usr/bin/"
+FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV}"
+FILES_${PN}-lib = "${libdir}/libperl.so*"
+FILES_${PN}-dev = "${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/"
+FILES_${PN}-pod = "${libdir}/perl5/${PV}/pod"
+FILES_perl-misc = "${bindir}/"
diff --git a/packages/plone/plone_1.0.5.bb b/packages/plone/plone_1.0.5.bb
index 83adbaee4d..f16dd830aa 100644
--- a/packages/plone/plone_1.0.5.bb
+++ b/packages/plone/plone_1.0.5.bb
@@ -8,8 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/plone/CMFPlone${PV}.tar.gz"
 S = "${WORKDIR}/CMFPlone-${PV}"
 
 do_install() {
-	install -d ${D}/usr/lib/python/Products/
-	cp -a ${S}/* ${D}/usr/lib/python/Products/
+	install -d ${D}${libdir}/python/Products/
+	cp -a ${S}/* ${D}${libdir}/python/Products/
 }
 
-FILES_${PN} = "/usr/lib/python/Products/"
+FILES_${PN} = "${libdir}/python/Products/"
diff --git a/packages/plone/plone_2.0.0.bb b/packages/plone/plone_2.0.0.bb
index cc4449443e..2d615dbc08 100644
--- a/packages/plone/plone_2.0.0.bb
+++ b/packages/plone/plone_2.0.0.bb
@@ -8,8 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/plone/CMFPlone-2.0-final.tar.gz"
 S = "${WORKDIR}/CMFPlone-2.0-final"
 
 do_install() {
-	install -d ${D}/usr/lib/python/Products/
-	cp -a ${S}/* ${D}/usr/lib/python/Products/
+	install -d ${D}${libdir}/python/Products/
+	cp -a ${S}/* ${D}${libdir}/python/Products/
 }
 
-FILES_${PN} = "/usr/lib/python/Products/"
+FILES_${PN} = "${libdir}/python/Products/"
diff --git a/packages/portmap/portmap_5-7.bb b/packages/portmap/portmap_5-7.bb
index 4234f1c823..4acb379673 100644
--- a/packages/portmap/portmap_5-7.bb
+++ b/packages/portmap/portmap_5-7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
@@ -12,6 +12,7 @@ S = "${WORKDIR}/portmap_5beta"
 
 PACKAGES =+ "portmap-utils"
 FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
+FILES_${PN}-doc += "${docdir}"
 
 INITSCRIPT_NAME = "portmap"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . start 18 2 3 4 5 . stop 81 1 ."
@@ -25,8 +26,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/etc/init.d
-	install -m 0755 ${WORKDIR}/portmap.init ${D}/etc/init.d/portmap
-	oe_runmake 'docdir=${datadir}/doc/portmap' \
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/portmap.init ${D}/${sysconfdir}/init.d/portmap
+	oe_runmake 'docdir=${docdir}/portmap' \
 		   'DESTDIR=${D}' install
 }
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index ed1270ddf6..b6fe40b1bf 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -22,7 +22,7 @@ pkg_postinst() {
 if test "x$D" != "x"; then
 	exit 1
 else
-	adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s /usr/sbin/ppp-dialin ppp
+	adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp
 fi
 }
 
diff --git a/packages/ppp/ppp_2.4.1.bb b/packages/ppp/ppp_2.4.1.bb
index b952865e3d..5280c6e651 100644
--- a/packages/ppp/ppp_2.4.1.bb
+++ b/packages/ppp/ppp_2.4.1.bb
@@ -41,6 +41,6 @@ pkg_postinst() {
 if test "x$D" != "x"; then
 	exit 1
 else
-	chmod u+s /usr/sbin/pppd
+	chmod u+s ${sbindir}/pppd
 fi
 }
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index abc17009dc..567e381390 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -28,11 +28,11 @@ do_install() {
         install -d ${D}/${palmtopdir}/bin \
         	   ${D}/${palmtopdir}/apps/Games \
         	   ${D}/${palmtopdir}/pics \
-		   ${D}/usr/share/games/doom
+		   ${D}${datadir}/games/doom
 	install -m 0755 src/prboom ${D}/${palmtopdir}/bin/prboom
-	install -m 0644 data/prboom.wad ${D}/usr/share/games/doom/
+	install -m 0644 data/prboom.wad ${D}${datadir}/games/doom/
 	install -m 0644 ${WORKDIR}/prboom.png ${D}/${palmtopdir}/pics/prboom.png
 	install -m 0644 ${WORKDIR}/prboom.desktop ${D}/${palmtopdir}/apps/Games/prboom.desktop
 }
 
-FILES_${PN} = "${palmtopdir} /usr/share/games/doom/prboom.wad"
+FILES_${PN} = "${palmtopdir} ${datadir}/games/doom/prboom.wad"
diff --git a/packages/prism54/prism54-firmware_1.0.3.0.bb b/packages/prism54/prism54-firmware_1.0.3.0.bb
index e69de29bb2..ee79560a06 100644
--- a/packages/prism54/prism54-firmware_1.0.3.0.bb
+++ b/packages/prism54/prism54-firmware_1.0.3.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Firmware for the Prism54 driver"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "unknown"
+
+SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
+
+S = "${WORKDIR}/prism54.org"
+
+do_install() {
+	install -d ${D}/${base_libdir}/firmware/
+	install -m 0644 ${PV}.arm ${D}/${base_libdir}/firmware/isl3890
+}
+
+FILES_${PN} = "/lib/firmware/"
diff --git a/packages/prism54/prism54-firmware_1.0.4.3.bb b/packages/prism54/prism54-firmware_1.0.4.3.bb
index 7603c9a206..65c381fcc0 100644
--- a/packages/prism54/prism54-firmware_1.0.4.3.bb
+++ b/packages/prism54/prism54-firmware_1.0.4.3.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
 S = "${WORKDIR}/prism54.org"
 
 do_install() {
-	install -d ${D}/lib/firmware/
-	install -m 0644 ${PV}.arm ${D}/lib/firmware/isl3890
+	install -d ${D}/${base_libdir}/firmware/
+	install -m 0644 ${PV}.arm ${D}/${base_libdir}/firmware/isl3890
 }
 
 FILES_${PN} = "/lib/firmware/"
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index e69de29bb2..fc86f536ae 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Linux Driver for the 802.11g Prism GT / Prism Duette / Prism Indigo Chipsets"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+HOMEPAGE = "http://prism54.org"
+LICENSE = "GPL"
+RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware (1.0.3.0) hotplug"
+DEPENDS = "virtual/kernel prism54-firmware"
+
+SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"
+
+S = "${WORKDIR}/prism54-${PV}"
+
+inherit module-base
+
+# Hack Alert :D
+ARCH_mipsel = "mips"
+
+EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} KMISC=${D}/${base_libdir}/modules/${KERNEL_VERSION}/net KVER=${KERNEL_VERSION}"
+
+do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake modules
+}
+
+do_install() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake install
+	
+}
+
+FILES_${PN} = "/lib/modules/"
diff --git a/packages/prismstumbler/prismstumbler_0.7.2.bb b/packages/prismstumbler/prismstumbler_0.7.2.bb
index b04b4a41c5..45ad2bb719 100644
--- a/packages/prismstumbler/prismstumbler_0.7.2.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.2.bb
@@ -21,7 +21,7 @@ FILES_${PN} = "${bindir}/prismstumbler"
 
 FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
 	                       ${datadir}/applications \
-	                       ${datadir}/pixmaps ${datadir}/doc/prismstumbler/help.txt \
+	                       ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \
                                ${sysconfdir}"
 
 do_configure() {
diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 8723c06ec2..919a4fa153 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -21,7 +21,7 @@ FILES_${PN} = "${bindir}/prismstumbler"
 
 FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
 	                       ${datadir}/applications \
-	                       ${datadir}/pixmaps ${datadir}/doc/prismstumbler/help.txt \
+	                       ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \
                                ${sysconfdir}"
 RDEPENDS_prismstumbler-frontend = "${PN}"
 
diff --git a/packages/python/python-2.3.4-manifest.inc b/packages/python/python-2.3.4-manifest.inc
index cec02ae024..e2344f2029 100644
--- a/packages/python/python-2.3.4-manifest.inc
+++ b/packages/python/python-2.3.4-manifest.inc
@@ -9,202 +9,202 @@ PACKAGES="python-codecs python-threading python-distutils python-textutils pytho
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
 PR_python-codecs="ml2"
 RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="/usr/lib/python2.3/codecs.* /usr/lib/python2.3/encodings /usr/lib/python2.3/locale.* /usr/lib/python2.3/lib-dynload/_locale.so /usr/lib/python2.3/lib-dynload/unicodedata.so /usr/lib/python2.3/gettext.* /usr/lib/python2.3/xdrlib.* "
+FILES_python-codecs="${libdir}/python2.3/codecs.* ${libdir}/python2.3/encodings ${libdir}/python2.3/locale.* ${libdir}/python2.3/lib-dynload/_locale.so ${libdir}/python2.3/lib-dynload/unicodedata.so ${libdir}/python2.3/gettext.* ${libdir}/python2.3/xdrlib.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml2"
 RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="/usr/lib/python2.3/bisect.* /usr/lib/python2.3/threading.* /usr/lib/python2.3/Queue.* "
+FILES_python-threading="${libdir}/python2.3/bisect.* ${libdir}/python2.3/threading.* ${libdir}/python2.3/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utility"
 PR_python-distutils="ml2"
 RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="/usr/lib/python2.3/distutils "
+FILES_python-distutils="${libdir}/python2.3/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml2"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="/usr/lib/python2.3/lib-dynload/_csv.so /usr/lib/python2.3/csv.* /usr/lib/python2.3/optparse.* /usr/lib/python2.3/textwrap.* "
+FILES_python-textutils="${libdir}/python2.3/lib-dynload/_csv.so ${libdir}/python2.3/csv.* ${libdir}/python2.3/optparse.* ${libdir}/python2.3/textwrap.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
 PR_python-curses="ml2"
 RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="/usr/lib/python2.3/curses /usr/lib/python2.3/lib-dynload/_curses.so /usr/lib/python2.3/lib-dynload/_curses_panel.so "
+FILES_python-curses="${libdir}/python2.3/curses ${libdir}/python2.3/lib-dynload/_curses.so ${libdir}/python2.3/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml2"
 RDEPENDS_python-pickle="python-core python-re"
-FILES_python-pickle="/usr/lib/python2.3/pickle.* /usr/lib/python2.3/shelve.* /usr/lib/python2.3/lib-dynload/cPickle.so "
+FILES_python-pickle="${libdir}/python2.3/pickle.* ${libdir}/python2.3/shelve.* ${libdir}/python2.3/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml2"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.3/__future__.* /usr/lib/python2.3/copy.* /usr/lib/python2.3/copy_reg.* /usr/lib/python2.3/ConfigParser.py /usr/lib/python2.3/getopt.* /usr/lib/python2.3/new.* /usr/lib/python2.3/os.* /usr/lib/python2.3/posixpath.* /usr/lib/python2.3/warnings.* /usr/lib/python2.3/site.* /usr/lib/python2.3/stat.* /usr/lib/python2.3/UserDict.* /usr/lib/python2.3/lib-dynload/binascii.so /usr/lib/python2.3/lib-dynload/struct.so /usr/lib/python2.3/lib-dynload/time.so /usr/lib/python2.3/lib-dynload/xreadlines.so /usr/lib/python2.3/types.* /usr/bin/python "
+FILES_python-core="${libdir}/python2.3/__future__.* ${libdir}/python2.3/copy.* ${libdir}/python2.3/copy_reg.* ${libdir}/python2.3/ConfigParser.py ${libdir}/python2.3/getopt.* ${libdir}/python2.3/new.* ${libdir}/python2.3/os.* ${libdir}/python2.3/posixpath.* ${libdir}/python2.3/warnings.* ${libdir}/python2.3/site.* ${libdir}/python2.3/stat.* ${libdir}/python2.3/UserDict.* ${libdir}/python2.3/lib-dynload/binascii.so ${libdir}/python2.3/lib-dynload/struct.so ${libdir}/python2.3/lib-dynload/time.so ${libdir}/python2.3/lib-dynload/xreadlines.so ${libdir}/python2.3/types.* ${bindir}/python "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml2"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="/usr/lib/python2.3/lib-dynload/_socket.so /usr/lib/python2.3/lib-dynload/select.so /usr/lib/python2.3/lib-dynload/termios.so /usr/lib/python2.3/lib-dynload/cStringIO.so /usr/lib/python2.3/pipes.* /usr/lib/python2.3/socket.* /usr/lib/python2.3/tempfile.* /usr/lib/python2.3/StringIO.* "
+FILES_python-io="${libdir}/python2.3/lib-dynload/_socket.so ${libdir}/python2.3/lib-dynload/select.so ${libdir}/python2.3/lib-dynload/termios.so ${libdir}/python2.3/lib-dynload/cStringIO.so ${libdir}/python2.3/pipes.* ${libdir}/python2.3/socket.* ${libdir}/python2.3/tempfile.* ${libdir}/python2.3/StringIO.* "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
 PR_python-compression="ml2"
 RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="/usr/lib/python2.3/gzip.* /usr/lib/python2.3/zipfile.* "
+FILES_python-compression="${libdir}/python2.3/gzip.* ${libdir}/python2.3/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
 PR_python-re="ml2"
 RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="/usr/lib/python2.3/re.* /usr/lib/python2.3/sre.* /usr/lib/python2.3/sre_compile.* /usr/lib/python2.3/sre_constants* /usr/lib/python2.3/sre_parse.* "
+FILES_python-re="${libdir}/python2.3/re.* ${libdir}/python2.3/sre.* ${libdir}/python2.3/sre_compile.* ${libdir}/python2.3/sre_constants* ${libdir}/python2.3/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
 PR_python-xmlrpc="ml2"
 RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="/usr/lib/python2.3/xmlrpclib.* /usr/lib/python2.3/SimpleXMLRPCServer.* "
+FILES_python-xmlrpc="${libdir}/python2.3/xmlrpclib.* ${libdir}/python2.3/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
 PR_python-terminal="ml2"
 RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="/usr/lib/python2.3/pty.* /usr/lib/python2.3/tty.* "
+FILES_python-terminal="${libdir}/python2.3/pty.* ${libdir}/python2.3/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
 PR_python-email="ml2"
 RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="/usr/lib/python2.3/email "
+FILES_python-email="${libdir}/python2.3/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
 PR_python-image="ml2"
 RDEPENDS_python-image="python-core"
-FILES_python-image="/usr/lib/python2.3/colorsys.* /usr/lib/python2.3/imghdr.* /usr/lib/python2.3/lib-dynload/imageop.so /usr/lib/python2.3/lib-dynload/rgbimg.so "
+FILES_python-image="${libdir}/python2.3/colorsys.* ${libdir}/python2.3/imghdr.* ${libdir}/python2.3/lib-dynload/imageop.so ${libdir}/python2.3/lib-dynload/rgbimg.so "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
 PR_python-resource="ml2"
 RDEPENDS_python-resource="python-core"
-FILES_python-resource="/usr/lib/python2.3/lib-dynload/resource.so "
+FILES_python-resource="${libdir}/python2.3/lib-dynload/resource.so "
 
 DESCRIPTION_python-math="Python Math Support"
 PR_python-math="ml2"
 RDEPENDS_python-math="python-core"
-FILES_python-math="/usr/lib/python2.3/lib-dynload/cmath.so /usr/lib/python2.3/lib-dynload/math.so /usr/lib/python2.3/lib-dynload/_random.so /usr/lib/python2.3/random.* "
+FILES_python-math="${libdir}/python2.3/lib-dynload/cmath.so ${libdir}/python2.3/lib-dynload/math.so ${libdir}/python2.3/lib-dynload/_random.so ${libdir}/python2.3/random.* "
 
 DESCRIPTION_python-hotshot="Python Hotshot Profiler"
 PR_python-hotshot="ml2"
 RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="/usr/lib/python2.3/hotshot /usr/lib/python2.3/lib-dynload/_hotshot.so "
+FILES_python-hotshot="${libdir}/python2.3/hotshot ${libdir}/python2.3/lib-dynload/_hotshot.so "
 
 DESCRIPTION_python-unixadmin="Python Unix Administration Support"
 PR_python-unixadmin="ml2"
 RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="/usr/lib/python2.3/lib-dynload/nis.so /usr/lib/python2.3/lib-dynload/grp.so /usr/lib/python2.3/lib-dynload/pwd.so /usr/lib/python2.3/getpass.* "
+FILES_python-unixadmin="${libdir}/python2.3/lib-dynload/nis.so ${libdir}/python2.3/lib-dynload/grp.so ${libdir}/python2.3/lib-dynload/pwd.so ${libdir}/python2.3/getpass.* "
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
 PR_python-gdbm="ml2"
 RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="/usr/lib/python2.3/lib-dynload/gdbm.so "
+FILES_python-gdbm="${libdir}/python2.3/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
 PR_python-fcntl="ml2"
 RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="/usr/lib/python2.3/lib-dynload/fcntl.so "
+FILES_python-fcntl="${libdir}/python2.3/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml2"
 RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="/usr/lib/python2.3/base64.* /usr/lib/python2.3/ftplib.* /usr/lib/python2.3/gopherlib.* /usr/lib/python2.3/hmac.* /usr/lib/python2.3/httplib.* /usr/lib/python2.3/mimetypes.* /usr/lib/python2.3/nntplib.* /usr/lib/python2.3/poplib.* /usr/lib/python2.3/smtplib.* /usr/lib/python2.3/telnetlib.* /usr/lib/python2.3/urllib.* /usr/lib/python2.3/urllib2.* /usr/lib/python2.3/urlparse.* "
+FILES_python-netclient="${libdir}/python2.3/base64.* ${libdir}/python2.3/ftplib.* ${libdir}/python2.3/gopherlib.* ${libdir}/python2.3/hmac.* ${libdir}/python2.3/httplib.* ${libdir}/python2.3/mimetypes.* ${libdir}/python2.3/nntplib.* ${libdir}/python2.3/poplib.* ${libdir}/python2.3/smtplib.* ${libdir}/python2.3/telnetlib.* ${libdir}/python2.3/urllib.* ${libdir}/python2.3/urllib2.* ${libdir}/python2.3/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml2"
 RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="/usr/lib/python2.3/pprint.* "
+FILES_python-pprint="${libdir}/python2.3/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
 PR_python-netserver="ml2"
 RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="/usr/lib/python2.3/cgi.* /usr/lib/python2.3/BaseHTTPServer.* /usr/lib/python2.3/SimpleHTTPServer.* /usr/lib/python2.3/SocketServer.* "
+FILES_python-netserver="${libdir}/python2.3/cgi.* ${libdir}/python2.3/BaseHTTPServer.* ${libdir}/python2.3/SimpleHTTPServer.* ${libdir}/python2.3/SocketServer.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 PR_python-compiler="ml2"
 RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="/usr/lib/python2.3/compiler "
+FILES_python-compiler="${libdir}/python2.3/compiler "
 
 DESCRIPTION_python-syslog="Python's syslog Interface"
 PR_python-syslog="ml2"
 RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="/usr/lib/python2.3/lib-dynload/syslog.so "
+FILES_python-syslog="${libdir}/python2.3/lib-dynload/syslog.so "
 
 DESCRIPTION_python-html="Python HTML Processing"
 PR_python-html="ml2"
 RDEPENDS_python-html="python-core"
-FILES_python-html="/usr/lib/python2.3/formatter.* /usr/lib/python2.3/htmlentitydefs.* /usr/lib/python2.3/htmllib.* /usr/lib/python2.3/markupbase.* /usr/lib/python2.3/sgmllib.* "
+FILES_python-html="${libdir}/python2.3/formatter.* ${libdir}/python2.3/htmlentitydefs.* ${libdir}/python2.3/htmllib.* ${libdir}/python2.3/markupbase.* ${libdir}/python2.3/sgmllib.* "
 
 DESCRIPTION_python-readline="Python Readline Support"
 PR_python-readline="ml2"
 RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="/usr/lib/python2.3/lib-dynload/readline.so /usr/lib/python2.3/rlcompleter.* "
+FILES_python-readline="${libdir}/python2.3/lib-dynload/readline.so ${libdir}/python2.3/rlcompleter.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml2"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.3/pydoc.* "
+FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.3/pydoc.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
 PR_python-xml="ml2"
 RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="/usr/lib/python2.3/lib-dynload/pyexpat.so /usr/lib/python2.3/xml /usr/lib/python2.3/xmllib.* "
+FILES_python-xml="${libdir}/python2.3/lib-dynload/pyexpat.so ${libdir}/python2.3/xml ${libdir}/python2.3/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
 PR_python-mime="ml2"
 RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="/usr/lib/python2.3/mimetools.* /usr/lib/python2.3/rfc822.* "
+FILES_python-mime="${libdir}/python2.3/mimetools.* ${libdir}/python2.3/rfc822.* "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml2"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
-FILES_python-unittest="/usr/lib/python2.3/unittest.* "
+FILES_python-unittest="${libdir}/python2.3/unittest.* "
 
 DESCRIPTION_python-stringold="Python Deprecated String APIs"
 PR_python-stringold="ml2"
 RDEPENDS_python-stringold="python-core"
-FILES_python-stringold="/usr/lib/python2.3/lib-dynload/strop.so /usr/lib/python2.3/string.* "
+FILES_python-stringold="${libdir}/python2.3/lib-dynload/strop.so ${libdir}/python2.3/string.* "
 
 DESCRIPTION_python-compile="Python Bytecode Compilation Support"
 PR_python-compile="ml2"
 RDEPENDS_python-compile="python-core"
-FILES_python-compile="/usr/lib/python2.3/py_compile.* /usr/lib/python2.3/compileall.* "
+FILES_python-compile="${libdir}/python2.3/py_compile.* ${libdir}/python2.3/compileall.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
 PR_python-shell="ml2"
 RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="/usr/lib/python2.3/commands.* /usr/lib/python2.3/dircache.* /usr/lib/python2.3/fnmatch.* /usr/lib/python2.3/glob.* /usr/lib/python2.3/popen2.* /usr/lib/python2.3/shutil.* "
+FILES_python-shell="${libdir}/python2.3/commands.* ${libdir}/python2.3/dircache.* ${libdir}/python2.3/fnmatch.* ${libdir}/python2.3/glob.* ${libdir}/python2.3/popen2.* ${libdir}/python2.3/shutil.* "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml2"
 RDEPENDS_python-mmap="python-core python-io"
-FILES_python-mmap="/usr/lib/python2.3/lib-dynload/mmap.so "
+FILES_python-mmap="${libdir}/python2.3/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
 PR_python-zlib="ml3"
 RDEPENDS_python-zlib="python-core libz1"
-FILES_python-zlib="/usr/lib/python2.3/lib-dynload/zlib.so "
+FILES_python-zlib="${libdir}/python2.3/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
 PR_python-db="ml2"
 RDEPENDS_python-db="python-core"
-FILES_python-db="/usr/lib/python2.3/anydbm.* /usr/lib/python2.3/dumbdbm.* /usr/lib/python2.3/whichdb.* "
+FILES_python-db="${libdir}/python2.3/anydbm.* ${libdir}/python2.3/dumbdbm.* ${libdir}/python2.3/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
 PR_python-crypt="ml2"
 RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="/usr/lib/python2.3/lib-dynload/crypt.so /usr/lib/python2.3/lib-dynload/md5.so /usr/lib/python2.3/lib-dynload/rotor.so /usr/lib/python2.3/lib-dynload/sha.so "
+FILES_python-crypt="${libdir}/python2.3/lib-dynload/crypt.so ${libdir}/python2.3/lib-dynload/md5.so ${libdir}/python2.3/lib-dynload/rotor.so ${libdir}/python2.3/lib-dynload/sha.so "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
 PR_python-lang="ml2"
 RDEPENDS_python-lang="python-core"
-FILES_python-lang="/usr/lib/python2.3/lib-dynload/array.so /usr/lib/python2.3/lib-dynload/parser.so /usr/lib/python2.3/lib-dynload/operator.so /usr/lib/python2.3/lib-dynload/_weakref.so /usr/lib/python2.3/atexit.* /usr/lib/python2.3/code.* /usr/lib/python2.3/codeop.* /usr/lib/python2.3/dis.* /usr/lib/python2.3/inspect.* /usr/lib/python2.3/keyword.* /usr/lib/python2.3/opcode.* /usr/lib/python2.3/repr.* /usr/lib/python2.3/token.* /usr/lib/python2.3/tokenize.* /usr/lib/python2.3/traceback.* /usr/lib/python2.3/linecache.* /usr/lib/python2.3/weakref.* "
+FILES_python-lang="${libdir}/python2.3/lib-dynload/array.so ${libdir}/python2.3/lib-dynload/parser.so ${libdir}/python2.3/lib-dynload/operator.so ${libdir}/python2.3/lib-dynload/_weakref.so ${libdir}/python2.3/atexit.* ${libdir}/python2.3/code.* ${libdir}/python2.3/codeop.* ${libdir}/python2.3/dis.* ${libdir}/python2.3/inspect.* ${libdir}/python2.3/keyword.* ${libdir}/python2.3/opcode.* ${libdir}/python2.3/repr.* ${libdir}/python2.3/token.* ${libdir}/python2.3/tokenize.* ${libdir}/python2.3/traceback.* ${libdir}/python2.3/linecache.* ${libdir}/python2.3/weakref.* "
 
 DESCRIPTION_python-audio="Python Audio Handling"
 PR_python-audio="ml2"
 RDEPENDS_python-audio="python-core"
-FILES_python-audio="/usr/lib/python2.3/wave.* /usr/lib/python2.3/chunk.* /usr/lib/python2.3/lib-dynload/ossaudiodev.so /usr/lib/python2.3/lib-dynload/audioop.so "
+FILES_python-audio="${libdir}/python2.3/wave.* ${libdir}/python2.3/chunk.* ${libdir}/python2.3/lib-dynload/ossaudiodev.so ${libdir}/python2.3/lib-dynload/audioop.so "
 
 
 
diff --git a/packages/python/python-2.4.0-manifest.inc b/packages/python/python-2.4.0-manifest.inc
index 3ede1edaac..6266632b83 100644
--- a/packages/python/python-2.4.0-manifest.inc
+++ b/packages/python/python-2.4.0-manifest.inc
@@ -9,202 +9,202 @@ PACKAGES="python-codecs python-threading python-distutils python-textutils pytho
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
 PR_python-codecs="ml2"
 RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="/usr/lib/python2.4/codecs.* /usr/lib/python2.4/encodings /usr/lib/python2.4/locale.* /usr/lib/python2.4/lib-dynload/_locale.so /usr/lib/python2.4/lib-dynload/unicodedata.so /usr/lib/python2.4/gettext.* /usr/lib/python2.4/xdrlib.* "
+FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/gettext.* ${libdir}/python2.4/xdrlib.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml2"
 RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="/usr/lib/python2.4/bisect.* /usr/lib/python2.4/threading.* /usr/lib/python2.4/Queue.* "
+FILES_python-threading="${libdir}/python2.4/bisect.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utility"
 PR_python-distutils="ml2"
 RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="/usr/lib/python2.4/distutils "
+FILES_python-distutils="${libdir}/python2.4/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml2"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="/usr/lib/python2.4/lib-dynload/_csv.so /usr/lib/python2.4/csv.* /usr/lib/python2.4/optparse.* /usr/lib/python2.4/textwrap.* "
+FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
 PR_python-curses="ml2"
 RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="/usr/lib/python2.4/curses /usr/lib/python2.4/lib-dynload/_curses.so /usr/lib/python2.4/lib-dynload/_curses_panel.so "
+FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml2"
 RDEPENDS_python-pickle="python-core python-re"
-FILES_python-pickle="/usr/lib/python2.4/pickle.* /usr/lib/python2.4/shelve.* /usr/lib/python2.4/lib-dynload/cPickle.so "
+FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml2"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+FILES_python-core="${libdir}/python2.4/__future__.* ${libdir}/python2.4/copy.* ${libdir}/python2.4/copy_reg.* ${libdir}/python2.4/ConfigParser.py ${libdir}/python2.4/getopt.* ${libdir}/python2.4/new.* ${libdir}/python2.4/os.* ${libdir}/python2.4/posixpath.* ${libdir}/python2.4/warnings.* ${libdir}/python2.4/site.* ${libdir}/python2.4/stat.* ${libdir}/python2.4/UserDict.* ${libdir}/python2.4/lib-dynload/binascii.so ${libdir}/python2.4/lib-dynload/struct.so ${libdir}/python2.4/lib-dynload/time.so ${libdir}/python2.4/lib-dynload/xreadlines.so ${libdir}/python2.4/types.* ${bindir}/python "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml2"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="/usr/lib/python2.4/lib-dynload/_socket.so /usr/lib/python2.4/lib-dynload/select.so /usr/lib/python2.4/lib-dynload/termios.so /usr/lib/python2.4/lib-dynload/cStringIO.so /usr/lib/python2.4/pipes.* /usr/lib/python2.4/socket.* /usr/lib/python2.4/tempfile.* /usr/lib/python2.4/StringIO.* "
+FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
 PR_python-compression="ml2"
 RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="/usr/lib/python2.4/gzip.* /usr/lib/python2.4/zipfile.* "
+FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
 PR_python-re="ml2"
 RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="/usr/lib/python2.4/re.* /usr/lib/python2.4/sre.* /usr/lib/python2.4/sre_compile.* /usr/lib/python2.4/sre_constants* /usr/lib/python2.4/sre_parse.* "
+FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
 PR_python-xmlrpc="ml2"
 RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="/usr/lib/python2.4/xmlrpclib.* /usr/lib/python2.4/SimpleXMLRPCServer.* "
+FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
 PR_python-terminal="ml2"
 RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="/usr/lib/python2.4/pty.* /usr/lib/python2.4/tty.* "
+FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
 PR_python-email="ml2"
 RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="/usr/lib/python2.4/email "
+FILES_python-email="${libdir}/python2.4/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
 PR_python-image="ml2"
 RDEPENDS_python-image="python-core"
-FILES_python-image="/usr/lib/python2.4/colorsys.* /usr/lib/python2.4/imghdr.* /usr/lib/python2.4/lib-dynload/imageop.so /usr/lib/python2.4/lib-dynload/rgbimg.so "
+FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
 PR_python-resource="ml2"
 RDEPENDS_python-resource="python-core"
-FILES_python-resource="/usr/lib/python2.4/lib-dynload/resource.so "
+FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so "
 
 DESCRIPTION_python-math="Python Math Support"
 PR_python-math="ml2"
 RDEPENDS_python-math="python-core"
-FILES_python-math="/usr/lib/python2.4/lib-dynload/cmath.so /usr/lib/python2.4/lib-dynload/math.so /usr/lib/python2.4/lib-dynload/_random.so /usr/lib/python2.4/random.* "
+FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* "
 
 DESCRIPTION_python-hotshot="Python Hotshot Profiler"
 PR_python-hotshot="ml2"
 RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="/usr/lib/python2.4/hotshot /usr/lib/python2.4/lib-dynload/_hotshot.so "
+FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so "
 
 DESCRIPTION_python-unixadmin="Python Unix Administration Support"
 PR_python-unixadmin="ml2"
 RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="/usr/lib/python2.4/lib-dynload/nis.so /usr/lib/python2.4/lib-dynload/grp.so /usr/lib/python2.4/lib-dynload/pwd.so /usr/lib/python2.4/getpass.* "
+FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* "
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
 PR_python-gdbm="ml2"
 RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="/usr/lib/python2.4/lib-dynload/gdbm.so "
+FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
 PR_python-fcntl="ml2"
 RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="/usr/lib/python2.4/lib-dynload/fcntl.so "
+FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml2"
 RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="/usr/lib/python2.4/base64.* /usr/lib/python2.4/ftplib.* /usr/lib/python2.4/gopherlib.* /usr/lib/python2.4/hmac.* /usr/lib/python2.4/httplib.* /usr/lib/python2.4/mimetypes.* /usr/lib/python2.4/nntplib.* /usr/lib/python2.4/poplib.* /usr/lib/python2.4/smtplib.* /usr/lib/python2.4/telnetlib.* /usr/lib/python2.4/urllib.* /usr/lib/python2.4/urllib2.* /usr/lib/python2.4/urlparse.* "
+FILES_python-netclient="${libdir}/python2.4/base64.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml2"
 RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="/usr/lib/python2.4/pprint.* "
+FILES_python-pprint="${libdir}/python2.4/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
 PR_python-netserver="ml2"
 RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="/usr/lib/python2.4/cgi.* /usr/lib/python2.4/BaseHTTPServer.* /usr/lib/python2.4/SimpleHTTPServer.* /usr/lib/python2.4/SocketServer.* "
+FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 PR_python-compiler="ml2"
 RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="/usr/lib/python2.4/compiler "
+FILES_python-compiler="${libdir}/python2.4/compiler "
 
 DESCRIPTION_python-syslog="Python's syslog Interface"
 PR_python-syslog="ml2"
 RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="/usr/lib/python2.4/lib-dynload/syslog.so "
+FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so "
 
 DESCRIPTION_python-html="Python HTML Processing"
 PR_python-html="ml2"
 RDEPENDS_python-html="python-core"
-FILES_python-html="/usr/lib/python2.4/formatter.* /usr/lib/python2.4/htmlentitydefs.* /usr/lib/python2.4/htmllib.* /usr/lib/python2.4/markupbase.* /usr/lib/python2.4/sgmllib.* "
+FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* "
 
 DESCRIPTION_python-readline="Python Readline Support"
 PR_python-readline="ml2"
 RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="/usr/lib/python2.4/lib-dynload/readline.so /usr/lib/python2.4/rlcompleter.* "
+FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml2"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
+FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.4/pydoc.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
 PR_python-xml="ml2"
 RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="/usr/lib/python2.4/lib-dynload/pyexpat.so /usr/lib/python2.4/xml /usr/lib/python2.4/xmllib.* "
+FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
 PR_python-mime="ml2"
 RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="/usr/lib/python2.4/mimetools.* /usr/lib/python2.4/rfc822.* "
+FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/rfc822.* "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml2"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
-FILES_python-unittest="/usr/lib/python2.4/unittest.* "
+FILES_python-unittest="${libdir}/python2.4/unittest.* "
 
 DESCRIPTION_python-stringold="Python Deprecated String APIs"
 PR_python-stringold="ml2"
 RDEPENDS_python-stringold="python-core"
-FILES_python-stringold="/usr/lib/python2.4/lib-dynload/strop.so /usr/lib/python2.4/string.* "
+FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* "
 
 DESCRIPTION_python-compile="Python Bytecode Compilation Support"
 PR_python-compile="ml2"
 RDEPENDS_python-compile="python-core"
-FILES_python-compile="/usr/lib/python2.4/py_compile.* /usr/lib/python2.4/compileall.* "
+FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
 PR_python-shell="ml2"
 RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="/usr/lib/python2.4/commands.* /usr/lib/python2.4/dircache.* /usr/lib/python2.4/fnmatch.* /usr/lib/python2.4/glob.* /usr/lib/python2.4/popen2.* /usr/lib/python2.4/shutil.* "
+FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml2"
 RDEPENDS_python-mmap="python-core python-io"
-FILES_python-mmap="/usr/lib/python2.4/lib-dynload/mmap.so "
+FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
 PR_python-zlib="ml3"
 RDEPENDS_python-zlib="python-core libz1"
-FILES_python-zlib="/usr/lib/python2.4/lib-dynload/zlib.so "
+FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
 PR_python-db="ml2"
 RDEPENDS_python-db="python-core"
-FILES_python-db="/usr/lib/python2.4/anydbm.* /usr/lib/python2.4/dumbdbm.* /usr/lib/python2.4/whichdb.* "
+FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
 PR_python-crypt="ml2"
 RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="/usr/lib/python2.4/lib-dynload/crypt.so /usr/lib/python2.4/lib-dynload/md5.so /usr/lib/python2.4/lib-dynload/rotor.so /usr/lib/python2.4/lib-dynload/sha.so "
+FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
 PR_python-lang="ml2"
 RDEPENDS_python-lang="python-core"
-FILES_python-lang="/usr/lib/python2.4/lib-dynload/array.so /usr/lib/python2.4/lib-dynload/parser.so /usr/lib/python2.4/lib-dynload/operator.so /usr/lib/python2.4/lib-dynload/_weakref.so /usr/lib/python2.4/atexit.* /usr/lib/python2.4/code.* /usr/lib/python2.4/codeop.* /usr/lib/python2.4/dis.* /usr/lib/python2.4/inspect.* /usr/lib/python2.4/keyword.* /usr/lib/python2.4/opcode.* /usr/lib/python2.4/repr.* /usr/lib/python2.4/token.* /usr/lib/python2.4/tokenize.* /usr/lib/python2.4/traceback.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/weakref.* "
+FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
 
 DESCRIPTION_python-audio="Python Audio Handling"
 PR_python-audio="ml2"
 RDEPENDS_python-audio="python-core"
-FILES_python-audio="/usr/lib/python2.4/wave.* /usr/lib/python2.4/chunk.* /usr/lib/python2.4/lib-dynload/ossaudiodev.so /usr/lib/python2.4/lib-dynload/audioop.so "
+FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so "
 
 
 
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index 7b3c8ab28f..c39661bd28 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -61,4 +61,4 @@ do_install() {
     done
 }
 
-FILES_${PN} = "/usr/lib/${PYTHON_DIR}/site-packages"
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/qpe-gaim/qpe-gaim_20041030.bb b/packages/qpe-gaim/qpe-gaim_20041030.bb
index e69de29bb2..1af1fca802 100644
--- a/packages/qpe-gaim/qpe-gaim_20041030.bb
+++ b/packages/qpe-gaim/qpe-gaim_20041030.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "A multi protocol instant messager application, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "qpe-libgaim glib-2.0"
+RDEPENDS = "libgaim-plugins glibc-gconv-iso8859-1"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpe-gaim.sourceforge.net/"
+APPNAME = "gaim"
+APPTYPE = "binary"
+LICENSE = "GPL"
+APPDESKTOP = "${S}"
+PV = "0.4+cvs-20041030"
+PR = "r1"
+
+SRC_URI = "http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2 \
+           file://libopie2.patch;patch=1"
+S = "${WORKDIR}/qpe-gaim"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST +="INCLUDEPATH-=${includedir}/glib-2.0 \
+			INCLUDEPATH-=${libdir}/glib-2.0/include \
+			INCLUDEPATH+=${STAGING_INCDIR}/glib-2.0 \
+			LIBS-=-lopie LIBS+=-lopiecore2 LIBS+=-lopieui2"
+
+do_configure_prepend() {
+	ln -s ../libgaim/src libgaim
+}
+
+do_install() {
+	for dir in 16x16 32x32 protocols status
+	do
+		install -d ${D}${palmtopdir}/pics/gaim/${dir}
+		install -m 0644 data/images/${dir}/*.png ${D}${palmtopdir}/pics/gaim/${dir}/
+	done
+	install -m 0644 gaim.png ${D}${palmtopdir}/pics/
+}
diff --git a/packages/qpe-gaim/qpe-libgaim_20041030.bb b/packages/qpe-gaim/qpe-libgaim_20041030.bb
index e69de29bb2..c9a168fb79 100644
--- a/packages/qpe-gaim/qpe-libgaim_20041030.bb
+++ b/packages/qpe-gaim/qpe-libgaim_20041030.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "A multi protocol instant messager library, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "openssl glib-2.0"
+RDEPENDS = "libgaim-plugins"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpe-gaim.sourceforge.net/"
+PV = "0.4+cvs-20041030"
+PR = "r3"
+
+SRC_URI = "http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2 \
+           file://fix-compilation.patch;patch=1 \
+           file://dont-look-for-gtk.patch;patch=1"
+S = "${WORKDIR}/libgaim"
+
+inherit autotools
+
+EXTRA_OE_CONF = "--disable-audio --disable-gtkspell --disable-perl \
+                 --with-dynamic-prpls=gg,irc,jabber,msn,napster,oscar,yahoo \
+		 --disable-screensaver --disable-sm --disable-glibtest \
+		 --disable-gtktest --disable-startup-notification \
+		 --disable-gevolution --disable-aotest --disable-audiofiletest"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0"
+
+do_configure_prepend() {
+	ln -s src libgaim
+	touch intl/Makefile.in
+	touch po/Makefile.in.in
+	install -d build-root
+	touch build-root/mkipk.sh.in.in
+}
+
+do_stage() {
+	oe_libinstall -so -C src libgaim ${QTDIR}/lib
+}
+
+#FIXME: use do_packages to create individual packages for each of the plugins
+python populate_packages_prepend () {
+	plugindir = bb.data.expand('${libdir}/gaim', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'libgaim-protocol-%s', 'GAIM plugin for %s protocol', extra_depends='' )
+}
+
+PACKAGES += "libgaim-plugins"
+FILES_libgaim-plugins = "${libdir}/gaim/autorecon.so ${libdir}/gaim/s*.so"
+
diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb
index 5b72c26e30..1e81edf8f6 100644
--- a/packages/qte/qte_4.0.0-snapshot.bb
+++ b/packages/qte/qte_4.0.0-snapshot.bb
@@ -207,7 +207,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES_${PN} = ""
 FILES_libqte4-debug	= "${palmtopdir}/lib/libQt*_debug.*"
-FILES_libqte4-core	= "${palmtopdir}/lib/libQtCore.* /usr/sbin/update-qtfontdir"
+FILES_libqte4-core	= "${palmtopdir}/lib/libQtCore.* ${sbindir}/update-qtfontdir"
 FILES_libqte4-gui	= "${palmtopdir}/lib/libQtGui.*"
 FILES_libqte4-network	= "${palmtopdir}/lib/libQtNetwork.*"
 FILES_libqte4-sql	= "${palmtopdir}/lib/libQtSql.*"
diff --git a/packages/resolvconf/resolvconf_1.22.bb b/packages/resolvconf/resolvconf_1.22.bb
index e69de29bb2..f94635beb6 100644
--- a/packages/resolvconf/resolvconf_1.22.bb
+++ b/packages/resolvconf/resolvconf_1.22.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \
+information about currently available nameservers. It sets \
+itself up as the intermediary between programs that supply \
+nameserver information and programs that need nameserver \
+information."
+SECTION = "console/network"
+LICENSE = "GPL"
+AUTHOR = "Thomas Hood"
+HOMEPAGE = "http://packages.debian.org/resolvconf"
+DEPENDS = "bash"
+RDEPENDS = "bash"
+PR = "r1"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
+
+do_compile () {
+	:
+}
+
+do_install () {
+	install -d ${D}/${sysconfdir} ${D}/${sbindir} ${D}/${base_sbindir} ${D}/${localstatedir}/run/resolvconf/interface
+	install -d ${D}/${mandir}/man8 ${D}/${docdir}/${P}
+	cp -a etc/* ${D}/${sysconfdir}/
+	install -m 0755 bin/resolvconf ${D}/${base_sbindir}/
+	install -m 0644 README ${D}/${docdir}/${P}/
+	install -m 0644 man/resolvconf.8 ${D}/${mandir}/man8/
+}
diff --git a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
index e69de29bb2..7a460decda 100644
--- a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
+++ b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
@@ -0,0 +1,21 @@
+# rpm2cpio-native build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DEPENDS="perl-native"
+LICENSE="BSD"
+SRC_URI="http://ftp.rutgers.edu/pub/FreeBSD/ports/packages/archivers/rpm2cpio-1.2_2.tgz"
+
+inherit native
+
+S="${WORKDIR}"
+
+do_compile() {
+}
+
+do_stage() {
+	install -d ${STAGING_BINDIR}
+	sed -e '1,1s|${bindir}/|${bindir}/env |' bin/rpm2cpio.pl \
+		> ${STAGING_BINDIR}/rpm2cpio.pl
+	chmod 0755 ${STAGING_BINDIR}/rpm2cpio.pl 
+}
diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb
index e69de29bb2..1a148c81ae 100644
--- a/packages/rrdtool/rrdtool_1.0.49.bb
+++ b/packages/rrdtool/rrdtool_1.0.49.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average)."
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool"
+LICENSE = "GPLv2"
+DEPENDS = "libpng zlib"
+SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-${PV}.tar.gz \
+	file://perl-make-options.diff;patch=1;pnum=0"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''"
+
+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/
+}
+
+FILES_${PN} += "${libdir}/perl"
+
+DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
\ No newline at end of file
diff --git a/packages/sablevm/sablevm_1.1.9.bb b/packages/sablevm/sablevm_1.1.9.bb
index e69de29bb2..2448d5231f 100644
--- a/packages/sablevm/sablevm_1.1.9.bb
+++ b/packages/sablevm/sablevm_1.1.9.bb
@@ -0,0 +1,42 @@
+SECTION = "console/utils"
+DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virtual machine specification, second edition."
+HOMEPAGE = "http://sablevm.org"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+DEPENDS = "libffi libtool popt \
+           sablevm-classpath"
+#          unzip"
+RRECOMMENDS = "sablevm-classpath (${PV})"
+
+SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz"
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "--enable-real-life-brokenness \
+                --disable-errors-on-warnings --disable-signals-for-exceptions"
+
+PROVIDES = "virtual/java"
+ALTERNATIVE_NAME = "java"
+ALTERNATIVE_PATH = "${bindir}/java-sablevm"
+ALTERNATIVE_PRIORITY = "350"
+
+PACKAGES = "${PN} ${PN}-doc lib${PN} lib${PN}-dev"
+
+FILES_${PN} = "${bindir} \
+	       ${libdir}/${PN}/bin"
+
+FILES_lib${PN} = "${libdir}/lib${PN}-*.so"
+
+FILES_lib${PN}-dev = "${includedir}/jni* \
+	              ${libdir}/lib${PN}.so \
+		      ${libdir}/lib${PN}.la"
+
+do_install_append() {
+	install -d ${D}/${docdir}
+	mv ${D}/${datadir}/${PN} ${D}/${docdir}/
+
+	# symlink only present in the deb...
+	install -d ${D}/${libdir}/${PN}/bin
+	cd ${D}/${libdir}/${PN}/bin && ln -sf ../../../bin/java-sablevm java
+}
diff --git a/packages/setmixer/setmixer_27DEC94.bb b/packages/setmixer/setmixer_27DEC94.bb
index e69de29bb2..ce4a81f18d 100644
--- a/packages/setmixer/setmixer_27DEC94.bb
+++ b/packages/setmixer/setmixer_27DEC94.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A text mode OSS soundmixer"
+LICENSE = "GPL"
+SECTION = "console/utils"
+PRIORITY = "optional"
+MAINTAINER = "Holger Schurig <no@spam.de>"
+SRC_URI = "${DEBIAN_MIRROR}/main/s/setmixer/setmixer_${PV}.orig.tar.gz \
+	   file://setmixer.patch;patch=1"
+SRC_URI_append_ramses = " file://devfs.patch;patch=1"
+
+S = "${WORKDIR}/${PN}-${PV}.orig"
+
+
+do_install() {
+	mkdir -p ${D}${sbindir}
+	install -m 755 setmixer ${D}${sbindir}
+}
diff --git a/packages/setserial/setserial_2.17.bb b/packages/setserial/setserial_2.17.bb
index 69ad031376..6d3e0e7064 100644
--- a/packages/setserial/setserial_2.17.bb
+++ b/packages/setserial/setserial_2.17.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 inherit autotools
 
 do_install() {
-	install -d ${D}/bin
+	install -d ${D}/${base_bindir}
 	install -d ${D}/usr/man/man8
 	install -d ${D}${mandir}
 	autotools_do_install
diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index e69de29bb2..56a9d1417b 100644
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Driver for the Ati W100 found on the Sharp Zaurus C[87]x0"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "CLOSED"
+PR = "r0"
+
+SRC_URI = "http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2"
+S = "${WORKDIR}/AtiCore-1.0.1"
+
+#FILES_${PN}="${libdir}/*.so* ${bindir}/*"
+	  
+EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}'"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 testcore ${D}/${bindir}/testcore
+	install -m 0755 atitest ${D}/${bindir}/atitest
+	
+	install -d ${D}/${libdir}
+	install -m 0755 libaticore.so ${D}/${libdir}/libaticore.so
+	
+	install -d ${D}/${includedir}
+	install -m 0644 aticore.h ${D}/${includedir}/aticore.h
+
+	cd ${D}/${libdir}/
+	ln -s libaticore.so libaticore.so.1
+	ln -s libaticore.so libaticore.so.1.0
+	ln -s libaticore.so libaticore.so.1.0.1
+}
+
+do_stage() {
+	install -m 0644 aticore.h ${STAGING_INCDIR}
+	oe_libinstall -so libaticore ${STAGING_LIBDIR}
+}	
+
diff --git a/packages/sharp-binary-only/sharp-aticore.bb b/packages/sharp-binary-only/sharp-aticore.bb
index e69de29bb2..e89418cc63 100644
--- a/packages/sharp-binary-only/sharp-aticore.bb
+++ b/packages/sharp-binary-only/sharp-aticore.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Driver for the Ati W100 found on the Sharp Zaurus C[87]x0"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "CLOSED"
+PR = "r0"
+
+SRC_URI = "http://www.mithis.com/zaurus/AtiCore.${TARGET_FPU}.tar.bz2"
+S = "${WORKDIR}/AtiCore"
+
+FILES_${PN}="${libdir}/*.so* ${bindir}/*"
+	  
+# And include it in the dev package
+FILES_${PN}-dev += " ${includedir}"
+
+do_make() {
+	make
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 testcore ${D}/${bindir}/testcore
+	install -m 0755 atitest ${D}/${bindir}/atitest
+	
+	install -d ${D}/${libdir}
+	install -m 0755 libaticore.so ${D}/${libdir}/libaticore.so
+	
+	install -d ${D}/${includedir}
+	install -m 0644 aticore.h ${D}/${includedir}/aticore.h
+
+	cd ${D}/${libdir}/
+	ln -s libaticore.so libaticore.so.1
+	ln -s libaticore.so libaticore.so.1.0
+}
+
+do_stage() {
+	install -m 0644 aticore.h ${STAGING_INCDIR}
+	oe_libinstall -so libaticore ${STAGING_LIBDIR}
+}	
+
diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
index 26b010ca61..ef022439cd 100644
--- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -15,12 +15,12 @@ S = "${WORKDIR}"
 inherit module-base
 
 do_install() {
-	install -d ${D}/etc/pcmcia/cis
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/pcmcia
-	install -m 0644 ${WORKDIR}/CE-AG06.dat ${D}/etc/pcmcia/cis/
-	install -m 0644 ${WORKDIR}/sharpzdc.conf ${D}/etc/pcmcia/
-	install -m 0755 ${WORKDIR}/sharpzdc ${D}/etc/pcmcia/
-	install -m 0644 ${MACHINE}/sharpzdc_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+	install -d ${D}/${sysconfdir}/pcmcia/cis
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia
+	install -m 0644 ${WORKDIR}/CE-AG06.dat ${D}/${sysconfdir}/pcmcia/cis/
+	install -m 0644 ${WORKDIR}/sharpzdc.conf ${D}/${sysconfdir}/pcmcia/
+	install -m 0755 ${WORKDIR}/sharpzdc ${D}/${sysconfdir}/pcmcia/
+	install -m 0644 ${MACHINE}/sharpzdc_cs.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
 }
 
 FILES_${PN} = "/"
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index 7b9492faf7..c029795e02 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -18,12 +18,12 @@ INITSCRIPT_NAME = "sd"
 INITSCRIPT_PARAMS = "start 39 S . stop 96 0 1 6 ."
 
 do_install() {
-	install -d ${D}/etc/init.d ${D}/sbin
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/
-	install -m 0755 ${WORKDIR}/sdmgr ${D}/sbin/
+	install -d ${D}/${sysconfdir}/init.d ${D}/${base_sbindir}
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
+	install -m 0755 ${WORKDIR}/sdmgr ${D}/${base_sbindir}/
 	install -m 0755 ${WORKDIR}/sdcontrol ${D}/${sysconfdir}
-	install -m 0755 ${WORKDIR}/sd ${D}/etc/init.d/
-	install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/
+	install -m 0755 ${WORKDIR}/sd ${D}/${sysconfdir}/init.d/
+	install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
 }
 
 FILES_${PN} = "/"
diff --git a/packages/shfs/shfs-modules_0.35.bb b/packages/shfs/shfs-modules_0.35.bb
index e69de29bb2..88fc7edd50 100644
--- a/packages/shfs/shfs-modules_0.35.bb
+++ b/packages/shfs/shfs-modules_0.35.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows you to mount remote filesystems using plain shell (ssh/rsh) connection. \
+It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/shfs/shfs-${PV}.tar.gz"
+S = "${WORKDIR}/shfs-${PV}/shfs/Linux-2.4"
+
+#FIXME depend S on kernel version
+
+inherit module
+
+do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake KERNEL_SOURCES=${STAGING_KERNEL_DIR} KERNEL=${KERNEL_VERSION} \
+                   CC="${KERNEL_CC}" LD="${KERNEL_LD}" LINKER="${KERNEL_LD}" LDFLAGS=-r
+}
+
+do_stage() {
+	install -m 0644 shfs_fs.h shfs.h ${STAGING_INCDIR}/
+}
+
+do_install() {
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/shfs/
+	install -m 0644 shfs.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/shfs/shfs.o
+}
diff --git a/packages/snes232/snes232_cvs.bb b/packages/snes232/snes232_cvs.bb
index 3c6a0563f4..d563a760a7 100644
--- a/packages/snes232/snes232_cvs.bb
+++ b/packages/snes232/snes232_cvs.bb
@@ -18,6 +18,6 @@ do_configure() {
 }
 
 do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/snes232
-	install snes232.ko ${D}/lib/modules/${KERNEL_VERSION}/snes232/
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/snes232
+	install snes232.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/snes232/
 }
diff --git a/packages/softfan/softfan_0.10.bb b/packages/softfan/softfan_0.10.bb
index 34f00f01c9..aab8d4a28b 100644
--- a/packages/softfan/softfan_0.10.bb
+++ b/packages/softfan/softfan_0.10.bb
@@ -12,6 +12,6 @@ do_compile() {
 }
 
 do_install() {
-         install -d ${D}/sbin
-         install -m 0755 softfan ${D}/sbin/softfan
+         install -d ${D}/${base_sbindir}
+         install -m 0755 softfan ${D}/${base_sbindir}/softfan
 }
diff --git a/packages/sqlite/sqlite3_3.0.8.bb b/packages/sqlite/sqlite3_3.0.8.bb
index a50472130d..cce0c4da8c 100644
--- a/packages/sqlite/sqlite3_3.0.8.bb
+++ b/packages/sqlite/sqlite3_3.0.8.bb
@@ -37,5 +37,5 @@ FILES_sqlite3 = "${bindir}/*"
 FILES_libsqlite = "${libdir}/*.so.*"
 FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
 		       ${libdir}/pkgconfig ${includedir}"
-FILES_libsqlite-doc = "${datadir}/doc ${mandir} ${infodir}"
+FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}"
 AUTO_LIBNAME_PKGS = "libsqlite"
diff --git a/packages/stat/stat_3.3.bb b/packages/stat/stat_3.3.bb
index e69de29bb2..073aacd458 100644
--- a/packages/stat/stat_3.3.bb
+++ b/packages/stat/stat_3.3.bb
@@ -0,0 +1,16 @@
+SECTION = "console/utils"
+DESCRIPTION = "Display all information about a file that the stat() call provides and all information a filesystem that statfs() provides."
+LICENSE = "GPL"
+MAINTAINER = "Holger Schurig <hs4388@mn-solutions.de>"
+
+SRC_URI = "ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz"
+
+do_stage() {
+	true
+}
+
+do_install() {
+	install -d ${D}${bindir} ${D}${mandir}/man1
+	install -s -m 755 stat ${D}${bindir}
+	install -m 644 stat.1 ${D}${mandir}/man1
+}
diff --git a/packages/sysfsutils/sysfsutils_1.2.0.bb b/packages/sysfsutils/sysfsutils_1.2.0.bb
index e69de29bb2..50114fabec 100644
--- a/packages/sysfsutils/sysfsutils_1.2.0.bb
+++ b/packages/sysfsutils/sysfsutils_1.2.0.bb
@@ -0,0 +1,20 @@
+SECTION = "base"
+DESCRIPTION = "System Utilities Based on Sysfs"
+HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
+SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
+S = "${WORKDIR}/sysfsutils-${PV}"
+LICENSE = "GPLv2"
+
+inherit autotools
+
+includedir += "/sysfs"
+
+PACKAGES_prepend = "libsysfs "
+FILES_libsysfs = "${libdir}/*.so.1.0.2"
+
+do_stage () {
+	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/sysfs
+	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
+	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
+}
diff --git a/packages/sysvinit/sysvinit_2.85.bb b/packages/sysvinit/sysvinit_2.85.bb
index 595db36488..8bbd4cd5ee 100644
--- a/packages/sysvinit/sysvinit_2.85.bb
+++ b/packages/sysvinit/sysvinit_2.85.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "System-V like init.\
  your system. All processes are descended from init. For more information,\
  see the manual page init(8)."
 PACKAGES = "sysvinit"
-FILES_${PN} = "/sbin ${bindir} ${sysconfdir}"
+FILES_${PN} = "${base_sbindir} ${bindir} ${sysconfdir}"
 FILES_sysv-rc = "${sbindir}"
 PR = "r1"
 LICENSE = "GPL"
@@ -31,26 +31,26 @@ export LCRYPT = "-lcrypt"
 
 do_install () {
 	install -d ${D}/${bindir} ${D}/${sbindir} \
-		   ${D}/sbin ${D}/${sysconfdir}/default \
+		   ${D}/${base_sbindir} ${D}/${sysconfdir}/default \
 		   ${D}/${sysconfdir}/init.d
 	install -m 755 halt killall5 \
-		runlevel shutdown ${D}/sbin/
-	install -m 755 init ${D}/sbin/sysvinit
+		runlevel shutdown ${D}/${base_sbindir}/
+	install -m 755 init ${D}/${base_sbindir}/sysvinit
 	install -m 755 mesg last ${D}${bindir}
-	install -m 0755 ${WORKDIR}/need		${D}/sbin/need.sysvinit
-	install -m 0755 ${WORKDIR}/provide		${D}/sbin/provide.sysvinit
-	ln -sf halt ${D}/sbin/reboot
-	ln -sf halt ${D}/sbin/poweroff
-	ln -sf init ${D}/sbin/telinit
-	ln -sf killall5 ${D}/sbin/pidof
+	install -m 0755 ${WORKDIR}/need		${D}/${base_sbindir}/need.sysvinit
+	install -m 0755 ${WORKDIR}/provide		${D}/${base_sbindir}/provide.sysvinit
+	ln -sf halt ${D}/${base_sbindir}/reboot
+	ln -sf halt ${D}/${base_sbindir}/poweroff
+	ln -sf init ${D}/${base_sbindir}/telinit
+	ln -sf killall5 ${D}/${base_sbindir}/pidof
 	ln -sf last ${D}${bindir}/lastb
 	install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then
-		echo "S:2345:respawn:/sbin/getty ${SERIAL_CONSOLE}" >> ${D}/etc/inittab
+		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}/${sysconfdir}/inittab
 	fi
 	if [ "${USE_VT}" == "1" ]; then
-		cat <<EOF >>${D}/etc/inittab
-# /sbin/getty invocations for the runlevels.
+		cat <<EOF >>${D}/${sysconfdir}/inittab
+# ${base_sbindir}/getty invocations for the runlevels.
 #
 # The "id" field MUST be the same as the last
 # characters of the device (after "tty").
@@ -58,26 +58,26 @@ do_install () {
 # Format:
 #  <id>:<runlevels>:<action>:<process>
 #
-1:2345:respawn:/sbin/getty 38400 tty1
-# 2:23:respawn:/sbin/getty 38400 tty2
-# 3:23:respawn:/sbin/getty 38400 tty3
-# 4:23:respawn:/sbin/getty 38400 tty4
+1:2345:respawn:${base_sbindir}/getty 38400 tty1
+# 2:23:respawn:${base_sbindir}/getty 38400 tty2
+# 3:23:respawn:${base_sbindir}/getty 38400 tty3
+# 4:23:respawn:${base_sbindir}/getty 38400 tty4
 EOF
 	fi
-	install -m 0644    ${WORKDIR}/rcS-default	${D}/etc/default/rcS
-	install -m 0755    ${WORKDIR}/rc		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/rcS		${D}/etc/init.d
+	install -m 0644    ${WORKDIR}/rcS-default	${D}/${sysconfdir}/default/rcS
+	install -m 0755    ${WORKDIR}/rc		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rcS		${D}/${sysconfdir}/init.d
 }
 
 
 do_install_append_ramses () {
-	cat <<EOF >>${D}/etc/inittab
+	cat <<EOF >>${D}/${sysconfdir}/inittab
 # Bluetooth
-#1:2345:respawn:/sbin/getty -L 115200 tts/1
+#1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1
 # External serial port
-4:2345:respawn:/sbin/getty -L 115200 tts/4
+4:2345:respawn:${base_sbindir}/getty -L 115200 tts/4
 # Framebuffer
-v1:2345:respawn:/sbin/getty -L 115200 vc/1
+v1:2345:respawn:${base_sbindir}/getty -L 115200 vc/1
 EOF
 }
 
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 36b7812f78..1d9d4d0af4 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -38,7 +38,7 @@ ALTERNATIVE_PATH = "/sbin/init.sysvinit"
 ALTERNATIVE_PRIORITY = "50"
 
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
-FILES_${PN} += "/sbin /bin"
+FILES_${PN} += "${base_sbindir} /bin"
 FILES_sysvinit-pidof = "/bin/pidof"
 FILES_sysvinit-sulogin = "/sbin/sulogin"
 
@@ -59,11 +59,11 @@ do_install () {
 		   ${D}/${sysconfdir}/init.d
 	install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then
-		echo "S:2345:respawn:/sbin/getty ${SERIAL_CONSOLE}" >> ${D}/etc/inittab
+		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}/${sysconfdir}/inittab
 	fi
 	if [ "${USE_VT}" == "1" ]; then
-		cat <<EOF >>${D}/etc/inittab
-# /sbin/getty invocations for the runlevels.
+		cat <<EOF >>${D}/${sysconfdir}/inittab
+# ${base_sbindir}/getty invocations for the runlevels.
 #
 # The "id" field MUST be the same as the last
 # characters of the device (after "tty").
@@ -71,34 +71,34 @@ do_install () {
 # Format:
 #  <id>:<runlevels>:<action>:<process>
 #
-1:2345:respawn:/sbin/getty 38400 tty1
-# 2:23:respawn:/sbin/getty 38400 tty2
-# 3:23:respawn:/sbin/getty 38400 tty3
-# 4:23:respawn:/sbin/getty 38400 tty4
+1:2345:respawn:${base_sbindir}/getty 38400 tty1
+# 2:23:respawn:${base_sbindir}/getty 38400 tty2
+# 3:23:respawn:${base_sbindir}/getty 38400 tty3
+# 4:23:respawn:${base_sbindir}/getty 38400 tty4
 EOF
 	fi
-	install -m 0644    ${WORKDIR}/rcS-default	${D}/etc/default/rcS
-	install -m 0755    ${WORKDIR}/rc		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/rcS		${D}/etc/init.d
-	install -m 0755    ${WORKDIR}/bootlogd.init     ${D}/etc/init.d/bootlogd
-	ln -sf bootlogd ${D}/etc/init.d/stop-bootlogd
-	install -d ${D}/etc/rcS.d
-	ln -sf ../init.d/bootlogd ${D}/etc/rcS.d/S07bootlogd
+	install -m 0644    ${WORKDIR}/rcS-default	${D}/${sysconfdir}/default/rcS
+	install -m 0755    ${WORKDIR}/rc		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rcS		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/bootlogd.init     ${D}/${sysconfdir}/init.d/bootlogd
+	ln -sf bootlogd ${D}/${sysconfdir}/init.d/stop-bootlogd
+	install -d ${D}/${sysconfdir}/rcS.d
+	ln -sf ../init.d/bootlogd ${D}/${sysconfdir}/rcS.d/S07bootlogd
 	for level in 2 3 4 5; do
-		install -d ${D}/etc/rc$level.d
-		ln -s ../init.d/stop-bootlogd ${D}/etc/rc$level.d/S99stop-bootlogd
+		install -d ${D}/${sysconfdir}/rc$level.d
+		ln -s ../init.d/stop-bootlogd ${D}/${sysconfdir}/rc$level.d/S99stop-bootlogd
 	done
-	mv                 ${D}/sbin/init               ${D}/sbin/init.sysvinit
+	mv                 ${D}/${base_sbindir}/init               ${D}/${base_sbindir}/init.sysvinit
 }
 
 
 do_install_append_ramses () {
-	cat <<EOF >>${D}/etc/inittab
+	cat <<EOF >>${D}/${sysconfdir}/inittab
 # Bluetooth
-#1:2345:respawn:/sbin/getty -L 115200 tts/1
+#1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1
 # External serial port
-4:2345:respawn:/sbin/getty -L 115200 tts/4
+4:2345:respawn:${base_sbindir}/getty -L 115200 tts/4
 # Framebuffer
-v1:2345:respawn:/sbin/getty -L 115200 vc/1
+v1:2345:respawn:${base_sbindir}/getty -L 115200 vc/1
 EOF
 }
diff --git a/packages/timezones/timezones_cvs.bb b/packages/timezones/timezones_cvs.bb
index 58282a7d07..4b6a81491e 100644
--- a/packages/timezones/timezones_cvs.bb
+++ b/packages/timezones/timezones_cvs.bb
@@ -10,9 +10,9 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/root"
 S = "${WORKDIR}/root"
 
 do_install() {
-	install -d ${D}/usr/share/
-	cp -fa usr/share/zoneinfo ${D}/usr/share/
-	find ${D}/usr/share -name "CVS"|xargs rm -rf
+	install -d ${D}${datadir}/
+	cp -fa usr/share/zoneinfo ${D}${datadir}/
+	find ${D}${datadir} -name "CVS"|xargs rm -rf
 }
 
 python populate_packages_prepend() {
@@ -20,7 +20,7 @@ python populate_packages_prepend() {
         pkgpattern = "timezones-%s"
         pkgdescription = "Timezone for %s"
 
-        do_split_packages(d, root='/usr/share/zoneinfo/', file_regex=pkgregex, output_pattern=pkgpattern, 
+        do_split_packages(d, root='${datadir}/zoneinfo/', file_regex=pkgregex, output_pattern=pkgpattern, 
                           description=pkgdescription,allow_dirs=True )
 }
 
diff --git a/packages/tinylogin/tinylogin_1.4.bb b/packages/tinylogin/tinylogin_1.4.bb
index e69de29bb2..d028c9a8e6 100644
--- a/packages/tinylogin/tinylogin_1.4.bb
+++ b/packages/tinylogin/tinylogin_1.4.bb
@@ -0,0 +1,28 @@
+SECTION = "base"
+DESCRIPTION = "TinyLogin is a suite of tiny UNIX \
+utilities for handling logins, user authentication, \
+changing passwords, and otherwise maintaining users \
+and groups on an embedded system."
+HOMEPAGE = "http://tinylogin.busybox.net/"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
+	file://cvs-20040608.patch;patch=1;pnum=1 \
+	file://add-system.patch;patch=1;pnum=1 \
+	file://adduser-empty_pwd.patch;patch=1"
+
+EXTRA_OEMAKE = ""
+
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+}
+
+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`
+		ln -sf /bin/tinylogin ${D}/$i
+	done
+}
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index e69de29bb2..c32285d28a 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -0,0 +1,167 @@
+DESCRIPTION = "C library for embedded systems"
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+
+#
+# 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 not uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) == 'no']}"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils \
+	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+INHIBIT_DEFAULT_DEPS = "1"
+PARALLEL_MAKE = ""
+
+PACKAGES = "uclibc ldd uclibc-utils uclibc-gconv uclibc-dev uclibc-doc uclibc-thread-db"
+
+uclibc_baselibs = "/lib/libcrypt*.so* /lib/libdl*.so \
+		   /lib/libintl*.so* /lib/libm*.so \
+		   /lib/libnsl*.so* /lib/libpthread*.so \
+		   /lib/libresolv*.so* /lib/libutil*.so \
+		   /lib/libuClibc*.so* /lib/ld*.so* \
+		   /lib/libc*.so* /lib/libdl*.so* \
+		   /lib/libm*.so* /lib/libutil*.so* \
+		   /lib/libpthread*.so* /lib/librt*.so*"
+FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
+	       ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
+FILES_ldd = "${bindir}/ldd"
+FILES_uclibc-dev += "${libdir}/*.o"
+FILES_uclibc-utils = "${bindir} ${sbindir}"
+FILES_uclibc-gconv = "${libdir}/gconv"
+FILES_uclibc-thread-db = "/lib/libthread_db*"
+RPROVIDES_uclibc-dev += "libc-dev"
+
+#
+# This locale file gets copied into uClibc-${PV}/extra/locale/ prior to
+# build, it does not need to be unpacked, but we can't inhibit the unpacking
+# in the current build system.
+#
+UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz"
+UCLIBC_LOCALE_FILE_arm = "uClibc-locale-030818.arm.tgz"
+UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
+UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
+
+SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) == 'no']} \
+	   file://uClibc.config"
+
+UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
+UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
+
+EXTRA_OEMAKE = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true' 'LD=${LD}' \
+		'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
+configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/include",g; \
+		s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \
+		s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \
+		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
+		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
+		${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) != "no"]}'
+CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
+
+python () {
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		bb.data.setVar('configmangle_append', ' s,^HAS_FPU=y,# HAS_FPU is not set,;', d)
+}
+
+uclibcbuild_do_patch() {
+	ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
+	ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
+	
+	${@['cp %s/%s extra/locale' % (bb.data.getVar('DL_DIR', d, 1) or '', bb.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][bb.data.getVar('USE_NLS', d, 1) == 'no']}
+}
+
+python do_patch () {
+	bb.build.exec_func('base_do_patch', d)
+	bb.build.exec_func('uclibcbuild_do_patch', d)
+}
+
+do_configure() {
+	cp ${WORKDIR}/uClibc.config ${S}/.config
+
+	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
+	perl -i -p -e '${configmangle}' ${S}/.config
+
+	oe_runmake oldconfig
+}
+
+do_stage() {
+	# Install into the cross dir (this MUST be done first because we
+	# will install crt1.o in the install_dev stage and gcc needs it)
+	oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+		install_dev install_runtime
+
+	oe_runmake utils
+	oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+		install_utils
+
+	# We don't really need this
+	rm -f ${UCLIBC_PREFIX}/include/.cvsignore
+
+	# Fixup shared lib symlinks
+	( cd ${UCLIBC_PREFIX}/lib
+		for f in c crypt dl m nsl pthread resolv thread_db util; do
+			ln -sf lib${f}.so.? lib${f}.so
+		done
+	)
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+
+	# Install into the staging dir
+	oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		install_dev install_runtime install_utils
+
+	# We don't really need this
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore
+
+	# Fixup shared lib symlinks
+	( cd ${UCLIBC_STAGE_PREFIX}/lib
+		for f in c crypt dl m nsl pthread resolv thread_db util; do
+			ln -sf lib${f}.so.? lib${f}.so
+		done
+	)
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+}
+
+do_install() {
+	oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		install_dev install_runtime install_utils
+
+	# We don't really need this in ${includedir}
+	rm -f ${D}/${prefix}/include/.cvsignore
+
+	# 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
+}
+
diff --git a/packages/unionfs/unionfs-modules.inc b/packages/unionfs/unionfs-modules.inc
index 9083e4519c..327ac91e03 100644
--- a/packages/unionfs/unionfs-modules.inc
+++ b/packages/unionfs/unionfs-modules.inc
@@ -27,8 +27,8 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/fs
-	install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/kernel/fs/
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs
+	install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/
 
 	install -d ${D}/${mandir}/man4
 	install -m 0644 man/unionfs.4 ${D}/${mandir}/man4/
diff --git a/packages/unionfs/unionroot-utils_0.1.1.bb b/packages/unionfs/unionroot-utils_0.1.1.bb
index e69de29bb2..4af7cd7ef4 100644
--- a/packages/unionfs/unionroot-utils_0.1.1.bb
+++ b/packages/unionfs/unionroot-utils_0.1.1.bb
@@ -0,0 +1,41 @@
+LICENSE = "GPL"
+
+DESCRIPTION = "Tools for administering a system that utilises unionroot."
+DEPENDS = "ipkg-collateral unionroot busybox"
+RDEPENDS = "ipkg-collateral unionroot busybox"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+
+SRC_URI = "file://mount.unionroot \
+	   file://umount.unionroot"
+
+do_install () {
+	install -d ${D}/${base_bindir}
+	install -m 0755 ${WORKDIR}/mount.unionroot ${D}/${base_bindir}/
+	install -m 0755 ${WORKDIR}/umount.unionroot ${D}/${base_bindir}/
+}
+
+pkg_postinst () {
+	update-alternatives --install /bin/mount mount /bin/mount.unionroot 100
+	update-alternatives --install /bin/umount umount /bin/umount.unionroot 100
+
+	# Alter /etc/ipkg.conf
+	mv $D/${sysconfdir}/ipkg.conf $D/${sysconfdir}/ipkg.conf.old
+        awk 'BEGIN { print "# Altered by unionroot" }
+                   { if ( $3 == "/" )
+                     {
+                        print $1 " " $2 " /media/realroot"
+                     }
+                     else
+                     {
+                        print $0
+                     }
+                   }' $D/${sysconfdir}/ipkg.conf.old > $D/${sysconfdir}/ipkg.conf
+}
+
+pkg_prerm () {
+	update-alternatives --remove mount /bin/mount.unionroot
+	update-alternatives --remove umount /bin/umount.unionroot
+}
+
diff --git a/packages/unionfs/unionroot_0.1.1.bb b/packages/unionfs/unionroot_0.1.1.bb
index e69de29bb2..ba07cc1695 100644
--- a/packages/unionfs/unionroot_0.1.1.bb
+++ b/packages/unionfs/unionroot_0.1.1.bb
@@ -0,0 +1,38 @@
+LICENSE = "GPL"
+
+DESCRIPTION = "Provides an init script that changes the root file-system to unionfs."
+DEPENDS = "busybox base-files"
+RDEPENDS = "busybox base-files"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+
+SRC_URI = "file://init.unionroot"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "init"
+ALTERNATIVE_LINK = "/sbin/init"
+ALTERNATIVE_PATH = "/sbin/init.unionroot"
+ALTERNATIVE_PRIORITY = "100"
+
+do_install () {
+        install -d ${D}/${base_sbindir}
+        install -m 0755 ${WORKDIR}/init.unionroot ${D}/${base_sbindir}/
+}
+
+pkg_postinst () {
+	# Alter /etc/fstab
+	mv $D/${sysconfdir}/fstab $D/${sysconfdir}/fstab.old
+	awk 'BEGIN { print "# Altered by unionroot" }
+		   { if ( $2 == "/" )
+		     {
+		     	print $1 "\t/media/realroot\t" $3 "\t" $4 "\t" $5 "\t" $6
+		     }
+		     else
+		     {
+		     	print $0
+		     }
+		   }' $D/${sysconfdir}/fstab.old > $D/${sysconfdir}/fstab
+}
+
diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
index 7ed31ef547..7442fedb4f 100644
--- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
@@ -14,8 +14,8 @@ do_install () {
         done 
 
 	# fontconfig ships this too.  not sure what to do about it.
-        #install -d ${D}/etc/fonts 
-        #install -m 644 local.conf ${D}/etc/fonts/local.conf 
+        #install -d ${D}/${sysconfdir}/fonts 
+        #install -m 644 local.conf ${D}/${sysconfdir}/fonts/local.conf 
 
 
         install -d ${D}${prefix}/share/doc/${PN}/ 
@@ -30,4 +30,4 @@ fc-cache
 }
 
 
-FILES_${PN} = "/etc /usr/share/fonts"
+FILES_${PN} = "/etc ${datadir}/fonts"
diff --git a/packages/vsftpd/vsftpd_2.0.1.bb b/packages/vsftpd/vsftpd_2.0.1.bb
index dab99a8421..ec25f5ea75 100644
--- a/packages/vsftpd/vsftpd_2.0.1.bb
+++ b/packages/vsftpd/vsftpd_2.0.1.bb
@@ -12,9 +12,9 @@ do_compile() {
 }
 
 do_install() {
-        install -d ${D}/usr/sbin
-	install -d ${D}/usr/share/man/man8
-	install -d ${D}/usr/share/man/man5
+        install -d ${D}${sbindir}
+	install -d ${D}${mandir}/man8
+	install -d ${D}${mandir}/man5
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}/${sysconfdir}
 	install -m 0755 ${S}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf
diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb
index e69de29bb2..5ef5bfff97 100644
--- a/packages/wireless-tools/wireless-tools_26.bb
+++ b/packages/wireless-tools/wireless-tools_26.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
+HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = "virtual/kernel"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r6"
+
+SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
+	   file://man.patch;patch=1 \
+	   file://wireless-tools.if-pre-up"
+S = "${WORKDIR}/wireless_tools.${PV}"
+
+inherit module-base
+
+do_configure() {
+	rm -f wireless.h
+}
+
+do_compile() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y
+}
+
+do_install() {
+	oe_runmake PREFIX=${D} install
+	install -d ${D}/${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wireless-tools
+}
+
+FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+               ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+               /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
+	       /etc/network"
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
index 7142a3de56..b3caa5040f 100644
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ b/packages/wireless-tools/wireless-tools_27.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/wireless_tools.${PV}"
 
 CFLAGS =+ "-I${S}"
 EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}/sbin' \
+		'INSTALL_DIR=${D}/${base_sbindir}' \
 		'INSTALL_LIB=${D}/${libdir}' \
 		'INSTALL_INC=${D}/${includedir}' \
 		'INSTALL_MAN=${D}/${mandir}'"
@@ -32,13 +32,13 @@ do_stage () {
 
 do_install() {
 	oe_runmake PREFIX=${D} install install-static
-	install -d ${D}/etc/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/etc/network/if-pre-up.d/wireless-tools
+	install -d ${D}/${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wireless-tools
 }
 
 PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
 FILES_libiw = "${libdir}/*.so.*"
 FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
 FILES_libiw-doc = "${mandir}/man7"
-FILES_${PN} = "${bindir} ${sbindir} /sbin /bin ${sysconfdir}/network"
+FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
 FILES_${PN}-doc = "${mandir}/man8"
diff --git a/packages/wlags-modules/wlags-modules_718.inc b/packages/wlags-modules/wlags-modules_718.inc
index cf749103dd..c2e2e8517b 100644
--- a/packages/wlags-modules/wlags-modules_718.inc
+++ b/packages/wlags-modules/wlags-modules_718.inc
@@ -57,12 +57,12 @@ do_compile() {
 
 
 do_install() {
-        install -d ${D}/etc/pcmcia
-        install -m 0644 ${WORKDIR}/wlags_h${COMPILE_HERMES}.conf ${D}/etc/pcmcia/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 ${WORKDIR}/wlags_h${COMPILE_HERMES}.conf ${D}/${sysconfdir}/pcmcia/
 
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/wireless
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/wireless
 	ls
-        install -m 0644 wlags49_h${COMPILE_HERMES}_cs${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/wireless
+        install -m 0644 wlags49_h${COMPILE_HERMES}_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/wireless
 }
 
 FILES = "/lib/modules/${KERNEL_VERSION}/net/wireless/*${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"        
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
index 3a9195f412..3ec6ff2d0d 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
@@ -55,22 +55,22 @@ do_compile() {
 
 do_install() {
 	oe_runmake install DESTDIR=${D} TARGET_MODDIR=
-	mkdir -p ${D}/etc/modutils/
-	mkdir -p ${D}/etc/hotplug/
-	mkdir -p ${D}/sbin/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}/etc/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}/etc/hotplug/wlan.agent
+	mkdir -p ${D}/${sysconfdir}/modutils/
+	mkdir -p ${D}/${sysconfdir}/hotplug/
+	mkdir -p ${D}/${base_sbindir}/
+	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}/${sysconfdir}/modutils/wlan-ng.conf
+	install -m 0755 ${WORKDIR}/wlan.agent ${D}/${sysconfdir}/hotplug/wlan.agent
 	install -d ${D}/${sysconfdir}/network/if-pre-up.d
 	install -m 0755 ${WORKDIR}/pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wlan-ng
 	install -d ${D}/${sysconfdir}/network/if-post-down.d
 	install -m 0755 ${WORKDIR}/post-down ${D}/${sysconfdir}/network/if-post-down.d/wlan-ng
 	install -d ${D}/${sysconfdir}/apm/resume.d
 	install -m 0755 ${WORKDIR}/resume ${D}/${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}/sbin/usbctl
+	install -m 0755 ${WORKDIR}/usbctl ${D}/${base_sbindir}/usbctl
 	install -d ${D}/${mandir}
 	mv ${D}/usr/local/man/* ${D}/${mandir}
 	rm -r ${D}/usr/local/man
-	rm -rf ${D}/etc/init.d
+	rm -rf ${D}/${sysconfdir}/init.d
 }
 
 PACKAGES_prepend = "wlan-ng-utils "
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
index b6bf4036ea..739e3e8d47 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
@@ -20,14 +20,14 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/usr/sbin
-	install -m755 wpa_supplicant ${D}/usr/sbin
-	install -m755 wpa_passphrase ${D}/usr/sbin
-	install -m755 wpa_cli        ${D}/usr/sbin
+	install -d ${D}${sbindir}
+	install -m755 wpa_supplicant ${D}${sbindir}
+	install -m755 wpa_passphrase ${D}${sbindir}
+	install -m755 wpa_cli        ${D}${sbindir}
 
-	install -d ${D}/etc
-	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/etc
+	install -d ${D}/${sysconfdir}
+	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/${sysconfdir}
 
-	install -d ${D}/usr/share/doc/wpa_supplicant
-	install -m644 README ${D}/usr/share/doc/wpa_supplicant
+	install -d ${D}${docdir}/wpa_supplicant
+	install -m644 README ${D}${docdir}/wpa_supplicant
 }
diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
index 17c4c6c064..06a3cc6dd5 100644
--- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
@@ -20,16 +20,16 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/usr/sbin
-	install -m755 wpa_supplicant ${D}/usr/sbin
-	install -m755 wpa_passphrase ${D}/usr/sbin
-	install -m755 wpa_cli        ${D}/usr/sbin
+	install -d ${D}${sbindir}
+	install -m755 wpa_supplicant ${D}${sbindir}
+	install -m755 wpa_passphrase ${D}${sbindir}
+	install -m755 wpa_cli        ${D}${sbindir}
 
-	install -d ${D}/etc
-	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/etc
+	install -d ${D}/${sysconfdir}
+	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/${sysconfdir}
 
-	install -d ${D}/usr/share/doc/wpa_supplicant
-	install -m644 README ${D}/usr/share/doc/wpa_supplicant
+	install -d ${D}${docdir}/wpa_supplicant
+	install -m644 README ${D}${docdir}/wpa_supplicant
 }
 
 
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb
index e69de29bb2..5a71703c2c 100644
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb
+++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb
@@ -0,0 +1,27 @@
+# xfce-mcs-manager OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="XFCE4 Settings manager."
+SECTION = "x11/wm"
+
+DEPENDS="libxfcegui4 libxfce4mcs"
+
+inherit xfce 
+
+FILES_${PN} += " ${datadir}/xfce4/doc/C"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xfce4
+	install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+	install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+}
+
+# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
+# the standard pkgconfig mangling was confusing us.  Mangling is not required
+# for this particular .pc, so the following will suffice:
+
+do_stage_append () {
+	install -d ${PKG_CONFIG_PATH}
+	install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc
+}
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb
index e69de29bb2..0ea48dd932 100644
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb
+++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb
@@ -0,0 +1,12 @@
+# xfce-mcs-plugins OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="Common XFCE4 configuration plugins."
+SECTION = "x11"
+
+PACKAGES="${PN}"
+FILES_${PN}="${libdir}/xfce4/mcs-plugins/*.so ${datadir}/xfce4/doc/C"
+
+DEPENDS="libxfcegui4 xfce-mcs-manager gtk+"
+inherit xfce
diff --git a/packages/xfce-utils/xfce-utils_4.0.5.bb b/packages/xfce-utils/xfce-utils_4.0.5.bb
index e69de29bb2..8cb3b633b3 100644
--- a/packages/xfce-utils/xfce-utils_4.0.5.bb
+++ b/packages/xfce-utils/xfce-utils_4.0.5.bb
@@ -0,0 +1,31 @@
+# xfce-mcs-plugins OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR="r1"
+
+DESCRIPTION="XFCE4 Utilities"
+SECTION = "x11/utils"
+
+PACKAGES="xfce-utils xfce-utils-mcs-plugins"
+
+FILES_xfce-utils-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"
+FILES_${PN} += " ${datadir}/xfce4/AUTHORS \
+        ${datadir}/xfce4/BSD \
+        ${datadir}/xfce4/COPYING \
+        ${datadir}/xfce4/GPL \
+	${datadir}/xfce4/INFO \
+        ${datadir}/xfce4/LGPL \
+        ${datadir}/xfce4/AUTHORS.html \
+        ${datadir}/xfce4/BSD.html \
+        ${datadir}/xfce4/COPYING.html \
+        ${datadir}/xfce4/GPL.html \
+	${datadir}/xfce4/INFO.html \
+        ${datadir}/xfce4/LGPL.html \
+	${datadir}/xfce4/doc/C"
+
+DEPENDS="x11 libxfcegui4 xfce-mcs-manager"
+inherit xfce
+
+# NOTE:  This package takes a --with-browser for the default browser
+# NOTE:  Works with gdm also gtkhtml
diff --git a/packages/xfdesktop/xfdesktop_4.0.5.bb b/packages/xfdesktop/xfdesktop_4.0.5.bb
index e69de29bb2..4a4e9d71de 100644
--- a/packages/xfdesktop/xfdesktop_4.0.5.bb
+++ b/packages/xfdesktop/xfdesktop_4.0.5.bb
@@ -0,0 +1,22 @@
+# xfdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="xfce4 Desktop Background Manager"
+SECTION = "x11/base"
+
+PACKAGES="xfdesktop xfdesktop-backdrops xfdesktop-mcs-plugins ${PN}-doc"
+
+FILES_xfdesktop-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"
+FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/"
+
+DEPENDS="x11 libxfcegui4 libxfce4mcs libxml2"
+inherit xfce
+
+# Get rid of the (for now) useless internationalization menus
+# In the future, we would copy over the desired internationalization
+
+do_install() {
+	oe_runmake DESTDIR=${D} install
+	rm -rf ${D}/${sysconfdir}/xfce4/menu.xml.*
+}
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb
index ed797b3103..8637e82b97 100644
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ b/packages/xfonts/xfonts-xorg_6.8.bb
@@ -8,12 +8,12 @@ SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;m
 inherit native
 
 PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}"
-FILES_${PN}-75dpi = "/usr/lib/X11/fonts/75dpi"
-FILES_${PN}-100dpi = "/usr/lib/X11/fonts/100dpi"
-FILES_${PN}-type1 = "/usr/lib/X11/fonts/Type1"
-FILES_${PN}-ttf = "/usr/lib/X11/fonts/TTF"
-FILES_${PN}-cyrillic = "/usr/lib/X11/fonts/cyrillic"
-FILES_${PN} = "/usr/lib/X11/fonts"
+FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi"
+FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi"
+FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1"
+FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF"
+FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic"
+FILES_${PN} = "${libdir}/X11/fonts"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index e69de29bb2..99067fd557 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -0,0 +1,53 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+	file://fixes.patch;patch=1 \
+	file://configure.patch;patch=1 \
+	file://XScreenSaver"
+
+DESCRIPTION="*The* screensaver package for X11"
+LICENSE="BSD"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SECTION="x11-misc"
+
+DEPENDS="intltool x11 gtk+ libxml2 libglade"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
+	--with-jpeg --with-xpm" 
+
+PACKAGES =+  " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \
+	/usr/X11R6/lib/X11/app-defaults"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+	${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_compile() {
+	oe_runmake GNOME_DATADIR=${datadir} all
+}
+
+do_install() {
+	unset KDEDIR
+	oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+	install_prefix=${D} 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
+}
+
+python populate_packages_prepend () {
+	hackdir = bb.data.expand('${libdir}/xscreensaver', d)
+	do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}