merge of 541dc5976410d780e5918ffaf19fc9e2e17e40cc

     and de56403f43f1ceeaffcfca380aff23d0c1426036

7 files changed, 81 insertions, 16 deletions

diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile
index 3de4dfe607..f24fec92ca 100644
--- a/packages/base-files/base-files/profile
+++ b/packages/base-files/base-files/profile
@@ -2,6 +2,8 @@
 # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
 
 PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/bin/vi"	# needed for packages like cron
+TERM="vt100"		# Basic terminal capab. For screen etc.
 
 if [ "`id -u`" -eq 0 ]; then
    PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
@@ -18,7 +20,7 @@ if [ -d /etc/profile.d ]; then
   unset i
 fi
 
-export PATH PS1 OPIEDIR QPEDIR QTDIR
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
 
 umask 022
 
diff --git a/packages/linux/openslug-kernel-2.6.11.2/defconfig b/packages/linux/openslug-kernel-2.6.11.2/defconfig
index 15cac97e3e..c14c06c32c 100644
--- a/packages/linux/openslug-kernel-2.6.11.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.11.2/defconfig
@@ -474,7 +474,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_ETHERTAP is not set
 
 #
diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c b/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c
index 8e3ca894c4..d27b6732b0 100644
--- a/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c
+++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c
@@ -65,9 +65,9 @@
 
 #define VERSION			"0.1.7"
 
-#define N2RB_MAJOR		60
-#define N2PB_MAJOR		61
-#define	N2BZ_MAJOR		62
+#define N2RB_MAJOR		60		//rbuttons
+#define N2PB_MAJOR		61		//pbuttons
+#define	N2BZ_MAJOR		62		//buzzer
 #define N2LM_MAJOR		126
 
 #define N2PB_IRQ		22		//gpio5
@@ -176,6 +176,9 @@ static struct timer_list n2rb_timer;
 static struct timer_list n2pb_timer;
 static struct timer_list n2bz_timer;		//beeper
 
+// sysfs class
+static struct class_simple *n2lm_class;
+
 //==================================================================================================
 //
 // Blinking is handled entirely by the 4 timer handlers.  On timeout, the bit in the
@@ -693,22 +696,36 @@ static int __init n2iom_init(void)
 	printk(KERN_DEBUG "init_jiffy=%ld\n",init_jiffy);
 	n2iom_initarch();
 
+	n2lm_class = class_simple_create(THIS_MODULE, "nslu2");
+
 	if (register_chrdev(N2RB_MAJOR, "n2_rbm", &n2pb_fops) < NOERR) {
 		printk(KERN_DEBUG "Reset Button Major %d not available\n", N2RB_MAJOR);
 		return -EBUSY;
 	}
+	else {
+		class_simple_device_add(n2lm_class, MKDEV(N2RB_MAJOR, 0), NULL, "rbuttons");
+	}
 	if (register_chrdev(N2PB_MAJOR, "n2_pbm", &n2rb_fops) < NOERR) {
 		printk(KERN_DEBUG "Power Button Major %d not available\n", N2PB_MAJOR);
 		return -EBUSY;
 	}
+	else {
+		class_simple_device_add(n2lm_class, MKDEV(N2PB_MAJOR, 0), NULL, "pbuttons");
+	}
 	if (register_chrdev(N2LM_MAJOR, "n2_ledm", &n2lm_fops) < NOERR) {
 		printk(KERN_DEBUG "Led Manager Major %d not available\n", N2LM_MAJOR);
 		return -EBUSY;
 	}
+	else {
+		class_simple_device_add(n2lm_class, MKDEV(N2LM_MAJOR, 0), NULL, "leds");
+	}
 	if (register_chrdev(N2BZ_MAJOR, "n2_bzm", &n2bz_fops) < NOERR) {
 		printk(KERN_DEBUG "Buzzer Major %d not available\n", N2BZ_MAJOR);
 		return -EBUSY;
 	}
+	else {
+		class_simple_device_add(n2lm_class, MKDEV(N2BZ_MAJOR, 0), NULL, "buzzer");
+	}
 
 	if (request_irq(N2RB_IRQ, &n2rb_handler, SA_INTERRUPT, "n2_rb", NULL) < NOERR) {
 		printk(KERN_DEBUG "Reset Button IRQ %d not available\n", N2RB_IRQ);
@@ -732,14 +749,20 @@ static void __exit n2iom_exit(void)
 	del_timer(&n2rb_timer);
 	free_irq(N2RB_IRQ,NULL);
 	unregister_chrdev(N2PB_MAJOR, "n2pb");
+	class_simple_device_remove(MKDEV(N2PB_MAJOR, 0));
 	del_timer(&n2pb_timer);	
 	free_irq(N2PB_IRQ, NULL);
 	unregister_chrdev(N2RB_MAJOR, "n2rb" );
+	class_simple_device_remove(MKDEV(N2RB_MAJOR, 0));
 	del_timer(&n2lm_rsg_timer);
 	del_timer(&n2lm_rsr_timer);
 	del_timer(&n2lm_d1_timer);
 	del_timer(&n2lm_d2_timer);	
 	unregister_chrdev(N2LM_MAJOR, "n2lm" );
+	class_simple_device_remove(MKDEV(N2LM_MAJOR, 0));
+	unregister_chrdev(N2BZ_MAJOR, "n2bz");
+	class_simple_device_remove(MKDEV(N2BZ_MAJOR, 0));
+	class_simple_destroy(n2lm_class);
 }
 
 module_init (n2iom_init);
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 81bb5a0d0c..fa57b8eefe 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -10,6 +10,7 @@ OPENSLUG_DEVELOPMENT = "\
 	autoconf \
 	automake \
 	bash \
+	binutils \
 	bison \
 	bzip2 \
 	coreutils \
@@ -20,6 +21,7 @@ OPENSLUG_DEVELOPMENT = "\
 	gawk \
 	gcc \
 	gdb \
+	gnu-config \
 	grep \
 	lsof \
 	m4 \
@@ -43,7 +45,8 @@ OPENSLUG_PACKAGES = "\
 	atftp \
 	bash \
 	bluez-utils-nodbus bridge-utils \
-	coreutils cvs\
+	coreutils cron \
+	cvs\
 	dnsmasq \
 	expat \
 	ftpd-topfield \
@@ -51,6 +54,7 @@ OPENSLUG_PACKAGES = "\
 	miau microcom mt-daapd mysql \
 	nail \
 	openssh \
+	openvpn \
 	ppp puppy pwc \
 	rsync \
 	sudo sysfsutils \
@@ -75,7 +79,6 @@ OPENSLUG_PACKAGES_append_linux = "\
 	nfs-utils \
 	"
 BROKEN_PACKAGES = "\
-	cron \
 	mgetty \
 	"
 
diff --git a/packages/mysql/mysql_4.1.12.bb b/packages/mysql/mysql_4.1.12.bb
index d5e7948458..a1173158ee 100644
--- a/packages/mysql/mysql_4.1.12.bb
+++ b/packages/mysql/mysql_4.1.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The MySQL Open Source Database System"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "libs"
 DEPENDS += "ncurses mysql-native"
-PR = "r0"
+PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
@@ -13,8 +13,9 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRN
 
 inherit autotools
 
+
 EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'"
-EXTRA_OECONF = " --with-embedded-server "
+EXTRA_OECONF = " --with-embedded-server --prefix=/usr --datadir=/var/share --sysconfdir=/etc --localstatedir=/var/state --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
 
 do_stage() {
 	autotools_stage_includes
diff --git a/packages/openvpn/openvpn_2.0.bb b/packages/openvpn/openvpn_2.0.bb
index e67a99c9eb..5ea2e02d69 100644
--- a/packages/openvpn/openvpn_2.0.bb
+++ b/packages/openvpn/openvpn_2.0.bb
@@ -6,12 +6,14 @@ LICENSE = "GPLv2"
 PRIORITY = "optional"
 DEPENDS = "lzo openssl"
 RDEPENDS = "kernel-module-tun"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
 	file://openvpn"
 S = "${WORKDIR}/openvpn-${PV}"
 
+CFLAGS += "-fno-inline"
+
 inherit autotools
 
 do_install_append() {
diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb
index 0f18f4b1d4..d58b939399 100644
--- a/packages/samba/samba_3.0.14a.bb
+++ b/packages/samba/samba_3.0.14a.bb
@@ -1,21 +1,55 @@
-PR = "r1"
+PR = "r6"
 
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-	   file://${FILESDIR}/configure.patch;patch=1 \
-	   file://${FILESDIR}/cifs.patch;patch=1"
+# Ugly patch to hack configure.in to set the CPPFLAGS without actually checking for LFS support
+# For nslu2. Will probably work for forcing for other archs as well. 
+LFS_SRC_URI = ""
+LFS_SRC_URI_nslu2 = "file://configure.lfs.patch;patch=1"  
+
+SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+	   file://configure.patch;patch=1 \
+	   file://cifs.patch;patch=1 \
+	   ${LFS_SRC_URI} \
+	   file://init \
+	   "
 S := ${WORKDIR}/${P}/source
 
 include samba.inc
 
-EXTRA_OECONF += "--with-mandir=${mandir}"
+INITSCRIPT_NAME = "samba"
+# No dependencies, goes in at level 20 (NOTE: take care with the
+# level, later levels put the shutdown later too - see the links
+# in rc6.d, the shutdown must precede network shutdown).
+INITSCRIPT_PARAMS = "defaults"
+
+# The file system settings --foodir=dirfoo and overridden unconditionally
+# in the samba config by --with-foodir=dirfoo - even if the --with is not
+# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
+EXTRA_OECONF += "\
+	--with-configdir=${sysconfdir}/samba \
+	--with-privatedir=${sysconfdir}/samba/private \
+	--with-lockdir=${localstatedir}/lock \
+	--with-piddir=${localstatedir}/run \
+	--with-logfilebase=${localstatedir}/log \
+	--with-libdir=${libdir} \
+	--with-mandir=${mandir} \
+	--with-swatdir=${datadir}/swat \
+	"
 
 do_install_append() {
+	install -d "${D}${localstatedir}/log"
 	rm -f ${D}/sbin/mount.smbfs
 	rmdir ${D}/sbin
 	ln -sf smbmount ${D}${bindir}/mount.smbfs
+	install -d "${D}${sysconfdir}/init.d"
+	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
+	install -d "${D}${sysconfdir}/samba"
+	install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf.default
 }
 
 PACKAGES =+ "swat"
 
-FILES_swat = "${sbindir}/swat ${prefix}/swat ${libdir}/*.msg"
+FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
+#
+# bug fix for samba.inc:
+FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"