merge of '82b5799fa84f05f84e4567892ec02e1793da418f'

     and 'cd6bceda2ad72ef7c9618be5c991fe044857be92'

7 files changed, 215 insertions, 14 deletions

diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 1395f09a7e..cc5a8e747b 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -1,11 +1,11 @@
 #@TYPE: Distribution
 #@NAME: SharpROM
 #@DESCRIPTION: Distribution configuration for SharpROM (Zaurus) compatible packages
-#@MENTOR: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in your PATH.
+#@MENTOR: None
+#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in /usr/local/arm/2.95.3
 #@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2.
 
-INHERIT += " package_ipk debian sharprom"
+INHERIT += " package_ipk debian"
 
 #
 # Zaurus
@@ -23,17 +23,17 @@ KERNEL_CONSOLE = "tty1"
 #
 # Base
 #
-DISTRO = "sharprom"
 DISTRO_NAME = "SharpROM"
 DISTRO_VERSION = "3.1 compatible"
 DISTRO_TYPE = "debug"
 
-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
-ASSUME_PROVIDED += "virtual/libc linux-libc-headers"
-
-DEPENDS =+ "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native" 
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" 
+PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 #INHIBIT_PACKAGE_STRIP = "1"
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 1536aea914..c4843b7bda 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -2,10 +2,11 @@ SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r4"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://fixincludes.patch;patch=1 \
+           file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
@@ -35,10 +36,13 @@ do_install() {
 	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
 }
 
-PACKAGES = "dhcp-server dhcp-client dhcp-relay dhcp-omshell dhcp-dev dhcp-doc"
+PACKAGES =+ "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
 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"
+RDEPENDS_dhcp-client = "bash"
+
 FILES_dhcp-omshell = "${bindir}/omshell"
 
 CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
diff --git a/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch b/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
new file mode 100644
index 0000000000..579d72f484
--- /dev/null
+++ b/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
@@ -0,0 +1,84 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -57,6 +57,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -69,6 +69,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb
new file mode 100644
index 0000000000..56e799a272
--- /dev/null
+++ b/packages/fluxbox/fluxbox_svn.bb
@@ -0,0 +1,96 @@
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license)
+#
+# Filename: fluxbox-gpe_1.0rc.bb
+# Date: 01-Jul-06
+
+DESCRIPTION = "The Fluxbox WindowManager"
+HOMEPAGE = "http://fluxbox.sourceforge.net"
+LICENSE = "MIT"
+
+PV = "1.0+svn${SRCDATE}"
+PR = "r2"
+
+######################################################################################
+
+S = "${WORKDIR}/trunk"
+
+######################################################################################
+
+SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \
+	   file://gpe-init.patch;patch=1 \
+	   file://apps.gpe.* \
+	   file://style.gpe-default \
+	   file://fluxbox-gpe-session \
+	   file://fluxbox-gpe.session \
+	   file://keys.* \
+	   file://keylaunchrc.fluxbox \
+	   file://gpe-logout.fluxbox"
+
+######################################################################################
+
+PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
+
+DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
+DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
+RDEPENDS_${PN}-gpe = "${PN}"
+
+######################################################################################
+
+FILES_${PN} = "/usr/bin \
+	       /usr/share/fluxbox/init \
+	       /usr/share/fluxbox/keys \
+	       /usr/share/fluxbox/menu "
+
+FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \
+		   /usr/share/fluxbox/keys.* \
+		   /usr/bin/gpe-logout.fluxbox \
+		   /etc/keylaunchrc.fluxbox \
+		   /usr/share/fluxbox/styles/gpe-default \
+		   /usr/share/fluxbox/session \
+		   /usr/bin/fluxbox-gpe-session"
+
+FILES_${PN}-styles = "/usr/share/fluxbox/styles"
+
+FILES_${PN}-doc = "/usr/share/man"
+
+######################################################################################
+
+inherit autotools
+
+######################################################################################
+
+EXTRA_OECONF = "--disable-xmb \
+		"
+
+######################################################################################
+
+do_install_append() {
+	install -d ${D}/usr/bin
+	install -d ${D}/usr/share/fluxbox
+	install -d ${D}/usr/share/fluxbox/styles
+	install -d ${D}/etc
+	
+	install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
+	install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox
+	install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
+	install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
+	install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
+	install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin	
+	install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc	
+}
+
+######################################################################################
+
+pkg_postinst_${PN}-gpe() { 
+       update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
+       update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox  15
+       update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15
+}
+
+pkg_postrm_${PN}-gpe() {   
+       update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
+       update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox
+       update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox
+}
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index 0283e1acca..3729072656 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -153,6 +153,13 @@ fi
 if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then
 	exit 0
 fi
+
+#       Add a second check, which seems to be needed for some kernel versions
+if [ $(grep "/dev/root" /proc/mounts | awk '{print $4}') = rw ]; then
+        exit 0
+fi
+
+
 echo "Remounting root file system..."
 mount -n -o remount,$rootmode /
 if test "$rootmode" = rw
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 928caae19d..005b8cfab6 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r76"
+PR = "r77"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index e60180e6d8..3692f44406 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -1,11 +1,21 @@
 DESCRIPTION = "Precompiled SharpROM toolchain glue package"
 LICENSE = "GPL"
 SECTION = "base"
+PROVIDES = "\
+virtual/arm-linux-gcc-2.95 \
+virtual/arm-linux-libc-for-gcc \
+virtual/arm-linux-binutils \
+virtual/libc \
+virtual/arm-linux-gcc \
+virtual/linux-libc-headers \
+virtual/arm-linux-gcc-initial "
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_sharprom-compatible = "1"
+
 # This needs to be extracted to /usr/local/arm :
 # SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2"
 
 inherit native
-DEPENDS = ""
 
 COMPATIBLE_HOST = 'i.86.*-linux'