Merge bk://openembedded@openembedded.bkbits.net/packages

into null.(none):/data/mtx/oe/oe.write/packages

2004/09/23 11:55:05+02:00 (none)!br1
moved nylon defconfig into busybox-1.00-rc3
added init scripts for cron and httpd
moved init scripts into files/

BKrev: 41529d931m_9LTwcHDj4AF1Og5T-BQ

diff --git a/busybox/busybox-1.00-rc1/hwclock.sh b/busybox/busybox-1.00-rc1/hwclock.sh
deleted file mode 100644 (file)
index 5acfb9f..0000000
--- a/busybox/busybox-1.00-rc1/hwclock.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# hwclock.sh Set system clock to hardware clock, according to the UTC
-#               setting in /etc/default/rcS (see also rcS(5)).
-#
-# WARNING:      If your hardware clock is not in UTC/GMT, this script
-#               must know the local time zone. This information is
-#               stored in /etc/localtime. This might be a problem if
-#               your /etc/localtime is a symlink to something in
-#               /usr/share/zoneinfo AND /usr isn't in the root
-#               partition! The workaround is to define TZ either
-#               in /etc/default/rcS, or in the proper place below.
-
-[ ! -x /sbin/hwclock ] && exit 0
-
-. /etc/default/rcS
-
-case "$1" in
-        start)
-                if [ "$VERBOSE" != no ]
-                then
-                        echo "System time was `date`."
-                        echo "Setting the System Clock using the Hardware Clock as reference..."
-                fi
-
-               if [ "$HWCLOCKACCESS" != no ]
-               then
-                       if [ -z "$TZ" ]
-                       then
-                          hwclock --hctosys
-                       else
-                          TZ="$TZ" hwclock --hctosys
-                       fi
-               fi
-
-                if [ "$VERBOSE" != no ]
-                then
-                        echo "System Clock set. System local time is now `date`."
-                fi
-                ;;
-        stop|restart|reload|force-reload)
-               #
-               # Updates the Hardware Clock with the System Clock time.
-               # This will *override* any changes made to the Hardware Clock.
-               #
-               # WARNING: If you disable this, any changes to the system
-               #          clock will not be carried across reboots.
-               #
-               if [ "$VERBOSE" != no ]
-               then
-                       echo "Saving the System Clock time to the Hardware Clock..."
-               fi
-               if [ "$HWCLOCKACCESS" != no ]
-               then
-                       hwclock --systohc
-               fi
-               if [ "$VERBOSE" != no ]
-               then
-                       echo "Hardware Clock updated to `date`."
-               fi
-                exit 0
-                ;;
-       show)
-               if [ "$HWCLOCKACCESS" != no ]
-               then
-                       hwclock --show
-               fi
-               ;;
-        *)
-                echo "Usage: hwclock.sh {start|stop|show|reload|restart}" >&2
-               echo "       start sets kernel (system) clock from hardware (RTC) clock" >&2
-               echo "       stop and reload set hardware (RTC) clock from kernel (system) clock" >&2
-                exit 1
-                ;;
-esac

diff --git a/busybox/busybox-1.00-rc1/postinst b/busybox/busybox-1.00-rc1/postinst
deleted file mode 100644 (file)
index 36d8190..0000000
--- a/busybox/busybox-1.00-rc1/postinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/busybox ash
-
-action="$1"
-oldversion="$2"
-
-umask 022
-
-if /bin/busybox [ "$action" != configure ]
-then
-       exit 0
-fi
-
-. /etc/default/functions
-
-setup_init_hwclock() {
-       updatercd hwclock.sh start 50 S . stop 25 0 1 6 .
-       /etc/init.d/hwclock.sh restart
-}
-
-/bin/busybox ash /usr/bin/update-alternatives --install /bin/vi vi /bin/busybox 100
-/bin/busybox ash /usr/bin/update-alternatives --install /bin/sh sh /bin/busybox 100
-
-setup_init_hwclock
-
-exit 0

diff --git a/busybox/busybox-1.00-rc1/prerm b/busybox/busybox-1.00-rc1/prerm
deleted file mode 100644 (file)
index 7ade4b1..0000000
--- a/busybox/busybox-1.00-rc1/prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" != "upgrade" ]; then
-  update-alternatives --remove sh /bin/busybox
-  update-alternatives --remove vi /bin/busybox
-  find /etc -name [SK][0-9][0-9]hwclock.sh | xargs rm -f
-  find /etc -name [SK][0-9][0-9]syslog | xargs rm -f
-fi
-
-exit 0

diff --git a/busybox/busybox-1.00-rc1/syslog b/busybox/busybox-1.00-rc1/syslog
deleted file mode 100644 (file)
index 5c46a28..0000000
--- a/busybox/busybox-1.00-rc1/syslog
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-#
-# syslog       init.d script for busybox syslogd/klogd
-#              Written by Robert Griebl <sandman@handhelds.org>
-#
-
-# log to remote host
-# SYSLOG_ARGS="-R remote.host"
-
-# log to 16K shm circular buffer
-SYSLOG_ARGS="-C"
-
-set -e
-
-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"
-       ;;
-  *)
-       echo "Usage: syslog {start|stop}" >&2
-       exit 1
-       ;;
-esac
-
-exit 0

diff --git a/busybox/files/nylon/defconfig b/busybox/busybox-1.00-rc3/nylon/defconfig
similarity index 100%
rename from busybox/files/nylon/defconfig
rename to busybox/busybox-1.00-rc3/nylon/defconfig

diff --git a/busybox/busybox_1.00-rc3.oe b/busybox/busybox_1.00-rc3.oe
index 318cb76..2c84dc0 100644 (file)
--- a/busybox/busybox_1.00-rc3.oe
+++ b/busybox/busybox_1.00-rc3.oe
@@ -10,7 +10,7 @@ system."
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 #      file://busybox-1.00-pre10-fuser.patch;patch=1
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -18,9 +18,13 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
            file://bb-iproute-iftunnel.patch;patch=1 \
            file://defconfig \
-           file://syslog \
+           file://cron \
+          file://httpd \
+          file://syslog \
            file://hwclock.sh"
+          
 S = "${WORKDIR}/busybox-${PV}"
+
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 FILES_${PN} += " ${datadir}/udhcpc"
@@ -43,6 +47,8 @@ do_compile () {
 do_install () {
        install -d ${D}/etc/init.d
        oe_runmake 'PREFIX=${D}' install
+       install -m 0755 ${WORKDIR}/syslog ${D}/etc/init.d/cron
+       install -m 0755 ${WORKDIR}/syslog ${D}/etc/init.d/httpd
        install -m 0755 ${WORKDIR}/syslog ${D}/etc/init.d/syslog
        install -m 0755 ${WORKDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh
        install -d ${D}${datadir}/udhcpc

diff --git a/busybox/busybox-1.00-rc3/hwclock.sh b/busybox/files/cron
similarity index 100%
rename from busybox/busybox-1.00-rc3/hwclock.sh
rename to busybox/files/cron

diff --git a/busybox/busybox-1.00-rc3/postinst b/busybox/files/httpd
similarity index 100%
rename from busybox/busybox-1.00-rc3/postinst
rename to busybox/files/httpd

diff --git a/busybox/busybox-1.00-rc3/prerm b/busybox/files/hwclock.sh
similarity index 100%
rename from busybox/busybox-1.00-rc3/prerm
rename to busybox/files/hwclock.sh

diff --git a/busybox/busybox-1.00-rc3/syslog b/busybox/files/postinst
similarity index 100%
rename from busybox/busybox-1.00-rc3/syslog
rename to busybox/files/postinst

diff --git a/busybox/files/prerm b/busybox/files/prerm
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/busybox/files/syslog b/busybox/files/syslog
new file mode 100644 (file)
index 0000000..e69de29