9 files changed, 18 insertions, 34 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index cae542e962..89fb3a19f8 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -13,7 +13,7 @@ FILES_${PN} += "${datadir}/application-registry  \
 	${datadir}/mime/packages \	
 	${datadir}/gnome-2.0"
 
-inherit autotools pkgconfig gconf mime
+inherit autotools gtk-icon-cache pkgconfig gconf mime
 
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
diff --git a/classes/image.bbclass b/classes/image.bbclass
index e9c0ecd947..c493c73c01 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -107,6 +107,7 @@ fakeroot do_rootfs () {
 
 	${IMAGE_PREPROCESS_COMMAND}
 
+	ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = ${IMAGE_EXTRA_SPACE} + $1; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
 	${@get_imagecmds(d)}
 
 	${IMAGE_POSTPROCESS_COMMAND}
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index c864782d4d..d1f59e5e84 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -117,7 +117,7 @@ kernel_do_stage() {
 	mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia
 	cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/
 
-	for entry in drivers/crypto include/media include/acpi include/sound include/video; do
+	for entry in drivers/crypto include/media include/acpi include/sound include/video include/scsi; do
 		if [ -d $entry ]; then
 			mkdir -p ${STAGING_KERNEL_DIR}/$entry
 			cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/
diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
deleted file mode 100644
index cb13222d64..0000000000
--- a/classes/lsppchd-image.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_PREPROCESS_COMMAND_lsppchd += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-
-lsppchd_pack_image() {
-:
-}
-
-IMAGE_POSTPROCESS_COMMAND += "lsppchd_pack_image; "
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
deleted file mode 100644
index 553414224d..0000000000
--- a/classes/lsppchg-image.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_PREPROCESS_COMMAND_lsppchg += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-
-lsppchg_pack_image() {
-:
-}
-
-IMAGE_POSTPROCESS_COMMAND += "lsppchg_pack_image; "
diff --git a/classes/module.bbclass b/classes/module.bbclass
index 8ab92a5fef..eef98292a7 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -3,21 +3,24 @@ DEPENDS += "virtual/kernel"
 
 inherit module-base
 
+MODULE_MAKE_FLAGS = '\
+	KERNEL_PATH=${STAGING_KERNEL_DIR}\
+	KERNEL_SRC=${STAGING_KERNEL_DIR}\
+	KDIR=${STAGING_KERNEL_DIR}\
+	KERNELDIR=${STAGING_KERNEL_DIR}\
+	KERNEL_VERSION=${KERNEL_VERSION}\
+	CC="${KERNEL_CC}" LD="${KERNEL_LD}"\
+	AR="${KERNEL_AR}"\
+	'
+
 module_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-		   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-		   KDIR=${STAGING_KERNEL_DIR}    \
-		   KERNELDIR=${STAGING_KERNEL_DIR} \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-		   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-		   AR="${KERNEL_AR}" \
-                   ${MAKE_TARGETS}
+	oe_runmake ${MODULE_MAKE_FLAGS} ${MAKE_TARGETS}
 }
 
 module_do_install() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install
+	oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" ${MODULE_MAKE_FLAGS} modules_install
 }
 
 pkg_postinst_append () {
diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass
index bc6c12e1fb..b74e74c48a 100644
--- a/classes/n2100-image.bbclass
+++ b/classes/n2100-image.bbclass
@@ -1,6 +1,6 @@
 n2100_pack_image() {
         # find latest kernel
-        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1`
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -n 1`
         if [ -z "$KERNEL" ]; then
                 oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux to create one."
                 exit 1
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 8b7d6494ea..a7cdb5f2d5 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -615,7 +615,7 @@ python package_do_shlibs() {
 			for file in files:
 				soname = None
 				path = os.path.join(root, file)
-				if os.access(path, os.X_OK) or lib_re.match(file):
+				if (os.access(path, os.X_OK) or lib_re.match(file)) and not os.path.islink(path):
 					cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
 					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd)
 					fd = os.popen(cmd)
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 027d948fce..e442bf1807 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -101,7 +101,7 @@ def check_sanity(e):
 		if os.path.exists("/proc/sys/vm/mmap_min_addr"):
 			f = file("/proc/sys/vm/mmap_min_addr", "r")
 			if (f.read().strip() != "0"):
-				messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n"
+				messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
 			f.close()
 
 	for util in required_utilities.split():