merge of 0aff07c0ec1ad6cd2825cb3f73fa8ea5948359e8

     and b6beeff01c7a8b7ba6cf72a1a343d02c084f71b9

8 files changed, 159 insertions, 2 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 22e835e257..847959bcc2 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -95,6 +95,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2"
+PREFERRED_VERSION_nslu2-kernel ?= "2.6.11.2"
 # The nslu2-kernel version is currently tracking the latest
 # Change before release!
 #PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2"
diff --git a/packages/ctrlproxy/.mtn2git_empty b/packages/ctrlproxy/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ctrlproxy/.mtn2git_empty
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
new file mode 100644
index 0000000000..3eb809edb0
--- /dev/null
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "ctrlproxy is an IRC server with multiserver support."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
+DEPENDS = "glib-2.0 libxml2 popt pcre openssl"
+PR = "r0"
+LICENSE = "GPL"
+
+SRC_URI = "http://ctrlproxy.vernstok.nl/releases/ctrlproxy-2.6.2.tar.gz"
+S = "${WORKDIR}/ctrlproxy-2.6.2/"
+
+inherit autotools
+# update-rc.d
+
+#INITSCRIPT_NAME = "ctrlproxy"
+#INITSCRIPT_PARAMS = "defaults 84"
+# CONFFILES_${PN} = "${sysconfdir}/foo.conf" 
+
+CFLAGS += "-L${STAGING_LIBDIR}"
+
+#do_install() {
+#	autotools_do_install
+#	install -d ${D}${sysconfdir}
+#	install -d ${D}${sysconfdir}/init.d
+#	install -m 0644 ${S}contrib/foo.conf ${D}${sysconfdir}
+#	install -m 0755 ${WORKDIR}/foo.init ${D}${sysconfdir}/init.d/foo
+#}
+
diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb
index 51dacccd0f..4340335d50 100644
--- a/packages/gphoto2/gphoto2_2.1.6.bb
+++ b/packages/gphoto2/gphoto2_2.1.6.bb
@@ -2,6 +2,7 @@ LICENSE = GPL
 SECTION = "console/utils"
 DEPENDS = "libgphoto2 popt"
 DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+PR="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
 
diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb
index 67efc38785..b814f9a469 100644
--- a/packages/libgphoto2/libgphoto2_2.1.6.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.6.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DEPENDS = "jpeg libusb libexif"
 RPEDENDS = "libusb"
 DESCRIPTION = "libgphoto2 allows you to access digital cameras"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
 
@@ -30,3 +30,7 @@ do_stage() {
                 install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
         done
 }
+PACKAGES =+ "libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/"
+RDEPENDS_libgphoto2 = "libgphoto2-camlibs"
+
diff --git a/packages/nfs-utils/files/.mtn2git_empty b/packages/nfs-utils/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nfs-utils/files/.mtn2git_empty
diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver
new file mode 100644
index 0000000000..3536f0db12
--- /dev/null
+++ b/packages/nfs-utils/files/nfsserver
@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+# Startup script for nfs-utils
+#
+# The nfsd kernel module must exist along with its dependencies
+modprobe -n nfsd || exit 0
+#
+# The environment variable NFS_SERVERS may be set in /etc/default/nfsd
+# Other control variables may be overridden here too
+test -r /etc/default/nfsd && . /etc/default/nfsd
+#
+# Location of exectuables:
+test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/mountd
+test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/nfsd
+#
+# The user mode program must also exist (it just starts the kernel
+# threads using the kernel module code).
+test -x "$NFS_MOUNTD" || exit 0
+test -x "$NFS_NFSD" || exit 0
+#
+# Default is 8 threads, value is settable between 1 and the truely
+# ridiculous 99
+test "$NFS_SERVERS" -gt 0 && "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8
+#
+#----------------------------------------------------------------------
+# Startup and shutdown functions.
+#  Actual startup/shutdown is at the end of this file.
+#mountd
+start_mountd(){
+	echo -n 'starting mountd: '
+	start-stop-daemon --start --exec "$NFS_MOUNTD" -- "$@"
+	echo done
+}
+stop_mountd(){
+	echo -n 'stopping mountd: '
+	start-stop-daemon --stop --quiet --exec "$NFS_MOUNTD"
+	echo done
+}
+#
+#nfsd
+start_nfsd(){
+	echo -n 'starting $1 nfsd kernel threads: '
+	start-stop-daemon --start --exec "$NFS_NFSD" -- "$@"
+	echo done
+}
+delay_nfsd(){
+	for delay in 0 1 2 3 4 5 6 7 8 9 
+	do
+		if pidof nfsd >/dev/null
+		then
+			echo -n .
+			sleep 1
+		else
+			return 0
+		fi
+	done
+	return 1
+}
+stop_nfsd(){
+	# WARNING: this kills any process with the executable
+	# name 'nfsd'.
+	echo -n 'stopping nfsd: '
+	start-stop-daemon --stop --quiet --signal 1 --name nfsd
+	if delay_nfsd || {
+		echo failed
+		echo ' using signal 9: '
+		start-stop-daemon --stop --quiet --signal 9 --name nfsd
+		delay_nfsd
+	}
+	then
+		echo done
+		# This will remove, recursively, dependencies
+		echo -n 'removing nfsd kernel module: '
+		if modprobe -r nfsd
+		then
+			echo done
+		else
+			echo failed
+		fi
+	else
+		echo failed
+	fi
+}
+#----------------------------------------------------------------------
+#
+# supported options:
+#  start
+#  stop
+#  reload: reloads the exports file
+#  restart: stops and starts mountd
+#FIXME: need to create the /var/lib/nfs/... directories
+case "$1" in
+start)	start_nfsd "$NFS_SERVERS"
+	start_mountd
+	test -r /etc/exports && exportfs -a;;
+stop)	exportfs -ua
+	stop_mountd
+	stop_nfsd;;
+reload)	test -r /etc/exports && exportfs -r;;
+restart)exportfs -ua
+	stop_mountd
+	# restart does not restart the kernel threads,
+	# only the user mode processes
+	start_mountd
+	test -r /etc/exports && exportfs -a;;
+esac
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index 6897aef141..30c4c75b2e 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -1,6 +1,6 @@
 MAINTAINER="Oyvind Repvik <nail@nslu2-linux.org>"
 DESCRIPTION="Scanner drivers for SANE"
-PR="r0"
+PR="r2"
 DEPENDS="jpeg libusb"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
@@ -11,4 +11,21 @@ EXTRA_OECONF="--prefix=/usr --sysconfdir=/etc --disable-translations"
 
 inherit autotools
 
+do_install_append() {
+	install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}"
+}
+
+PACKAGES = "libsane saned sane-utils"
+
+FILES_libsane = "/usr/lib/sane/*.so.* /usr/lib/lib*.so.* /etc"
+PKG_libsane = "libsane"
+RCONFLICTS = "sane-backends"
+RRECOMMENDS_libsane = "saned sane-utils"
+
+RDEPENDS_saned = "libsane"
+FILES_saned = "/usr/sbin/saned"
+
+RDEPENDS_sane-utils = "libsane"
+FILES_sane-utils = "/usr/bin"
+