aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-09-25 21:28:07 +0000
committerEric Andersen <andersen@codepoet.org>2000-09-25 21:28:07 +0000
commitcaffb6eff0e33a80da630963f21346c21186da39 (patch)
tree7030b62784c0c8bb991af653f64d7888c802245d
parentc5949f62e533a821593337f7698d53eec8674bb1 (diff)
downloadbusybox-w32-caffb6eff0e33a80da630963f21346c21186da39.tar.gz
busybox-w32-caffb6eff0e33a80da630963f21346c21186da39.tar.bz2
busybox-w32-caffb6eff0e33a80da630963f21346c21186da39.zip
Gratuitously changed the file "busybox.defs.h" to the more
sensible and noticable "Config.h". -Erik
Diffstat
-rw-r--r--Changelog38
-rw-r--r--Config.h (renamed from busybox.def.h)0
-rw-r--r--Config.h.Hurd (renamed from busybox.def.h.Hurd)2
-rw-r--r--Makefile6
-rw-r--r--README2
-rw-r--r--TODO354
-rwxr-xr-xapplets/busybox.mkll2
-rwxr-xr-xapplets/busybox.sh2
-rwxr-xr-xbusybox.mkll2
-rwxr-xr-xbusybox.sh2
-rw-r--r--busybox.spec2
-rw-r--r--examples/busybox.spec2
-rw-r--r--internal.h2
13 files changed, 37 insertions, 379 deletions
diff --git a/Changelog b/Changelog
index a605a1c62..b374845ed 100644
--- a/Changelog
+++ b/Changelog
@@ -1,33 +1,39 @@
10.47 10.47
2 2
3 * Tons of bugfixes.
4 * A bug in syslogd was fixed that allowed it to potentially fork-bomb 3 * A bug in syslogd was fixed that allowed it to potentially fork-bomb
5 your system. 4 your system.
5 * Renamed busybox.defs.h to the more sensible "Config.h"
6 * Improved portability between different libcs.
7 * Many apps ported to use getopt()
8 * Common handling of '--help'
9 * All usage messages centralized.
10 * Added a bunch of new commands:
11 * 'rdate' contributed by Sterling Huxley <sterling@europa.com>
12 * 'wget' contributed by Chip Rosenthal <chip@unicom.com>,
13 <crosenth@covad.com> and Covad Communications
14 * 'getopt' from "Alfred M. Szmidt" <ams@trillian.itslinux.org>
15 * dos2unix, unix2dos, reset, and unrpm.c (and lots of help
16 debugging) thanks to robotti@metconnect.com.
17 * 'renice' command, thanks to Dave Cinege <dcinege@psychosis.com>
18 * 'xargs' (written by me)
19 * 'expr' contributed by Edward Betts <edward@debian.org>, based
20 on GNY expr
21 * lsmod now uses the query_module syscall, rather then /proc (me)
22 * syslogd can now log messages to remote hosts -- patch thanks
23 to Gyepi Sam <gyepi@praxis-sw.com>
6 * chroot can now call the builtin shell - Pavel Roskin <proski@gnu.org> 24 * chroot can now call the builtin shell - Pavel Roskin <proski@gnu.org>
7 * added 'renice' command, thanks to Dave Cinege <dcinege@psychosis.com>
8 * 'make install' now creates relative symlinks, and added a new 25 * 'make install' now creates relative symlinks, and added a new
9 'make install-hardlinks' target to (tada) install hardlinks. 26 'make install-hardlinks' target to (tada) install hardlinks.
10 * syslogd can now log messages to remote hosts -- patch thanks
11 to Gyepi Sam <gyepi@praxis-sw.com>
12 * Rewrite of 'tail' to make it simpler, smaller, and more robust. 27 * Rewrite of 'tail' to make it simpler, smaller, and more robust.
13 It now weighs only 2.25k (3k when full featured). The code is 28 It now weighs only 2.25k (3k when full featured). The code is
14 cleaner too, thanks to Allen Soard <esp-software@mail.hypermart.net> 29 cleaner too, thanks to Allen Soard <esp-software@mail.hypermart.net>
15 * Add optional ls file sorting, thanks to a patch from 30 * Add optional ls file sorting, thanks to a patch from
16 Sterling Huxley <sterling@europa.com> 31 Sterling Huxley <sterling@europa.com>
17 * Added 'rdate' command from Sterling Huxley <sterling@europa.com>
18 * Added 'wget' command, contributed by Chip Rosenthal <chip@unicom.com>,
19 <crosenth@covad.com> and Covad Communications
20 * Added 'getopt' from "Alfred M. Szmidt" <ams@trillian.itslinux.org>
21 * Added dos2unix, unix2dos, and unrpm.c thanks to robotti@metconnect.com.
22 * Added xargs (written by me)
23 * lsmod now uses the query_module syscall, rather then /proc (me)
24 * Fixed chmod option parsing so things like 'chmod -r /tmp/file' 32 * Fixed chmod option parsing so things like 'chmod -r /tmp/file'
25 wouldn't work (since it thought -r was an option). Doh! 33 now work (previously it thought -r was an option). Doh!
26 * Fixed tar handling of stdin and stdout 34 * Fixed tar handling of stdin and stdout
27 * Many apps ported to use getopt() 35 * Preliminary support for GNU HURD.
28 * All usage messages centralized. 36 * Tons of other bugfixes.
29 * Common handling of '--help'
30 * Improved portability between different libcs.
31 37
32 38
33 -Erik Andersen 39 -Erik Andersen
diff --git a/busybox.def.h b/Config.h
index a376deead..a376deead 100644
--- a/busybox.def.h
+++ b/Config.h
diff --git a/busybox.def.h.Hurd b/Config.h.Hurd
index cfd687376..60a5c6e21 100644
--- a/busybox.def.h.Hurd
+++ b/Config.h.Hurd
@@ -1,7 +1,7 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2 2
3// NOTE: This file only defines features usefull under the Hurd, 3// NOTE: This file only defines features usefull under the Hurd,
4// To compile for the Hurd raname this to busybox.def.h prior to make 4// To compile for the Hurd raname this to Config.h prior to make
5 5
6// This file defines the feature set to be compiled into busybox. 6// This file defines the feature set to be compiled into busybox.
7// When you turn things off here, they won't be compiled in at all. 7// When you turn things off here, they won't be compiled in at all.
diff --git a/Makefile b/Makefile
index 15d13c58c..469539095 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
19# 19#
20 20
21PROG := busybox 21PROG := busybox
22VERSION := 0.47pre 22VERSION := 0.47
23BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z") 23BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
24export VERSION 24export VERSION
25 25
@@ -173,11 +173,11 @@ busybox: $(OBJECTS)
173 $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES) 173 $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
174 $(STRIP) 174 $(STRIP)
175 175
176busybox.links: busybox.def.h 176busybox.links: Config.h
177 - ./busybox.mkll | sort >$@ 177 - ./busybox.mkll | sort >$@
178 178
179nfsmount.o cmdedit.o: %.o: %.h 179nfsmount.o cmdedit.o: %.o: %.h
180$(OBJECTS): %.o: busybox.def.h internal.h %.c Makefile 180$(OBJECTS): %.o: Config.h internal.h %.c Makefile
181 181
182utility.o: loop.h 182utility.o: loop.h
183 183
diff --git a/README b/README
index 17e7722a6..8d1845ab3 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ it also makes an excellent environment for any small or embedded system.
20As of version 0.20 there is a version number. : ) Also as of version 0.20, 20As of version 0.20 there is a version number. : ) Also as of version 0.20,
21BusyBox is now modularized to easily allow you to build only the components you 21BusyBox is now modularized to easily allow you to build only the components you
22need, thereby reducing binary size. To turn off unwanted Busybox components, 22need, thereby reducing binary size. To turn off unwanted Busybox components,
23simply edit the file busybox.def.h and comment out the components you do not 23simply edit the file "Config.h" and comment out the components you do not
24need using C++ style (//) comments. 24need using C++ style (//) comments.
25 25
26After the build is complete a busybox.links file is generated which is then 26After the build is complete a busybox.links file is generated which is then
diff --git a/TODO b/TODO
index 6a4dfe39d..0756fd091 100644
--- a/TODO
+++ b/TODO
@@ -8,9 +8,8 @@ around to it some time. If you have any good ideas, please let me know.
8 8
9* Networking apps are probably going to be split out some time soon into a 9* Networking apps are probably going to be split out some time soon into a
10 separate package (named perhaps netkit-tiny?). This would remove the 10 separate package (named perhaps netkit-tiny?). This would remove the
11 following items from BusyBox: hostid, hostname, nc, nslookup, telnet, 11 following items from BusyBox: hostid, hostname, nc, nslookup, telnet, and
12 and ping. nfs mounting and syslogd (when it supports network logging) 12 ping. nfs mounting and syslogd (network logging) will remain in BusyBox.
13 will remain in BusyBox.
14 13
15 -Erik 14 -Erik
16 15
@@ -53,353 +52,6 @@ and then start with the biggest things and make them smaller...
53 52
54----------------------- 53-----------------------
55 54
56 55 du.c probably ought to have an -x switch like GNU du does...
57 I think that the add_inode &c in utility.c needs to also stow the
58 st_dev field, and that du.c should NOT call `reset_inode_list'
59 because there can be hard links from inside one argv/ to inside
60 another argv/. du.c probably ought to have an -x switch like GNU du
61 does also...
62
63 56
64------------------------------------------------------------------ 57------------------------------------------------------------------
65
66An interesting email listing some apps that use /proc. BusyBox
67tries to avoid /proc as mush as is possible, so this stuff is
68interesting (to me at least):
69
70
71Date: Fri, 25 Feb 2000 08:23:12 +0000 (GMT)
72From: Riley Williams <rhw@MemAlpha.CX>
73X-Sender: rhw@moo.cus.org.uk
74To: almesber@lrc.di.epfl.ch
75Cc: "Albert D. Cahalan" <acahalan@cs.uml.edu>,
76 Linux Kernel <linux-kernel@vger.rutgers.edu>
77Subject: Re: What /proc should contain [was: /proc/driver/microcode]
78In-Reply-To: <20000224165245.A29790@lrc.di.epfl.ch>
79Message-ID: <Pine.LNX.4.21.0002250806220.8741-100000@moo.cus.org.uk>
80Sender: owner-linux-kernel@vger.rutgers.edu
81Precedence: bulk
82
83Hi there.
84
85 >> Nope, most /proc access is does via programs written in C.
86
87 > That varies a lot from file to file. E.g. I haven't seen any
88 > programs that are specificly designed to read /proc/atm/* yet,
89 > and I know of only one (fuser) that reads /proc/mounts,
90 > extracting only partial information (just to pick two examples
91 > that I'm quite familiar with).
92
93As a point of reference, here's a slightly tweaked analysis of the
94programs on the system I'm reading your mail on. Basically, I ran the
95following script...
96
97 Q> #!/bin/bash
98 Q> function use() {
99 Q> for Z in $* ; do
100 Q> strings $Z | grep /proc | sed "s=^=$Z ="
101 Q> done
102 Q> }
103 Q> use /{,s}bin/* /usr/{,s}bin/* | sort -u | tee proc-usage
104
105...and then went through it removing comments and print format
106strings. Replace /proc with /dev and you'd soon have an equivalent
107list for that - although I can report that such is MUCH larger...
108
109There are three programs therein that refer to /proc/mounts ...
110
111 /bin/mount
112 /bin/umount
113 /usr/bin/eject
114
115...and, as you stated, none that refer to /proc/atm on this system.
116However, as this is a RedHat Linux 5.0 based system, that's not
117necessarily an up to date reference thereto...
118
119Here's the list anyway...
120
121/bin/kill /proc/%d/cmdline
122/bin/kill /proc/%d/stat
123
124/bin/mount /proc/devices
125/bin/mount /proc/filesystems
126/bin/mount /proc/mounts
127
128/bin/netstat /proc/net
129/bin/netstat /proc/net/appletalk
130/bin/netstat /proc/net/ax25
131/bin/netstat /proc/net/ax25_route
132/bin/netstat /proc/net/dev
133/bin/netstat /proc/net/ip_masquerade
134/bin/netstat /proc/net/ipx
135/bin/netstat /proc/net/ipx_route
136/bin/netstat /proc/net/netstat
137/bin/netstat /proc/net/nr
138/bin/netstat /proc/net/nr_neigh
139/bin/netstat /proc/net/nr_nodes
140/bin/netstat /proc/net/raw
141/bin/netstat /proc/net/route
142/bin/netstat /proc/net/rt_cache
143/bin/netstat /proc/net/snmp
144/bin/netstat /proc/net/tcp
145/bin/netstat /proc/net/udp
146/bin/netstat /proc/net/unix
147
148/bin/umount /proc/devices
149/bin/umount /proc/mounts
150
151/sbin/arp /proc/net/appletalk
152/sbin/arp /proc/net/arp
153/sbin/arp /proc/net/ax25
154/sbin/arp /proc/net/ipx
155/sbin/arp /proc/net/nr
156/sbin/arp /proc/net/unix
157
158/sbin/cardctl /proc/devices
159
160/sbin/cardmgr /proc/devices
161
162/sbin/fdisk /proc/ide/%s/media
163/sbin/fdisk /proc/scsi/scsi
164
165/sbin/getty /proc/version
166
167/sbin/ifconfig /proc/net
168/sbin/ifconfig /proc/net/appletalk
169/sbin/ifconfig /proc/net/ax25
170/sbin/ifconfig /proc/net/dev
171/sbin/ifconfig /proc/net/ipx
172/sbin/ifconfig /proc/net/nr
173/sbin/ifconfig /proc/net/unix
174
175/sbin/ifup /proc/sys/kernel/modprobe
176
177/sbin/ipchains /proc/net/ip_fwchains
178/sbin/ipchains /proc/net/ip_fwnames
179/sbin/ipchains /proc/net/ip_masquerade
180/sbin/ipchains /proc/sys/net/ipv4/ip_forward
181
182/sbin/ipmaddr /proc/net/dev_mcast
183/sbin/ipmaddr /proc/net/igmp
184/sbin/ipmaddr /proc/net/igmp6
185
186/sbin/iptunnel /proc/net/dev
187
188/sbin/killall5 /proc/%s/cmdline
189/sbin/killall5 /proc/%s/exe
190/sbin/killall5 /proc/%s/stat
191/sbin/killall5 /proc/version
192
193/sbin/klogd /proc/kmsg
194
195/sbin/lsmod /proc/modules
196
197/sbin/modprobe /proc/modules
198
199/sbin/pidof /proc/%s/cmdline
200/sbin/pidof /proc/%s/exe
201/sbin/pidof /proc/%s/stat
202/sbin/pidof /proc/version
203
204/sbin/probe /proc/pci
205
206/sbin/rarp /proc/net/ax25
207/sbin/rarp /proc/net/nr
208/sbin/rarp /proc/net/rarp
209
210/sbin/rmmod /proc/modules
211
212/sbin/rmmod.static /proc/modules
213
214/sbin/route /proc/net/appletalk
215/sbin/route /proc/net/ax25
216/sbin/route /proc/net/ax25_route
217/sbin/route /proc/net/ipx
218/sbin/route /proc/net/ipx_route
219/sbin/route /proc/net/nr
220/sbin/route /proc/net/nr_neigh
221/sbin/route /proc/net/nr_nodes
222/sbin/route /proc/net/route
223/sbin/route /proc/net/rt_cache
224/sbin/route /proc/net/unix
225
226/sbin/scsi_info /proc/scsi
227/sbin/scsi_info /proc/scsi/%s
228/sbin/scsi_info /proc/scsi/scsi
229
230/sbin/slattach /proc/net/ax25
231/sbin/slattach /proc/net/nr
232
233/sbin/swapoff /proc/swaps
234
235/sbin/swapon /proc/swaps
236
237/sbin/uugetty /proc/version
238
239/usr/bin/dig /proc/
240/usr/bin/dig /proc/interrupts
241/usr/bin/dig /proc/meminfo
242/usr/bin/dig /proc/rtc
243/usr/bin/dig /proc/self/status
244/usr/bin/dig /proc/stat
245
246/usr/bin/dnsquery /proc/
247/usr/bin/dnsquery /proc/interrupts
248/usr/bin/dnsquery /proc/meminfo
249/usr/bin/dnsquery /proc/rtc
250/usr/bin/dnsquery /proc/self/status
251/usr/bin/dnsquery /proc/stat
252
253/usr/bin/eject /proc/mounts
254
255/usr/bin/emacs /proc/loadavg
256
257/usr/bin/fetchmail /proc/net/dev
258
259/usr/bin/free /proc/meminfo
260
261/usr/bin/gmake /proc/loadavg
262
263/usr/bin/gpm-root /proc/loadavg
264/usr/bin/gpm-root /proc/meminfo
265
266/usr/bin/host /proc/
267/usr/bin/host /proc/interrupts
268/usr/bin/host /proc/meminfo
269/usr/bin/host /proc/rtc
270/usr/bin/host /proc/self/status
271/usr/bin/host /proc/stat
272
273/usr/bin/hoststat /proc/loadavg
274
275/usr/bin/hwdiag /proc/cpuinfo
276/usr/bin/hwdiag /proc/pci
277/usr/bin/hwdiag /proc/scsi/scsi
278/usr/bin/hwdiag /proc/version
279
280/usr/bin/lsdev /proc/dma
281/usr/bin/lsdev /proc/interrupts
282/usr/bin/lsdev /proc/ioports
283
284/usr/bin/mailq /proc/loadavg
285
286/usr/bin/make /proc/loadavg
287
288/usr/bin/mcookie /proc/loadavg
289/usr/bin/mcookie /proc/stat
290
291/usr/bin/newaliases /proc/loadavg
292
293/usr/bin/nslookup /proc/
294/usr/bin/nslookup /proc/interrupts
295/usr/bin/nslookup /proc/meminfo
296/usr/bin/nslookup /proc/rtc
297/usr/bin/nslookup /proc/self/status
298/usr/bin/nslookup /proc/stat
299
300/usr/bin/nsupdate /proc/
301/usr/bin/nsupdate /proc/interrupts
302/usr/bin/nsupdate /proc/meminfo
303/usr/bin/nsupdate /proc/rtc
304/usr/bin/nsupdate /proc/self/status
305/usr/bin/nsupdate /proc/stat
306
307/usr/bin/pgp /proc/version
308/usr/bin/pgpe /proc/version
309/usr/bin/pgpk /proc/version
310/usr/bin/pgps /proc/version
311/usr/bin/pgpv /proc/version
312
313/usr/bin/procinfo /proc/cmdline
314/usr/bin/procinfo /proc/devices
315/usr/bin/procinfo /proc/dma
316/usr/bin/procinfo /proc/filesystems
317/usr/bin/procinfo /proc/interrupts
318/usr/bin/procinfo /proc/loadavg
319/usr/bin/procinfo /proc/meminfo
320/usr/bin/procinfo /proc/modules
321/usr/bin/procinfo /proc/stat
322/usr/bin/procinfo /proc/uptime
323/usr/bin/procinfo /proc/version
324
325/usr/bin/purgestat /proc/loadavg
326
327/usr/bin/screen /proc/loadavg
328
329/usr/bin/strace /proc/%d/stat
330
331/usr/bin/top /proc/cpuinfo
332/usr/bin/top /proc/meminfo
333/usr/bin/top /proc/stat
334
335/usr/bin/vmstat /proc/%s/stat
336/usr/bin/vmstat /proc/meminfo
337/usr/bin/vmstat /proc/stat
338
339/usr/sbin/atd /proc/loadavg
340
341/usr/sbin/dnskeygen /proc/
342/usr/sbin/dnskeygen /proc/interrupts
343/usr/sbin/dnskeygen /proc/meminfo
344/usr/sbin/dnskeygen /proc/rtc
345/usr/sbin/dnskeygen /proc/self/status
346/usr/sbin/dnskeygen /proc/stat
347
348/usr/sbin/fuser /proc/%d/stat
349/usr/sbin/fuser /proc/net/%s
350/usr/sbin/fuser /proc/net/unix
351
352/usr/sbin/in.identd /proc/net/tcp
353
354/usr/sbin/irpd /proc/
355/usr/sbin/irpd /proc/interrupts
356/usr/sbin/irpd /proc/meminfo
357/usr/sbin/irpd /proc/rtc
358/usr/sbin/irpd /proc/self/status
359/usr/sbin/irpd /proc/stat
360
361/usr/sbin/named /proc/
362/usr/sbin/named /proc/interrupts
363/usr/sbin/named /proc/meminfo
364/usr/sbin/named /proc/rtc
365/usr/sbin/named /proc/self/status
366/usr/sbin/named /proc/stat
367
368/usr/sbin/named-xfer /proc/
369/usr/sbin/named-xfer /proc/interrupts
370/usr/sbin/named-xfer /proc/meminfo
371/usr/sbin/named-xfer /proc/rtc
372/usr/sbin/named-xfer /proc/self/status
373/usr/sbin/named-xfer /proc/stat
374
375/usr/sbin/readprofile /proc/profile
376
377/usr/sbin/rwhod /proc/loadavg
378/usr/sbin/rwhod /proc/uptime
379
380/usr/sbin/sendmail /proc/loadavg
381
382/usr/sbin/setconsole /proc/openprom/options
383/usr/sbin/setconsole /proc/openprom/options/${console}-mode
384/usr/sbin/setconsole /proc/openprom/options/input-device
385/usr/sbin/setconsole /proc/openprom/options/output-device
386
387Best wishes from Riley.
388
389 * Copyright (C) 1999, Memory Alpha Systems.
390 * All rights and wrongs reserved.
391
392+----------------------------------------------------------------------+
393| There is something frustrating about the quality and speed of Linux |
394| development, ie., the quality is too high and the speed is too high, |
395| in other words, I can implement this XXXX feature, but I bet someone |
396| else has already done so and is just about to release their patch. |
397+----------------------------------------------------------------------+
398 * http://www.memalpha.cx/Linux/Kernel/
399
400
401-
402To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
403the body of a message to majordomo@vger.rutgers.edu
404Please read the FAQ at http://www.tux.org/lkml/
405
diff --git a/applets/busybox.mkll b/applets/busybox.mkll
index c650febd6..d8ea7b395 100755
--- a/applets/busybox.mkll
+++ b/applets/busybox.mkll
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2# Make busybox links list file. 2# Make busybox links list file.
3 3
4DF="busybox.def.h" 4DF="Config.h"
5MF="busybox.c" 5MF="busybox.c"
6 6
7LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/BB_\1/gp;' | sort)" 7LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/BB_\1/gp;' | sort)"
diff --git a/applets/busybox.sh b/applets/busybox.sh
index 2b4521065..e01b88162 100755
--- a/applets/busybox.sh
+++ b/applets/busybox.sh
@@ -3,7 +3,7 @@
3# I added in the extra "ls" so only source files that 3# I added in the extra "ls" so only source files that
4# actually exist will show up in the compile list. 4# actually exist will show up in the compile list.
5ls -1 ` \ 5ls -1 ` \
6 gcc -E -dM busybox.def.h | \ 6 gcc -E -dM Config.h | \
7 sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \ 7 sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \
8 | tr '[:upper:]' '[:lower:]' | sort 8 | tr '[:upper:]' '[:lower:]' | sort
9` 2>/dev/null | sed -e 's/\.c$/\.o/g' 9` 2>/dev/null | sed -e 's/\.c$/\.o/g'
diff --git a/busybox.mkll b/busybox.mkll
index c650febd6..d8ea7b395 100755
--- a/busybox.mkll
+++ b/busybox.mkll
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2# Make busybox links list file. 2# Make busybox links list file.
3 3
4DF="busybox.def.h" 4DF="Config.h"
5MF="busybox.c" 5MF="busybox.c"
6 6
7LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/BB_\1/gp;' | sort)" 7LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/BB_\1/gp;' | sort)"
diff --git a/busybox.sh b/busybox.sh
index 2b4521065..e01b88162 100755
--- a/busybox.sh
+++ b/busybox.sh
@@ -3,7 +3,7 @@
3# I added in the extra "ls" so only source files that 3# I added in the extra "ls" so only source files that
4# actually exist will show up in the compile list. 4# actually exist will show up in the compile list.
5ls -1 ` \ 5ls -1 ` \
6 gcc -E -dM busybox.def.h | \ 6 gcc -E -dM Config.h | \
7 sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \ 7 sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1.c/gp;' \
8 | tr '[:upper:]' '[:lower:]' | sort 8 | tr '[:upper:]' '[:lower:]' | sort
9` 2>/dev/null | sed -e 's/\.c$/\.o/g' 9` 2>/dev/null | sed -e 's/\.c$/\.o/g'
diff --git a/busybox.spec b/busybox.spec
index cb185a724..c11756b1e 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,5 +1,5 @@
1Name: busybox 1Name: busybox
2Version: 0.47pre 2Version: 0.47
3Release: 1 3Release: 1
4Group: System/Utilities 4Group: System/Utilities
5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary. 5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.
diff --git a/examples/busybox.spec b/examples/busybox.spec
index cb185a724..c11756b1e 100644
--- a/examples/busybox.spec
+++ b/examples/busybox.spec
@@ -1,5 +1,5 @@
1Name: busybox 1Name: busybox
2Version: 0.47pre 2Version: 0.47
3Release: 1 3Release: 1
4Group: System/Utilities 4Group: System/Utilities
5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary. 5Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.
diff --git a/internal.h b/internal.h
index f8dd12836..69f455435 100644
--- a/internal.h
+++ b/internal.h
@@ -24,7 +24,7 @@
24#ifndef _BB_INTERNAL_H_ 24#ifndef _BB_INTERNAL_H_
25#define _BB_INTERNAL_H_ 1 25#define _BB_INTERNAL_H_ 1
26 26
27#include "busybox.def.h" 27#include "Config.h"
28 28
29#ifdef DMALLOC 29#ifdef DMALLOC
30#include "dmalloc.h" 30#include "dmalloc.h"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 19:33:14 +0000