summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-04 18:40:11 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-04 18:40:11 +0000
commitad4c18503374b2c0fe7767ebaf726cdf599d5476 (patch)
treeff7d6b08d675373c7283416fbdc99322818fa43a
parentbf59669373415ba79647857d3729ebe1409c9db6 (diff)
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
-rw-r--r--packages/busybox/busybox_1.00.bb20
-rw-r--r--packages/busybox/files/syslog69
-rw-r--r--packages/busybox/files/syslog.conf0
-rw-r--r--packages/gpe-login/files/user-own-collie-devs.patch33
-rw-r--r--packages/gpe-login/gpe-login_0.74.bb16
-rw-r--r--packages/gpe-login/gpe-login_0.75.bb14
-rw-r--r--packages/libcgicc/libcgicc_3.2.3.bb15
-rw-r--r--packages/libmatchbox/files/check.m40
-rw-r--r--packages/libmatchbox/libmatchbox_1.5.bb0
-rw-r--r--packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb0
-rw-r--r--packages/matchbox-common/matchbox-common_0.9.bb0
-rw-r--r--packages/matchbox-desktop/matchbox-desktop_0.9.bb0
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.bb0
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.bb0
-rw-r--r--packages/ntp/ntp_4.1.2.bb16
-rw-r--r--packages/nylon/nylon-scripts_cvs.bb22
16 files changed, 190 insertions, 15 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
diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch
index e69de29bb2..c45fa06369 100644
--- a/packages/gpe-login/files/user-own-collie-devs.patch
+++ b/packages/gpe-login/files/user-own-collie-devs.patch
@@ -0,0 +1,33 @@
+diff -urNd ../gpe-login-0.73-r1/gpe-login-0.73/X11/gpe-login.pre-session gpe-login-0.73/X11/gpe-login.pre-session
+--- ../gpe-login-0.73-r1/gpe-login-0.73/X11/gpe-login.pre-session 2004-01-17 11:24:23.000000000 +0000
++++ gpe-login-0.73/X11/gpe-login.pre-session 2004-09-17 13:07:56.000000000 +0100
+@@ -6,10 +6,18 @@
+ chown $USER /dev/sound/dsp
+ fi
+
++if [ -e /dev/dsp ]; then
++chown $USER /dev/dsp
++fi
++
+ if [ -e /dev/sound/mixer ]; then
+ chown $USER /dev/sound/mixer
+ fi
+
++if [ -e /dev/mixer ]; then
++chown $USER /dev/mixer
++fi
++
+ if [ -e /dev/touchscreen/0raw ]; then
+ chown $USER /dev/touchscreen/0raw
+ fi
+@@ -18,6 +26,10 @@
+ chown $USER /dev/touchscreen/0
+ fi
+
++if [ -e /dev/collie-fl ]; then
++chown $USER /dev/sharp_fl
++fi
++
+ if [ -e /dev/misc/buzzer ]; then
+ chown $USER /dev/misc/buzzer
+ fi
diff --git a/packages/gpe-login/gpe-login_0.74.bb b/packages/gpe-login/gpe-login_0.74.bb
index e69de29bb2..5a399aaf6b 100644
--- a/packages/gpe-login/gpe-login_0.74.bb
+++ b/packages/gpe-login/gpe-login_0.74.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL"
+inherit gpe
+
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd"
+RPROVIDES = "gpe-session-starter"
+PR = "r3"
+
+SRC_URI += "file://user-own-collie-devs.patch;patch=1 \
+ file://pre-session-ramdisk.patch;patch=1"
diff --git a/packages/gpe-login/gpe-login_0.75.bb b/packages/gpe-login/gpe-login_0.75.bb
index e69de29bb2..5abc838e1b 100644
--- a/packages/gpe-login/gpe-login_0.75.bb
+++ b/packages/gpe-login/gpe-login_0.75.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd"
+RPROVIDES = "gpe-session-starter"
+PR = "r1"
+
+SRC_URI += "file://user-own-collie-devs.patch;patch=1 \
+ file://pre-session-ramdisk.patch;patch=1"
diff --git a/packages/libcgicc/libcgicc_3.2.3.bb b/packages/libcgicc/libcgicc_3.2.3.bb
index e69de29bb2..5e9c9acff1 100644
--- a/packages/libcgicc/libcgicc_3.2.3.bb
+++ b/packages/libcgicc/libcgicc_3.2.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "a C++ class library for writing CGI applications"
+HOMEPAGE = "http://www.cgicc.org/"
+LICENSE = "LGPL"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+
+SRC_URI = "http://www.cgicc.org/files/cgicc-${PV}.tar.bz2"
+S = "${WORKDIR}/cgicc-${PV}"
+
+inherit autotools
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/cgicc
+ cp --dereference -R cgicc/*.h ${STAGING_INCDIR}/cgicc
+ oe_libinstall -C cgicc libcgicc ${STAGING_LIBDIR}
+}
diff --git a/packages/libmatchbox/files/check.m4 b/packages/libmatchbox/files/check.m4
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmatchbox/files/check.m4
diff --git a/packages/libmatchbox/libmatchbox_1.5.bb b/packages/libmatchbox/libmatchbox_1.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmatchbox/libmatchbox_1.5.bb
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
diff --git a/packages/matchbox-common/matchbox-common_0.9.bb b/packages/matchbox-common/matchbox-common_0.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-common/matchbox-common_0.9.bb
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.bb
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.bb b/packages/matchbox-panel/matchbox-panel_0.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel_0.9.bb
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm_0.9.bb
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index 97bd23b196..dba8632893 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "ntp"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV}.tar.gz \
file://configure.patch;patch=1 \
@@ -26,3 +26,17 @@ do_install_append() {
install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d
}
+
+pkg_postinst_ntpdate_nylon() {
+#!/bin/sh
+if test "x$D" == "x"; then
+ mkdir -p /etc/cron/crontabs
+ if ! grep -q ntpdate /etc/cron/crontabs/root; then
+ echo "adding crontab"
+ echo "30 * * * * /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
+ fi
+ update-rc.d -s busybox-cron defaults
+fi
+update-rc.d -s ntpdate defaults 30
+}
+ \ No newline at end of file
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index abec70fc8a..923ae89d45 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -16,22 +16,34 @@ do_install() {
pkg_postinst() {
#!/bin/sh
-update-rc.d hostap defaults 15
+update-rc.d hostap defaults 14
+update-rc.d bridge defaults 15
update-rc.d ipaliases defaults 16
update-rc.d firewall defaults 20
update-rc.d routing defaults 20
-update-rc.d dummydate start 50 S . stop 50 0 6 .
update-rc.d emergency-ip defaults 98
+update-rc.d flash-backup start 38 S . stop 38 0 6 .
+update-rc.d dummydate start 50 S . stop 50 0 6 .
+if test "x$D" == "x"; then
+ mkdir -p /etc/cron/crontabs
+ if ! grep -q flash-backup /etc/cron/crontabs/root; then
+ echo "adding crontab"
+ echo "0 * * * * /etc/init.d/flash-backup backup" >> /etc/cron/crontabs/root
+ fi
+ update-rc.d -s busybox-cron defaults
+fi
}
pkg_postrm() {
#!/bin/sh -e
+update-rc.d hostap remove
+update-rc.d bridge remove
update-rc.d ipaliases remove
update-rc.d firewall remove
-update-rc.d hostap remove
update-rc.d routing remove
-update-rc.d dummydate remove
update-rc.d emergency-ip remove
+update-rc.d flash-backup remove
+update-rc.d dummydate remove
}
-CONFFILES_${PN} = "/etc/nylon/configip.conf /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/macfilter.list /etc/nylon/route.list"
+CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/bridge.conf /etc/nylon/configip.conf /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/macfilter.list /etc/nylon/route.list"