* Erik Andersen
| On Mon Nov 18, 2002 at 03:01:37AM +0100, Tollef Fog Heen wrote:
| > I've played about with busybox-cvs today and it seems to work fine,
| > especially having a half-decent shell is good when trying to debug
| > problems. However, it seems like udhcpc there is broken -- it
| > completely fails to send out any requests for leases, or there is
| > something eating them on the way.
|
| Hmm. Did you include an /usr/share/udhcpc/default.script file?
No, but it doesn't make any difference if I do. I just tested.
| > Also, getting the build system in busybox CVS updated to actually work
| > with the new configuration system would be good.. I could provide you
| > with patches tomorrow or so.
|
| I'm always willing to accept and review patches...
attached.
the udchpc change is for doing evil things with autoinstalls, but it
is not crucial yet.
--
Tollef Fog Heen ,''`.
UNIX is user friendly, it's just picky about who its friends are : :' :
`. `'
`-
? debian/config-deb
? debian/config-static
? debian/config-udeb
Index: debian/rules
===================================================================
RCS file: /var/cvs/busybox/debian/rules,v
retrieving revision 1.12
diff -u -r1.12 rules
--- debian/rules 8 Dec 2001 01:56:06 -0000 1.12
+++ debian/rules 18 Nov 2002 10:14:07 -0000
@@ -25,11 +25,13 @@
build: debian/build-stamp-busybox
debian/build-stamp-busybox:
dh_testdir
- mkdir -p $(bbbd)
- cp Makefile $(bbbd)
- cp debian/Config.h-deb $(bbbd)/Config.h
- -(cd $(bbbd); $(MAKE) "CONFIG_SRC_DIR=../../" applet_source_list)
- (cd $(bbbd); $(MAKE) USE_SYSTEM_PWD_GRP=false "CONFIG_SRC_DIR=../../")
+# mkdir -p $(bbbd)
+# cp Makefile $(bbbd)
+# cp Rules.mak $(bbbd)
+ cp debian/config-deb .config
+# -(cd $(bbbd); $(MAKE) "CONFIG_SRC_DIR=../../" busybox)
+ $(MAKE) USE_SYSTEM_PWD_GRP=false clean dep
+ $(MAKE) USE_SYSTEM_PWD_GRP=false busybox doc
touch debian/build-stamp-busybox
install: build
@@ -41,20 +43,19 @@
# This just installes the busybox binary...
#(cd $(bbbd); $(MAKE) "CONFIG_SRC_DIR=../../" "PREFIX=../../$(bb)" install)
mkdir -p $(bb)/bin/
- cp $(bbbd)/busybox $(bb)/bin/busybox
+ cp busybox $(bb)/bin/busybox
mkdir -p $(bb)/usr/share/doc/busybox/busybox.net
- cp $(bbbd)/docs/busybox.net/BusyBox.html
$(bb)/usr/share/doc/busybox/busybox.net/
+ cp docs/busybox.net/BusyBox.html $(bb)/usr/share/doc/busybox/busybox.net/
mkdir -p $(bb)/usr/share/man/man1
- cp $(bbbd)/docs/BusyBox.1 $(bb)/usr/share/man/man1/busybox.1
+ cp docs/BusyBox.1 $(bb)/usr/share/man/man1/busybox.1
# Now for the statically linked stuff
build-static: debian/build-stamp-busybox-static
debian/build-stamp-busybox-static:
dh_testdir
- mkdir -p $(bbsbd)
- cp Makefile $(bbsbd)
- cp debian/Config.h-static $(bbsbd)/Config.h
- (cd $(bbsbd); $(MAKE) DOSTATIC=true USE_SYSTEM_PWD_GRP=false
"CONFIG_SRC_DIR=../../")
+ cp debian/config-static .config
+ $(MAKE) DOSTATIC=true USE_SYSTEM_PWD_GRP=false clean dep
+ $(MAKE) DOSTATIC=true USE_SYSTEM_PWD_GRP=false busybox doc
touch debian/build-stamp-busybox-static
install-static: build
@@ -66,11 +67,11 @@
# This just installes the busybox binary...
#(cd $(bbsbd); $(MAKE) "CONFIG_SRC_DIR=../../" "PREFIX=../../$(bbs)" install)
mkdir -p $(bbs)/bin/
- cp $(bbsbd)/busybox $(bbs)/bin/busybox
+ cp busybox $(bbs)/bin/busybox
mkdir -p $(bbs)/usr/share/doc/busybox-static/busybox.net
- cp $(bbsbd)/docs/busybox.net/BusyBox.html
$(bbs)/usr/share/doc/busybox-static/busybox.net/
+ cp docs/busybox.net/BusyBox.html
+$(bbs)/usr/share/doc/busybox-static/busybox.net/
mkdir -p $(bbs)/usr/share/man/man1/
- cp $(bbsbd)/docs/BusyBox.1 $(bbs)/usr/share/man/man1/busybox.1
+ cp docs/BusyBox.1 $(bbs)/usr/share/man/man1/busybox.1
half_clean:
dh_testdir
@@ -91,10 +92,9 @@
build-udeb: debian/build-stamp-busybox-udeb
debian/build-stamp-busybox-udeb:
dh_testdir
- mkdir -p $(bbubd)
- cp Makefile $(bbubd)
- cp debian/Config.h-udeb $(bbubd)/Config.h
- (cd $(bbubd); $(MAKE) USE_SYSTEM_PWD_GRP=false "CONFIG_SRC_DIR=../../")
+ cp debian/config-udeb .config
+ $(MAKE) USE_SYSTEM_PWD_GRP=false "CONFIG_SRC_DIR=../../" clean dep
+ $(MAKE) USE_SYSTEM_PWD_GRP=false "CONFIG_SRC_DIR=../../" busybox
touch debian/build-stamp-busybox-udeb
install-udeb: build
@@ -102,9 +102,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- (cd $(bbubd); $(MAKE) "CONFIG_SRC_DIR=../../" "PREFIX=../../$(bbu)" install)
- mkdir -p $(bbu)/usr/share/man/man1/
- cp $(bbubd)/docs/BusyBox.1 $(bbu)/usr/share/man/man1/busybox.1
+ $(MAKE) "CONFIG_SRC_DIR=../../" "PREFIX=$(bbu)" install
three_quarter_clean:
dh_testdir
@@ -128,8 +126,8 @@
dh_testdir
dh_testroot
dh_installdirs
- dh_installdocs -p$@ $(bbbd)/docs/BusyBox.txt \
- $(bbbd)/docs/BusyBox.html docs/style-guide.txt \
+ dh_installdocs -p$@ docs/BusyBox.txt \
+ docs/BusyBox.html docs/style-guide.txt \
docs/busybox.net AUTHORS README TODO
rm -rf `find $(bb) -name CVS`
rm -f `find $(bb) -name .cvsignore`
@@ -150,8 +148,8 @@
dh_testdir
dh_testroot
dh_installdirs
- dh_installdocs -p$@ $(bbsbd)/docs/BusyBox.txt \
- $(bbsbd)/docs/BusyBox.html docs/style-guide.txt \
+ dh_installdocs -p$@ docs/BusyBox.txt \
+ docs/BusyBox.html docs/style-guide.txt \
docs/busybox.net AUTHORS README TODO
rm -rf `find $(bbs) -name CVS`
rm -f `find $(bbs) -name .cvsignore`
Index: networking/udhcp/options.c
===================================================================
RCS file: /var/cvs/busybox/networking/udhcp/options.c,v
retrieving revision 1.1
diff -u -r1.1 options.c
--- networking/udhcp/options.c 14 Oct 2002 21:41:27 -0000 1.1
+++ networking/udhcp/options.c 18 Nov 2002 10:14:07 -0000
@@ -43,6 +43,7 @@
{"message", OPTION_STRING, 0x38},
{"tftp", OPTION_STRING, 0x42},
{"bootfile", OPTION_STRING, 0x43},
+ {"url", OPTION_STRING, 0x72},
{"", 0x00, 0x00}
};
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
+++ debian/config-udeb 2002-11-18 00:01:55.000000000 +0100
@@ -0,0 +1,344 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# BusyBox general settings
+#
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_FEATURE_DEVFS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+
+#
+# Archival Utilities
+#
+# CONFIG_AR is not set
+# CONFIG_BUNZIP2 is not set
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_BZIP2 is not set
+CONFIG_FEATURE_TAR_EXCLUDE=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_OLD_FORMAT is not set
+# CONFIG_FEATURE_GNUTAR_LONG_FILENAME is not set
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNZIP is not set
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+CONFIG_CLEAR=y
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADACM is not set
+# CONFIG_LOADFONT is not set
+CONFIG_LOADKMAP=y
+# CONFIG_OPENVT is not set
+CONFIG_RESET=y
+# CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+# CONFIG_MKTEMP is not set
+CONFIG_READLINK=y
+# CONFIG_RUN_PARTS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+
+#
+# File Utilities
+#
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHGRP=y
+CONFIG_CP=y
+CONFIG_DD=y
+CONFIG_DF=y
+CONFIG_DU=y
+CONFIG_LN=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+# CONFIG_FEATURE_LS_COLOR is not set
+CONFIG_MKDIR=y
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SYNC=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+CONFIG_FEATURE_AUTOWIDTH=y
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+# CONFIG_FEATURE_FIND_XDEV is not set
+CONFIG_GREP=y
+# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+CONFIG_XARGS=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_REBOOT=y
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_CROND is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_DUTMP is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_MT is not set
+# CONFIG_STRINGS is not set
+# CONFIG_TIME is not set
+# CONFIG_UPDATE is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Module Utilities
+#
+# CONFIG_INSMOD is not set
+CONFIG_LSMOD=y
+# CONFIG_MODPROBE is not set
+# CONFIG_RMMOD is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_IFCONFIG is not set
+# CONFIG_IFUPDOWN is not set
+# CONFIG_IP is not set
+# CONFIG_IPCALC is not set
+# CONFIG_NC is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_NSLOOKUP is not set
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_ROUTE is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+# CONFIG_TELNETD is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_FEATURE_TFTP_DEBUG is not set
+# CONFIG_TRACEROUTE is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+
+#
+# udhcp Server/Client
+#
+# CONFIG_UDHCPD is not set
+CONFIG_UDHCPC=y
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCP_SYSLOG is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_PIDOF is not set
+CONFIG_PS=y
+# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
+# CONFIG_RENICE is not set
+# CONFIG_TOP is not set
+# CONFIG_UPTIME is not set
+
+#
+# Bourne Shell
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+CONFIG_ASH=y
+# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_ASH_ALIAS is not set
+# CONFIG_ASH_MATH_SUPPORT is not set
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
+# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
+# Shell Utilities
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CHROOT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DIRNAME=y
+CONFIG_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_LOGNAME is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+CONFIG_SLEEP=y
+# CONFIG_STTY is not set
+# CONFIG_TEE is not set
+CONFIG_TRUE=y
+CONFIG_TEST=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_USLEEP is not set
+# CONFIG_WATCH is not set
+# CONFIG_WHO is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# System Logging Utilities
+#
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+CONFIG_SYSLOGD=y
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+
+#
+# Text Utilities
+#
+CONFIG_CAT=y
+# CONFIG_CMP is not set
+CONFIG_CUT=y
+# CONFIG_DOS2UNIX is not set
+CONFIG_HEAD=y
+# CONFIG_LENGTH is not set
+CONFIG_MD5SUM=y
+# CONFIG_OD is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_REVERSE=y
+CONFIG_FEATURE_SORT_UNIQUE=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TR=y
+CONFIG_UNIQ=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+# CONFIG_FBSET is not set
+# CONFIG_FDFLUSH is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_GETOPT is not set
+# CONFIG_HEXDUMP is not set
+# CONFIG_HWCLOCK is not set
+# CONFIG_LOSETUP is not set
+CONFIG_MKSWAP=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_AUTOWIDTH=y
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+CONFIG_SWAPONOFF=y
+CONFIG_MOUNT=y
+CONFIG_NFSMOUNT=y
+# CONFIG_FEATURE_USE_DEVPS_PATCH is not set
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_MOUNT_FORCE is not set
+# CONFIG_FEATURE_MOUNT_LOOP is not set
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
