merge of '0d93ec84b30bc1bee2caaee72d667f87bc468a70'

     and '4d3f6129ff74b55c246c109b0515837fb4fcef27'

29 files changed, 49 insertions, 31 deletions

diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 31f13b00b6..a49973f64f 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 PREFERRED_VERSION_u-boot ?= "git"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb
index 111b3f59e3..ccbbb9be70 100644
--- a/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,5 +1,7 @@
 require glib.inc
 
+PR = "r3"
+
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 60d2e5da8b..cfac69b6d9 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -41,9 +41,11 @@ read_args() {
 
 load_modules() {
     for module in $MODULE_DIR/$1; do
-	# Cannot redir to $CONSOLE here easily - may not be set yet
-        echo "initramfs: Loading $module module"
-        source $module
+	if [ -e "$module"  ]; then
+	    # Cannot redir to $CONSOLE here easily - may not be set yet
+            echo "initramfs: Loading $module module"
+            source $module
+	fi
     done
 }
 
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 403db0b562..5a042ab748 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://init.sh"
-PR = "r8"
+PR = "r9"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 
diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.1.bb
index 01ba37c8bf..01ba37c8bf 100644
--- a/packages/mpfr/mpfr-native_2.3.0.bb
+++ b/packages/mpfr/mpfr-native_2.3.1.bb
diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.1.bb
index 869c4227e2..db04ce002b 100644
--- a/packages/mpfr/mpfr_2.3.0.bb
+++ b/packages/mpfr/mpfr_2.3.1.bb
@@ -1,7 +1,7 @@
 require mpfr.inc
 
 DEPENDS = "gmp"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
diff --git a/packages/tetex/.mtn2git_empty b/packages/nonworking/tetex/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tetex/.mtn2git_empty
+++ b/packages/nonworking/tetex/.mtn2git_empty
diff --git a/packages/tetex/files/.mtn2git_empty b/packages/nonworking/tetex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tetex/files/.mtn2git_empty
+++ b/packages/nonworking/tetex/files/.mtn2git_empty
diff --git a/packages/tetex/files/configure.patch b/packages/nonworking/tetex/files/configure.patch
index 7a955917df..7a955917df 100644
--- a/packages/tetex/files/configure.patch
+++ b/packages/nonworking/tetex/files/configure.patch
diff --git a/packages/tetex/tetex-native_3.0.bb b/packages/nonworking/tetex/tetex-native_3.0.bb
index 4d683ff3d1..4d683ff3d1 100644
--- a/packages/tetex/tetex-native_3.0.bb
+++ b/packages/nonworking/tetex/tetex-native_3.0.bb
diff --git a/packages/tetex/tetex-texmf_3.0.bb b/packages/nonworking/tetex/tetex-texmf_3.0.bb
index 80d6f779d8..80d6f779d8 100644
--- a/packages/tetex/tetex-texmf_3.0.bb
+++ b/packages/nonworking/tetex/tetex-texmf_3.0.bb
diff --git a/packages/tetex/tetex_3.0.bb b/packages/nonworking/tetex/tetex_3.0.bb
index eedf8820b2..eedf8820b2 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/nonworking/tetex/tetex_3.0.bb
diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf
index 84a14af550..57a69b7643 100644
--- a/packages/slugos-init/files/sysconf
+++ b/packages/slugos-init/files/sysconf
@@ -665,6 +665,8 @@ sysconf_restore(){
 			#
 			mkdir "$saved" || {
 				sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory"
+				umount "$ffsdir" && rmdir "$ffsdir" ||
+					echo "$0: $ffsdir: temporary directory cleanup failed" >&2
 				return 1
 			}
 			#
@@ -678,6 +680,8 @@ sysconf_restore(){
 			) || {
 				rm -rf "$saved"
 				sysconf_restore_error "$ffsdir" "$saved: cpio -i failed"
+				umount "$ffsdir" && rmdir "$ffsdir" ||
+					echo "$0: $ffsdir: temporary directory cleanup failed" >&2
 				return 1
 			}
 			# either there must be no 'diff' files or it must
diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
index 4babf89d61..ebb6ff7744 100644
--- a/packages/slugos-init/slugos-init_4.8.bb
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 20d7389512..6dbadceca8 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -2,8 +2,6 @@ DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11M
 HOMEPAGE = "http://www.linux-wlan.org"
 SECTION = "kernel/modules"
 DEPENDS = "virtual/kernel"
-RRECOMMENDS = "wlan-ng-utils"
-RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules"
 LICENSE = "GPL"
 
 SRC_URI = "file://no-compat.patch;patch=1 \
@@ -55,15 +53,22 @@ do_install() {
         # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
         rm -f ${KERNEL_SOURCE}/../config.mk
         rm -f ${KERNEL_SOURCE}/../../config.mk	
+
+	# man page and configure scripts are shipped by wlan-ng-utils
+	rm -rf ${D}/usr/local/man
+	rm -rf ${D}/etc
 }
 
-PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-ng-modules-pci wlan-ng-modules-p80211"
-FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-cs  = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
+PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci"
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-cs  = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
 			     /lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx${KERNEL_OBJECT_SUFFIX}"
-RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils"
-RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-cs  = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211"
+
+RDEPENDS_${PN}-p80211 = "wlan-ng-utils"
+RDEPENDS_${PN}     = "${PN}-p80211"
+RDEPENDS_${PN}-usb = "${PN}-p80211"
+RDEPENDS_${PN}-cs  = "${PN}-p80211"
+RDEPENDS_${PN}-pci = "${PN}-p80211"
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
index cb6edc97dc..f2ead8d8b3 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \
 	file://no-compat.patch;patch=1 \
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
index 2157a29fa2..6dc9be552d 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
@@ -1,9 +1,8 @@
 require wlan-ng-modules.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
 	    file://prism2sta_commsqual_defer.patch;patch=1 \
 	    file://modules-symvers.patch;patch=1 \
 	    file://usb-owner.patch;patch=1 "
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
index ade99ac50d..9639389501 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
@@ -1,5 +1,7 @@
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20060823"
 PV = "0.2.4+svn${SRCDATE}"
 
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
index dd320276f5..f322848d59 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
@@ -1,8 +1,9 @@
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20061109"
 PV = "0.2.5+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
 S = "${WORKDIR}/trunk"
-
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
index bacd662680..a0113e9ae4 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
 	    file://2.6.22-fixes.patch;patch=1"
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
index f1fadadd09..4a5df48ba9 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
@@ -1,9 +1,10 @@
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20080315"
 PV = "0.2.8+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
 		
 S = "${WORKDIR}/trunk"
-
diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
index a1826a36f3..1368729826 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,5 +1,5 @@
 require wlan-ng-modules.inc
-PR = "r0"
+PR = "r1"
 PV = "0.2.4+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc
index fe00e161d3..bade47ce30 100644
--- a/packages/wlan-ng/wlan-ng-utils.inc
+++ b/packages/wlan-ng/wlan-ng-utils.inc
@@ -61,8 +61,8 @@ do_install() {
 	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
 	install -d ${D}${mandir}/man1
 	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+	rm -rf ${D}/usr/local/man
 }
 
-FILES_${PN}-doc += "/usr/local/man"
 FILES_${PN}-dbg += "/sbin/.debug"
 FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
index 9ac5348a98..ff41097393 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
@@ -1,3 +1,3 @@
 require wlan-ng-utils.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
index d4e0a39c70..7e28b417c9 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
@@ -1,6 +1,6 @@
 require wlan-ng-utils.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
 	file://pcmciasrc.patch;patch=1 \
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
index f71a2ee34a..6f7c75cf7d 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
@@ -1,5 +1,7 @@
 require wlan-ng-utils.inc
 
+PR = "r1"
+
 SRCDATE = "20060823"
 PV = "0.2.4+svn${SRCDATE}"
 
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
index 0b6f33e380..141ae42957 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
 	file://pcmciasrc.patch;patch=1 \
 	file://hostldflags.patch;patch=1"
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
index e37d548a9f..0b6f33e380 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
 	file://pcmciasrc.patch;patch=1 \
 	file://hostldflags.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index fae48545ff..9de024f006 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -1,6 +1,6 @@
 require wlan-ng-utils.inc
 
-PR = "r2"
+PR = "r3"
 PV = "0.2.4+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \