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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

BKrev: 421cfb9f-K6bfhnkhAVPJV_fqpHn7Q

49 files changed, 446 insertions, 137 deletions

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 1119502bc8..513e4639b5 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -209,7 +209,8 @@ python do_package_ipk () {
 			conffiles.close()
 
 		os.chdir(basedir)
-		ret = os.system("PATH=\"%s\" ipkg-build -o 0 -g 0 %s %s" % (bb.data.getVar("PATH", localdata, 1), pkg, pkgoutdir))
+		ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1), 
+                                                          bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir))
 		if ret != 0:
 			raise bb.build.FuncFailed("ipkg-build execution failed")
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f70c0c4147..aa5874225c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -321,6 +321,10 @@ PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1;
 PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
 PATCH_DEPENDS = "quilt-native"
 
+# Program to be used to build ipkg packages
+
+IPKGBUILDCMD = "ipkg-build -o 0 -g 0"
+
 ##################################################################
 # Not sure about the rest of this yet.
 ##################################################################
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index e69de29bb2..58a6e15fea 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -0,0 +1,62 @@
+#@TYPE: Distribution
+#@NAME: SharpROM
+#@DESCRIPTION: Distribution configuration for SharpROM compatible packages
+
+#
+# This is pretty ad-hoc - feel free to improve as needed :)
+#
+
+INHERIT += " package_ipk debian"
+TARGET_OS = "linux"
+TARGET_FPU = ""
+TARGET_CC_ARCH = "-march=armv4"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2"
+
+DISTRO = "sharprom"
+DISTRO_NAME = "SharpROM"
+DISTRO_VERSION = "3.1 compatible"
+DISTRO_TYPE = "debug"
+# DISTRO_TYPE = "release"
+
+CVSDATE = "20050221"
+
+#
+# Zaurus
+#
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "tty1"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+#
+# Base
+#
+
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross"
+ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc"
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial
+
+PREFERRED_VERSION_glibc = "2.2.5"
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+
+OPIE_VERSION = "1.2.0"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+CVSDATE_xserver-kdrive = "20050208"
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+
+include conf/distro/preferred-gpe-versions.inc
+
diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index 03d64155c1..8c54741547 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -47,9 +47,9 @@ def get_commands_apt_doc(d, bb, manpages):
 		dest = get_files_apt_doc(d, bb, m)
 		dir = os.path.dirname(dest)
 		if not dir in __dir_cache__:
-			s.append("install -d ${D}%s" % dir)
+			s.append("install -d ${D}/%s" % dir)
 			__dir_cache__.append(dir)
-		s.append("install -m 0644 %s ${D}%s" % (m, dest))
+		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
 	return "\n".join(s)
 
 PACKAGES += "${PN}-utils ${PN}-utils-doc"
diff --git a/packages/apt/apt_0.5.28.1.bb b/packages/apt/apt_0.5.28.1.bb
index e69de29bb2..99f5ef63c7 100644
--- a/packages/apt/apt_0.5.28.1.bb
+++ b/packages/apt/apt_0.5.28.1.bb
@@ -0,0 +1,13 @@
+include apt.inc
+PR = "r1"
+
+SRC_URI += "file://autofoo.patch;patch=1"
+
+inherit autotools gettext
+
+include apt-package.inc
+
+apt-manpages += "doc/vendors.list.5 \
+		 doc/fr/vendors.list.fr.5 \
+		 doc/es/vendors.list.es.5 \
+		 doc/de/apt.de.8"
diff --git a/packages/apt/apt_0.6.25.bb b/packages/apt/apt_0.6.25.bb
index e69de29bb2..a6f9f9e223 100644
--- a/packages/apt/apt_0.6.25.bb
+++ b/packages/apt/apt_0.6.25.bb
@@ -0,0 +1,11 @@
+include apt.inc
+
+PR = "r2"
+SRC_URI += "file://autofoo.patch;patch=1"
+
+inherit autotools gettext
+
+include apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 677ff0f4f7..39e63387af 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -58,7 +58,7 @@ do_install () {
 		install -m 2755 -d ${D}$d
 	done
 	for d in card cf net ram; do
-		ln -sf /media/$d ${D}mnt/$d
+		ln -sf /media/$d ${D}/mnt/$d
 	done
 
 	if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
@@ -138,15 +138,15 @@ do_install () {
 
 
 do_install_append_ramses () {
-	rmdir ${D}tmp
+	rmdir ${D}/tmp
 	mkdir -p ${D}${localstatedir}/tmp
-	ln -s var/tmp ${D}tmp
+	ln -s var/tmp ${D}/tmp
 }
 
 do_install_append_nylon() {
 	rm ${D}${sysconfdir}/resolv.conf
 	touch ${D}${sysconfdir}/resolv.conf
-	rm -r ${D}mnt/*
+	rm -r ${D}/mnt/*
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb
index 2c81cfb61d..9160fdd577 100644
--- a/packages/cdparanoia/cdparanoia_9.8alpha.bb
+++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb
@@ -2,6 +2,7 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
+PR="r1"
 LICENSE="GPL"
 
 SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \
@@ -12,8 +13,8 @@ S="${WORKDIR}/cdparanoia-III-alpha9.8"
 inherit autotools
 
 do_install() {
-	oe_runmake BINDIR="${D}usr/bin" MANDIR="${D}usr/share/man/" \
-		   INCLUDEDIR="${D}usr/include/" LIBDIR="${D}usr/lib" install 
+	oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
+		   INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install 
 }
 
 do_stage() {
diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb
index b459ee9204..37a630ca51 100644
--- a/packages/gdb/gdb_6.2.bb
+++ b/packages/gdb/gdb_6.2.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "gdb - GNU debugger"
 LICENSE="GPL"
 SECTION = "devel"
 PRIORITY = "optional"
+PR = "r1"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 
@@ -41,8 +42,8 @@ do_install () {
 	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
 	oe_runmake install \
 	    'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}${base_bindir}' \
-	    'sbindir=${D}${base_sbindir}' 'infodir=${D}share/info' 'libdir=${D}${base_libdir}' \
-	    'mandir=${D}share/man' 'includedir=${D}include'
+	    'sbindir=${D}${base_sbindir}' 'infodir=${D}/share/info' 'libdir=${D}${base_libdir}' \
+	    'mandir=${D}/share/man' 'includedir=${D}/include'
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index fe5a7680a8..bd2b7782b0 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -14,6 +14,8 @@ GLIBC_EXTRA_OECONF ?= ""
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_i686 = "0"
 DEFAULT_PREFERENCE_i586 = "0"
+DEFAULT_PREFERENCE_sh3 = "0"
+DEFAULT_PREFERENCE_sh4 = "0"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index e69de29bb2..da01f34b57 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -0,0 +1,179 @@
+DESCRIPTION = "GNU C Library"
+HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
+PR = "r0"
+
+GLIBC_ADDONS ?= "linuxthreads"
+GLIBC_EXTRA_OECONF ?= ""
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_i686 = "0"
+DEFAULT_PREFERENCE_i586 = "0"
+DEFAULT_PREFERENCE_sh3 = "0"
+DEFAULT_PREFERENCE_sh4 = "0"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+
+# nptl needs unwind support in gcc, which can't be built without glibc.
+PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
+DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
+INHIBIT_DEFAULT_DEPS = "1"
+
+libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
+
+FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "/lib/libSegFault*"
+FILES_glibc-extra-nss = "/lib/libnss*"
+FILES_sln = "/sbin/sln"
+FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_glibc-utils = "${bindir} ${sbindir}"
+FILES_glibc-gconv = "${libdir}/gconv"
+FILES_catchsegv = "${bindir}/catchsegv"
+DEPENDS_catchsegv = "libsegfault"
+FILES_glibc-pcprofile = "/lib/libpcprofile.so"
+FILES_glibc-thread-db = "/lib/libthread_db*"
+FILES_localedef = "${bindir}/localedef"
+RPROVIDES_glibc-dev += "libc-dev"
+
+#	   file://noinfo.patch;patch=1
+#	   file://ldconfig.patch;patch=1;pnum=0
+SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
+	   file://arm-ioperm.patch;patch=1;pnum=0 \
+	   file://fhs-linux-paths.patch;patch=1 \
+	   file://arm-no-hwcap.patch;patch=1;pnum=0 \
+	   file://arm-memcpy.patch;patch=1;pnum=0 \
+	   file://arm-longlong.patch;patch=1;pnum=0 \
+	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+	   \
+           file://etc/ld.so.conf \
+	   file://generate-supported.mk"
+
+# seems to fail on tls platforms
+SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+
+SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
+
+S = "${WORKDIR}/libc"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+	        --without-cvs --disable-profile --disable-debug --without-gd \
+		--enable-clocale=gnu \
+	        --enable-add-ons=${GLIBC_ADDONS} \
+		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+		--without-selinux \
+		${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+def get_glibc_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--without-fp"
+	return ""
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+	if [ -z "`which rpcgen`" ]; then
+		echo "rpcgen not found.  Install glibc-devel."
+		exit 1
+	fi
+	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+	CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+	  yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+	# this really is arm specific
+	touch ${S}/sysdeps/arm/framestate.c
+	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+	unset LDFLAGS
+	base_do_compile
+	(
+		cd ${S}/sunrpc/rpcsvc
+		for r in ${rpcsvc}; do
+			h=`echo $r|sed -e's,\.x$,.h,'`
+			rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+		done
+	)
+}
+
+do_stage() {
+	rm -f ${STAGING_LIBDIR}/libc.so.6
+	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
+		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		   '${STAGING_LIBDIR}/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${STAGING_INCDIR}/gnu \
+		   ${STAGING_INCDIR}/bits \
+		   ${STAGING_INCDIR}/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+	done
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+
+	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
+	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
+		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
+		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
+		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
+	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
+	done
+
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
+}
+
+include glibc-package.bbclass
diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb
index 1305c5dc90..f2ff82d8be 100644
--- a/packages/ipaq-boot-params/ipaq-boot-params.bb
+++ b/packages/ipaq-boot-params/ipaq-boot-params.bb
@@ -1,10 +1,11 @@
 FILES_${PN} = "/boot/params"
 
+PR = "r1"
 LICENSE = "MIT"
 SRC_URI = "file://params"
 
 do_install() {
-	install -d ${D}boot
-	install -m 0644 ${WORKDIR}/params ${D}boot/
+	install -d ${D}/boot
+	install -m 0644 ${WORKDIR}/params ${D}/boot/
 }
 
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
index d08a1fc806..fe43ff488e 100644
--- a/packages/iptables/iptables_1.2.9.bb
+++ b/packages/iptables/iptables_1.2.9.bb
@@ -1,6 +1,7 @@
 SECTION = "console/network"
 DESCRIPTION = "iptables network filtering tools"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
 
@@ -11,10 +12,10 @@ export KERNEL_DIR = "${STAGING_INCDIR}"
 
 do_compile () {
 	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}usr/man NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man NO_SHARED_LIBS=1
 }
 
 do_install () {
 #	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}usr/man install NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man install NO_SHARED_LIBS=1
 }
diff --git a/packages/irk/irk_0.11.bb b/packages/irk/irk_0.11.bb
index 687dee3b50..d21029807b 100644
--- a/packages/irk/irk_0.11.bb
+++ b/packages/irk/irk_0.11.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php"
 DEPENDS = "virtual/libqpe lirc"
 RCONFLICTS = "irk-belkin"
 RREPLACES = "irk-belkin"
-PR = "r1"
+PR = "r2"
 REALV = "0.11.0"
 
 SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${REALV}.tgz"
@@ -20,7 +20,7 @@ EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc"
 do_install() {
 	install -d ${D}${sysconfdir}
 	install -d ${D}${palmtopdir}/plugins/inputmethods/
-	install -d ${D}home/root/Settings/
+	install -d ${D}/home/root/Settings/
 
 	install chicony.conf ${D}${sysconfdir}/lircd.conf
 	install IRK.conf ${D}${sysconfdir}
diff --git a/packages/lame/lame_3.96.1.bb b/packages/lame/lame_3.96.1.bb
index e69de29bb2..b732a8cb23 100644
--- a/packages/lame/lame_3.96.1.bb
+++ b/packages/lame/lame_3.96.1.bb
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+DESCRIPTION = "Not an MP3 encoder"
+LICENSE = "LGPL"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
+	file://no-gtk1.patch;patch=1"
+
+inherit autotools
+
+PACKAGES += "libmp3lame libmp3lame-dev"
+FILES_${PN} = "${bindir}/lame"
+FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
+FILES_libmp3lame-dev = "${includedir} ${libdir}"
+FILES_${PN}-dev = ""
+
+do_configure() {
+	# no autoreconf please
+	aclocal
+	autoconf
+	libtoolize --force
+	oe_runconf
+}
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	oe_libinstall -C libmp3lame -so -a libmp3lame ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/lame
+	install -m 0644 include/lame.h ${STAGING_INCDIR}/lame/
+}
diff --git a/packages/linux-uml/linux-uml_2.4.26.bb b/packages/linux-uml/linux-uml_2.4.26.bb
index f2b8d24255..efcb228396 100644
--- a/packages/linux-uml/linux-uml_2.4.26.bb
+++ b/packages/linux-uml/linux-uml_2.4.26.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "User Mode Linux Kernel"
 LICENSE = "GPL"
 UMLR = "2"
-PR = "0"
+PR = "1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;patch=1 \
@@ -36,8 +36,8 @@ do_compile() {
 do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}boot
-        install -m 0755 linux ${D}boot/linux-${PV}
-        install -m 0644 System.map ${D}boot/System.map-${PV}
-        install -m 0644 .config ${D}boot/config-${PV}
+        install -d ${D}/boot
+        install -m 0755 linux ${D}/boot/linux-${PV}
+        install -m 0644 System.map ${D}/boot/System.map-${PV}
+        install -m 0644 .config ${D}/boot/config-${PV}
 }
diff --git a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
index e66b9620ed..b7ef49c0f4 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
@@ -6,7 +6,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 RCV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
 MMV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 LV = "2.6.10"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \
            http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \
@@ -51,8 +51,8 @@ do_stage_prepend() {
 do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         #oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}boot
-        install -m 0755 linux ${D}boot/linux-${PV}
-        install -m 0644 System.map ${D}boot/System.map-${PV}
-