Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/04 18:19:08+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/01/04 18:18:43+00:00 (none)!cwiiis
Update matchbox packages to latest versions.

2005/01/04 18:17:57+00:00 (none)!cwiiis
Update patch in gpe-login to reflect device name changes.

2005/01/04 18:54:22+01:00 (none)!br1
nylon-scripts update

2005/01/04 18:53:56+01:00 (none)!br1
busybox: use syslog.conf file for configuring syslog

2005/01/04 18:53:02+01:00 (none)!br1
ntpdate (nylon): run ntpdate per cron job

2005/01/04 18:51:02+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/01/03 19:22:49+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/01/03 19:22:15+01:00 (none)!br1
libcgicc: add do_stage

BKrev: 41dae30bdaCaSnKAzfQ6vY7Ve8o7fw

3 files changed, 80 insertions, 9 deletions

diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 528a32b852..faf3327ab2 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -31,7 +31,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://busybox-udhcpd \
 	   file://syslog \
            file://hwclock.sh \
-	   file://default.script"
+	   file://default.script \
+	   file://syslog.conf"
 	   
 S = "${WORKDIR}/busybox-${PV}"
 
@@ -57,23 +58,24 @@ do_compile () {
 do_install () {
 	install -d ${D}/etc/init.d
 	oe_runmake 'PREFIX=${D}' install
-	install -m 0755 ${WORKDIR}/syslog ${D}/etc/init.d/
+	install -m 0755 ${WORKDIR}/syslog ${D}/${sysconfdir}/init.d/
+	install -m 644 ${WORKDIR}/syslog.conf ${D}/${sysconfdir}/
 	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/busybox-cron ${D}/etc/init.d/
+		install -m 0755 ${WORKDIR}/busybox-cron ${D}/${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/busybox-httpd ${D}/etc/init.d/
+		install -m 0755 ${WORKDIR}/busybox-httpd ${D}/${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}/etc/init.d/
+		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}/${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh
+		install -m 0755 ${WORKDIR}/hwclock.sh ${D}/${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then 
-		install -d ${D}/etc/udhcpc.d
+		install -d ${D}/${sysconfdir}/udhcpc.d
 		install -d ${D}${datadir}/udhcpc
-		install -m 0755 ${S}/examples/udhcp/simple.script ${D}/etc/udhcpc.d/50default
+		install -m 0755 ${S}/examples/udhcp/simple.script ${D}/${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 	fi
 }
diff --git a/packages/busybox/files/syslog b/packages/busybox/files/syslog
index e69de29bb2..44698c5ce2 100644
--- a/packages/busybox/files/syslog
+++ b/packages/busybox/files/syslog
@@ -0,0 +1,69 @@
+#! /bin/sh
+#
+# syslog	init.d script for busybox syslogd/klogd
+#		Written by Robert Griebl <sandman@handhelds.org>
+#               Configuration file added by <bruno.randolf@4g-systems.biz>
+set -e
+
+if [ -f /etc/syslog.conf ]; then
+	. /etc/syslog.conf
+	LOG_LOCAL=0
+	LOG_REMOTE=0
+	for D in $DESTINATION; do
+		if [ "$D" == "buffer" ]; then
+			SYSLOG_ARGS="$SYSLOG_ARGS -C $BUFFERSIZE"
+			LOG_LOCAL=1
+		elif [ "$D" == "file" ]; then
+			if [ -n "$LOGFILE" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
+			fi
+			if [ -n "$ROTATESIZE" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -s $ROTATESIZE"
+			fi
+			if [ -n "$ROTATEGENS" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
+			fi
+			LOCAL=0
+		elif [ "$D" == "remote" ]; then
+			SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
+			LOG_REMOTE=1
+		fi
+	done
+	if (( $LOG_LOCAL && $LOG_REMOTE )); then 
+		SYSLOG_ARGS="$SYSLOG_ARGS -L"
+	fi
+	if [ -n "$MARKINT" ]; then
+		SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT"
+	fi
+	if [ "$REDUCE" == "yes" ]; then
+		SYSLOG_ARGS="$SYSLOG_ARGS -S"
+	fi
+else
+	# default: log to 16K shm circular buffer
+	SYSLOG_ARGS="-C"
+fi
+
+case "$1" in
+  start)
+	echo -n "Starting syslogd/klogd: "
+	start-stop-daemon -S -b -n syslogd -a /sbin/syslogd -- -n $SYSLOG_ARGS
+	start-stop-daemon -S -b -n klogd -a /sbin/klogd -- -n
+	echo "done"
+	;;
+  stop)
+	echo -n "Stopping syslogd/klogd: "
+	start-stop-daemon -K -n syslogd
+	start-stop-daemon -K -n klogd
+	echo "done"
+	;;
+  restart)
+  	$0 stop
+	$0 start
+	;;
+  *)
+	echo "Usage: syslog { start | stop | restart }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/files/syslog.conf