diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-24 01:00:38 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-24 01:00:38 +0000 |
commit | b38c6f540cde72d33c16c013c2cc84048d2669aa (patch) | |
tree | 376a1c751c5195bb2bcf3527798c576f370899de /busybox | |
parent | fc5a7abd2309ea71337e25a0aaf90e5f62b3cbd8 (diff) |
Merge openembedded@openembedded.bkbits.net:packages-devel
into odin.sc.ti.com:/home/kergoth/code/packages
2004/11/23 18:59:39-06:00 ti.com!kergoth
Merge http://openembedded.bkbits.net/packages
into odin.sc.ti.com:/home/kergoth/code/packages
2004/11/23 21:49:05+01:00 (none)!br1
nylon: add ifplugd and mtx-1 kernel 2.4.27
2004/11/23 21:46:51+01:00 (none)!br1
ifplugd 0.25 and libdaemon 0.6
2004/11/23 19:07:21+00:00 cambridgebroadband.com!rjt
various stuff
2004/11/23 18:20:48+00:00 cambridgebroadband.com!rjt
busybox-udhcpd:
refernce start-stop-daemon directly
2004/11/23 17:55:14+00:00 cambridgebroadband.com!rjt
netkit-tftpd_0.17.oe:
bk cp netkit-tftp_0.17.oe netkit-tftpd_0.17.oe
mconfig.patch:
bk cp ../netkit-ftp/netkit-ftp-0.17/mconfig.patch netkit-tftp-0.17/mconfig.patch
netkit-tftp_0.17.oe:
bk cp ../netkit-ftp/netkit-ftp_0.17.oe netkit-tftp_0.17.oe
busybox_1.00.oe:
reved for new defconfig
defconfig:
make udhcpd
udhcp_0.9.8.oe:
bk cp ../dhcpcd/dhcpcd_1.3.22-pl4.oe udhcp_0.9.8.oe
netkit-ftp_0.17.oe, udhcp_0.9.8.oe:
The mother of all section fixes
Remove remnant manual 'virtual/libc' DEPENDS.
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
RDEPENDS cleanup
netkit-ftp_0.17.oe:
Another pass of cleanups..
netkit-ftp_0.17.oe, udhcp_0.9.8.oe:
Another cleanup pass.
Add a ton of missing package descriptions.
udhcp_0.9.8.oe:
First pass of .oe file cleanups.
netkit-ftp_0.17.oe:
Remove unnecessary sets of the S variable, we have a sane default for that now.
udhcp_0.9.8.oe, netkit-tftpd_0.17.oe, netkit-tftp_0.17.oe, mconfig.patch:
new file
netkit-ftp_0.17.oe:
Rename: netkit-ftp/netkit-ftp-0.17.oe -> netkit-ftp/netkit-ftp_0.17.oe
mconfig.patch:
mvdir
netkit-ftp-0.17.oe:
Rename: netkit/netkit-ftp-0.17.oe -> netkit-ftp/netkit-ftp-0.17.oe
Rename: content/netkit-ftp-0.17.oe -> netkit/netkit-ftp-0.17.oe
netkit-tftpd_0.17.oe, netkit-tftp_0.17.oe:
Remove unnecessary 'set -e' instances, since the default is now set -e.
2004/11/23 16:29:35+01:00 (none)!br1
updated mtx-1 kernel 2.4.27
2004/11/05 12:25:23+00:00 cambridgebroadband.com!rjt
Merge openembedded@openembedded.bkbits.net:packages
into flotta.cambridgebroadband.com:/development/openembedded/packages
2004/11/04 16:29:41+00:00 cambridgebroadband.com!rjt
Merge openembedded@openembedded.bkbits.net:packages
into flotta.cambridgebroadband.com:/development/openembedded/packages
2004/11/04 16:18:43+00:00 cambridgebroadband.com!rjt
added patches to fix tosa keyboard and tosa touchscreen.
Tosa keyboard driver has been reimplemented to be similar to collie.
Tosa touchscreen driver was just completely braindead and you couldn't open it
and then close it. I reworked quite a bit of it to make it sane
2004/11/01 13:09:01+00:00 cambridgebroadband.com!rjt
Merge openembedded@openembedded.bkbits.net:packages
into flotta.cambridgebroadband.com:/development/openembedded/packages
2004/11/01 12:21:41+00:00 cambridgebroadband.com!rjt
librsvg_2.6.5.oe:
removed what cwiis did, cos it broke my system
2004/11/01 11:27:02+00:00 cambridgebroadband.com!rjt
added gpe-image-blank-user
BKrev: 41a3dd36Z3R0_csTYJCYdSr1MPXe_g
Diffstat (limited to 'busybox')
-rw-r--r-- | busybox/busybox-1.00/defconfig | 2 | ||||
-rw-r--r-- | busybox/busybox_1.00.oe | 2 | ||||
-rw-r--r-- | busybox/files/busybox-udhcpd | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/busybox/busybox-1.00/defconfig b/busybox/busybox-1.00/defconfig index 06c56d3118..49d7b21420 100644 --- a/busybox/busybox-1.00/defconfig +++ b/busybox/busybox-1.00/defconfig @@ -352,7 +352,7 @@ CONFIG_FEATURE_WGET_IP6_LITERAL=y # # udhcp Server/Client # -# CONFIG_UDHCPD is not set +CONFIG_UDHCPD=y CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set diff --git a/busybox/busybox_1.00.oe b/busybox/busybox_1.00.oe index 63e4a7cd05..74de8835da 100644 --- a/busybox/busybox_1.00.oe +++ b/busybox/busybox_1.00.oe @@ -11,7 +11,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r5" +PR = "r6" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ diff --git a/busybox/files/busybox-udhcpd b/busybox/files/busybox-udhcpd index 71a87afeab..c43903e8dc 100644 --- a/busybox/files/busybox-udhcpd +++ b/busybox/files/busybox-udhcpd @@ -15,12 +15,12 @@ case "$1" in echo "error: /etc/udhcpd.conf is missing." exit 1 fi - start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS + /sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS echo "done." ;; stop) echo -n "stopping $DESC: $NAME... " - start-stop-daemon -K -n $NAME + /sbin/start-stop-daemon -K -n $NAME echo "done." ;; restart) |