* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-06 16:20 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-06 16:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-06 08:20:29 -0800 (Tue, 06 Feb 2007)
New Revision: 17790
Log:
hide busybox version selector if disabled
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-02-06 16:18:12 UTC (rev 17789)
+++ trunk/buildroot/package/busybox/Config.in 2007-02-06 16:20:29 UTC (rev 17790)
@@ -11,6 +11,7 @@
choice
prompt "BusyBox Version"
+ depends BR2_PACKAGE_BUSYBOX
default BR2_BUSYBOX_VERSION_1_2_2_1
help
Select the version of BusyBox you wish to use.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-03-02 15:33 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-03-02 15:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-02 15:33:07 +0000 (Mon, 02 Mar 2009)
New Revision: 25487
Log:
busybox: additional 1.13.2 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.13.2-awk.patch
trunk/buildroot/package/busybox/busybox-1.13.2-unzip.patch
trunk/buildroot/package/busybox/busybox-1.13.2-wget.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.2-awk.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-awk.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-awk.patch 2009-03-02 15:33:07 UTC (rev 25487)
@@ -0,0 +1,46 @@
+diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c
+--- busybox-1.13.2/editors/awk.c 2008-11-09 18:28:21.000000000 +0100
++++ busybox-1.13.2-awk/editors/awk.c 2009-02-26 12:17:05.000000000 +0100
+@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 =
+
+
+ /* Globals. Split in two parts so that first one is addressed
+- * with (mostly short) negative offsets */
++ * with (mostly short) negative offsets.
++ * NB: it's unsafe to put members of type "double"
++ * into globals2 (gcc may fail to align them).
++ */
+ struct globals {
++ double t_double;
+ chain beginseq, mainseq, endseq;
+ chain *seq;
+ node *break_ptr, *continue_ptr;
+@@ -442,16 +446,16 @@ struct globals2 {
+ tsplitter exec_builtin__tspl;
+
+ /* biggest and least used members go last */
+- double t_double;
+ tsplitter fsplitter, rsplitter;
+ };
+ #define G1 (ptr_to_globals[-1])
+ #define G (*(struct globals2 *)ptr_to_globals)
+ /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */
+-/* char G1size[sizeof(G1)]; - 0x6c */
+-/* char Gsize[sizeof(G)]; - 0x1cc */
++/*char G1size[sizeof(G1)]; - 0x74 */
++/*char Gsize[sizeof(G)]; - 0x1c4 */
+ /* Trying to keep most of members accessible with short offsets: */
+-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */
++#define t_double (G1.t_double )
+ #define beginseq (G1.beginseq )
+ #define mainseq (G1.mainseq )
+ #define endseq (G1.endseq )
+@@ -479,7 +483,6 @@ struct globals2 {
+ #define t_info (G.t_info )
+ #define t_tclass (G.t_tclass )
+ #define t_string (G.t_string )
+-#define t_double (G.t_double )
+ #define t_lineno (G.t_lineno )
+ #define t_rollback (G.t_rollback )
+ #define intvar (G.intvar )
Added: trunk/buildroot/package/busybox/busybox-1.13.2-unzip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-unzip.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-unzip.patch 2009-03-02 15:33:07 UTC (rev 25487)
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c
+--- busybox-1.13.2/archival/unzip.c 2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.2-unzip/archival/unzip.c 2009-02-26 12:17:21.000000000 +0100
+@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes {
+ };
+
+ #define FIX_ENDIANNESS_CDE(cde_header) do { \
+- (cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \
++ (cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \
+ } while (0)
+
+ enum { zip_fd = 3 };
Added: trunk/buildroot/package/busybox/busybox-1.13.2-wget.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-wget.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-wget.patch 2009-03-02 15:33:07 UTC (rev 25487)
@@ -0,0 +1,41 @@
+diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c
+--- busybox-1.13.2/networking/wget.c 2008-11-09 18:27:59.000000000 +0100
++++ busybox-1.13.2-wget/networking/wget.c 2009-03-02 16:07:12.000000000 +0100
+@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha
+ KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location
+ };
+ enum {
+- WGET_OPT_CONTINUE = 0x1,
+- WGET_OPT_SPIDER = 0x2,
+- WGET_OPT_QUIET = 0x4,
+- WGET_OPT_OUTNAME = 0x8,
+- WGET_OPT_PREFIX = 0x10,
+- WGET_OPT_PROXY = 0x20,
+- WGET_OPT_USER_AGENT = 0x40,
+- WGET_OPT_PASSIVE = 0x80,
+- WGET_OPT_HEADER = 0x100,
++ WGET_OPT_CONTINUE = (1 << 0),
++ WGET_OPT_SPIDER = (1 << 1),
++ WGET_OPT_QUIET = (1 << 2),
++ WGET_OPT_OUTNAME = (1 << 3),
++ WGET_OPT_PREFIX = (1 << 4),
++ WGET_OPT_PROXY = (1 << 5),
++ WGET_OPT_USER_AGENT = (1 << 6),
++ WGET_OPT_RETRIES = (1 << 7),
++ WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8),
++ WGET_OPT_PASSIVE = (1 << 9),
++ WGET_OPT_HEADER = (1 << 10),
+ };
+ #if ENABLE_FEATURE_WGET_LONG_OPTIONS
+ static const char wget_longopts[] ALIGN1 =
+@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha
+ "directory-prefix\0" Required_argument "P"
+ "proxy\0" Required_argument "Y"
+ "user-agent\0" Required_argument "U"
++ /* Ignored: */
++ // "tries\0" Required_argument "t"
++ // "timeout\0" Required_argument "T"
++ /* Ignored (we always use PASV): */
+ "passive-ftp\0" No_argument "\xff"
+ "header\0" Required_argument "\xfe"
+ ;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-02-18 14:16 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-02-18 14:16 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-18 14:16:30 +0000 (Wed, 18 Feb 2009)
New Revision: 25362
Log:
busybox: 1.13.2 killall fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.2-killall.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.2-killall.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-killall.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-killall.patch 2009-02-18 14:16:30 UTC (rev 25362)
@@ -0,0 +1,17 @@
+--- busybox-1.13.2/include/libbb.h Wed Dec 31 04:06:45 2008
++++ busybox-1.13.2-killall/include/libbb.h Sat Feb 14 02:41:18 2009
+@@ -1275,7 +1275,13 @@
+ PSSCAN_UTIME = 1 << 13,
+ PSSCAN_TTY = 1 << 14,
+ PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM,
+- PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF),
++ /* NB: used by find_pid_by_name(). Any applet using it
++ * needs to be mentioned here. */
++ PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL
++ || ENABLE_PGREP || ENABLE_PKILL
++ || ENABLE_PIDOF
++ || ENABLE_SESTATUS
++ ),
+ USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,)
+ PSSCAN_START_TIME = 1 << 18,
+ PSSCAN_CPU = 1 << 19,
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-02-01 19:36 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-02-01 19:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-01 19:36:56 +0000 (Sun, 01 Feb 2009)
New Revision: 25206
Log:
busybox: additional 1.13.2 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.13.2-init.patch
trunk/buildroot/package/busybox/busybox-1.13.2-modprobe.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.2-init.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-init.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-init.patch 2009-02-01 19:36:56 UTC (rev 25206)
@@ -0,0 +1,50 @@
+--- busybox-1.13.2/init/init.c Wed Dec 31 04:06:45 2008
++++ busybox-1.13.2-init/init/init.c Thu Jan 29 03:02:13 2009
+@@ -671,15 +671,14 @@
+ */
+ static void parse_inittab(void)
+ {
++#if ENABLE_FEATURE_USE_INITTAB
+ char *token[4];
+- /* order must correspond to SYSINIT..RESTART constants */
+- static const char actions[] ALIGN1 =
+- "sysinit\0""respawn\0""askfirst\0""wait\0""once\0"
+- "ctrlaltdel\0""shutdown\0""restart\0";
++ parser_t *parser = config_open2("/etc/inittab", fopen_for_read);
+
+- parser_t *parser = config_open2(INITTAB, fopen_for_read);
+- /* No inittab file -- set up some default behavior */
+- if (parser == NULL) {
++ if (parser == NULL)
++#endif
++ {
++ /* No inittab file -- set up some default behavior */
+ /* Reboot on Ctrl-Alt-Del */
+ new_init_action(CTRLALTDEL, "reboot", "");
+ /* Umount all filesystems on halt/reboot */
+@@ -699,11 +698,17 @@
+ new_init_action(SYSINIT, INIT_SCRIPT, "");
+ return;
+ }
++
++#if ENABLE_FEATURE_USE_INITTAB
+ /* optional_tty:ignored_runlevel:action:command
+ * Delims are not to be collapsed and need exactly 4 tokens
+ */
+ while (config_read(parser, token, 4, 0, "#:",
+ PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
++ /* order must correspond to SYSINIT..RESTART constants */
++ static const char actions[] ALIGN1 =
++ "sysinit\0""respawn\0""askfirst\0""wait\0""once\0"
++ "ctrlaltdel\0""shutdown\0""restart\0";
+ int action;
+ char *tty = token[0];
+
+@@ -727,6 +732,7 @@
+ parser->lineno);
+ }
+ config_close(parser);
++#endif
+ }
+
+ #if ENABLE_FEATURE_USE_INITTAB
Added: trunk/buildroot/package/busybox/busybox-1.13.2-modprobe.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-modprobe.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-modprobe.patch 2009-02-01 19:36:56 UTC (rev 25206)
@@ -0,0 +1,99 @@
+--- busybox-1.13.2/modutils/modutils-24.c Sat Nov 29 07:48:56 2008
++++ busybox-1.13.2-modprobe/modutils/modutils-24.c Sun Feb 1 00:08:26 2009
+@@ -2150,7 +2150,7 @@
+ sec->name = name;
+ sec->idx = newidx;
+ if (size)
+- sec->contents = xmalloc(size);
++ sec->contents = xzalloc(size);
+
+ obj_insert_section_load_order(f, sec);
+
+@@ -2165,7 +2165,7 @@
+ int newidx = f->header.e_shnum++;
+ struct obj_section *sec;
+
+- f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
++ f->sections = xrealloc_vector(f->sections, 2, newidx);
+ f->sections[newidx] = sec = arch_new_section();
+
+ sec->header.sh_type = SHT_PROGBITS;
+@@ -2175,7 +2175,7 @@
+ sec->name = name;
+ sec->idx = newidx;
+ if (size)
+- sec->contents = xmalloc(size);
++ sec->contents = xzalloc(size);
+
+ sec->load_next = f->load_order;
+ f->load_order = sec;
+@@ -2571,8 +2571,7 @@
+ /* Collect the modules' symbols. */
+
+ if (nmod) {
+- ext_modules = modules = xmalloc(nmod * sizeof(*modules));
+- memset(modules, 0, nmod * sizeof(*modules));
++ ext_modules = modules = xzalloc(nmod * sizeof(*modules));
+ for (i = 0, mn = module_names, m = modules;
+ i < nmod; ++i, ++m, mn += strlen(mn) + 1) {
+ struct new_module_info info;
+@@ -2652,13 +2651,14 @@
+ }
+
+
+-static void new_create_this_module(struct obj_file *f, const char *m_name)
++static void new_create_this_module(struct obj_file *f, const char *m_name)
+ {
+ struct obj_section *sec;
+
+ sec = obj_create_alloced_section_first(f, ".this", tgt_sizeof_long,
+ sizeof(struct new_module));
+- memset(sec->contents, 0, sizeof(struct new_module));
++ /* done by obj_create_alloced_section_first: */
++ /*memset(sec->contents, 0, sizeof(struct new_module));*/
+
+ obj_add_symbol(f, SPFX "__this_module", -1,
+ ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0,
+@@ -2965,9 +2965,9 @@
+ if (i == f->header.e_shnum) {
+ struct obj_section *sec;
+
++ f->header.e_shnum++;
+ f->sections = xrealloc_vector(f->sections, 2, i);
+ f->sections[i] = sec = arch_new_section();
+- f->header.e_shnum = i + 1;
+
+ sec->header.sh_type = SHT_PROGBITS;
+ sec->header.sh_flags = SHF_WRITE | SHF_ALLOC;
+@@ -3006,12 +3006,9 @@
+ for (i = 0; i < f->header.e_shnum; ++i) {
+ struct obj_section *s = f->sections[i];
+ if (s->header.sh_type == SHT_NOBITS) {
++ s->contents = NULL;
+ if (s->header.sh_size != 0)
+- s->contents = memset(xmalloc(s->header.sh_size),
+- 0, s->header.sh_size);
+- else
+- s->contents = NULL;
+-
++ s->contents = xzalloc(s->header.sh_size);
+ s->header.sh_type = SHT_PROGBITS;
+ }
+ }
+@@ -3275,14 +3272,13 @@
+ case SHT_SYMTAB:
+ case SHT_STRTAB:
+ case SHT_RELM:
++ sec->contents = NULL;
+ if (sec->header.sh_size > 0) {
+- sec->contents = xmalloc(sec->header.sh_size);
++ sec->contents = xzalloc(sec->header.sh_size);
+ fseek(fp, sec->header.sh_offset, SEEK_SET);
+ if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
+ bb_perror_msg_and_die("error reading ELF section data");
+ }
+- } else {
+- sec->contents = NULL;
+ }
+ break;
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-01-29 11:29 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-01-29 11:29 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-29 11:29:49 +0000 (Thu, 29 Jan 2009)
New Revision: 25119
Log:
busybox: rebuild if .config changed
As reported on irc - Fixes busybox-menuconfig
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2009-01-29 11:27:20 UTC (rev 25118)
+++ trunk/buildroot/package/busybox/busybox.mk 2009-01-29 11:29:49 UTC (rev 25119)
@@ -42,7 +42,7 @@
endif
touch $@
-$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
+$(BUSYBOX_DIR)/.config: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config
@@ -97,7 +97,7 @@
touch $@
-$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
+$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
ARCH=$(KERNEL_ARCH) \
@@ -129,9 +129,9 @@
busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
-busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.configured
+busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.config
-busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
+busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
busybox-update:
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-01-29 11:27 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-01-29 11:27 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-29 11:27:20 +0000 (Thu, 29 Jan 2009)
New Revision: 25118
Log:
busybox: remove unused handling of ancient versions no longer in BR
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2009-01-29 10:13:02 UTC (rev 25117)
+++ trunk/buildroot/package/busybox/busybox.mk 2009-01-29 11:27:20 UTC (rev 25118)
@@ -46,14 +46,6 @@
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config
-ifeq ($(BR2_BUSYBOX_VERSION_1_0_1),y)
- $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
- $(BUSYBOX_DIR)/Rules.mak
-endif
-ifeq ($(BR2_BUSYBOX_VERSION_1_1_3),y)
- $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
- $(BUSYBOX_DIR)/.config
-endif
ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y)
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-01-20 19:26 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-01-20 19:26 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-20 19:26:54 +0000 (Tue, 20 Jan 2009)
New Revision: 24924
Log:
busybox: 1.13.2 tar fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.2-tar.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.2-tar.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-tar.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-tar.patch 2009-01-20 19:26:54 UTC (rev 24924)
@@ -0,0 +1,11 @@
+--- busybox-1.13.2/archival/tar.c Sun Nov 9 18:28:02 2008
++++ busybox-1.13.2-tar/archival/tar.c Tue Jan 20 03:52:04 2009
+@@ -591,8 +591,6 @@
+ struct TarBallInfo tbInfo;
+
+ tbInfo.hlInfoHead = NULL;
+-
+- fchmod(tar_fd, 0644);
+ tbInfo.tarFd = tar_fd;
+ tbInfo.verboseFlag = verboseFlag;
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-01-19 12:34 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-01-19 12:34 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-19 12:34:38 +0000 (Mon, 19 Jan 2009)
New Revision: 24909
Log:
busybox: 1.13.2 depmod fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.2-depmod.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.2-depmod.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-depmod.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-depmod.patch 2009-01-19 12:34:38 UTC (rev 24909)
@@ -0,0 +1,121 @@
+--- busybox-1.13.2/modutils/depmod.c Sun Nov 9 18:28:03 2008
++++ busybox-1.13.2-depmod/modutils/depmod.c Mon Jan 12 23:12:59 2009
+@@ -33,7 +33,7 @@
+ enum {
+ ARG_a = (1<<0), /* All modules, ignore mods in argv */
+ ARG_A = (1<<1), /* Only emit .ko that are newer than modules.dep file */
+- ARG_b = (1<<2), /* not /lib/modules/$(uname -r)/ but this base-dir */
++ ARG_b = (1<<2), /* base directory when modules are in staging area */
+ ARG_e = (1<<3), /* with -F, print unresolved symbols */
+ ARG_F = (1<<4), /* System.map that contains the symbols */
+ ARG_n = (1<<5) /* dry-run, print to stdout only */
+@@ -57,7 +57,7 @@
+ *first = info;
+
+ info->dnext = info->dprev = info;
+- info->name = xstrdup(fname);
++ info->name = xasprintf("/%s", fname);
+ info->modname = filename2modname(fname, NULL);
+ for (ptr = image; ptr < image + len - 10; ptr++) {
+ if (strncmp(ptr, "depends=", 8) == 0) {
+@@ -123,44 +123,61 @@
+ }
+ }
+
++static void xfreopen_write(const char *file, FILE *f)
++{
++ if (freopen(file, "w", f) == NULL)
++ bb_perror_msg_and_die("can't open '%s'", file);
++}
++
+ int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int depmod_main(int argc UNUSED_PARAM, char **argv)
+ {
+ module_info *modules = NULL, *m, *dep;
+- char *moddir_base = (char *)CONFIG_DEFAULT_MODULES_DIR;
++ const char *moddir_base = "/";
++ char *moddir, *version;
++ struct utsname uts;
+ int tmp;
+
+ getopt32(argv, "aAb:eF:n", &moddir_base, NULL);
+ argv += optind;
+
+ /* goto modules location */
++ xchdir(moddir_base);
+
+ /* If a version is provided, then that kernel version's module directory
+ * is used, rather than the current kernel version (as returned by
+ * "uname -r"). */
+- xchdir(moddir_base);
+- if (*argv && (sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3)) {
+- xchdir(*argv++);
++ if (*argv && sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3) {
++ version = *argv++;
+ } else {
+- struct utsname uts;
+ uname(&uts);
+- xchdir(uts.release);
++ version = uts.release;
+ }
+- /* If no modules are given on the command-line, -a is on per default. */
+- option_mask32 |= *argv == NULL;
++ moddir = concat_path_file(&CONFIG_DEFAULT_MODULES_DIR[1], version);
+
+ /* Scan modules */
+- moddir_base = xrealloc_getcwd_or_warn(NULL);
+- do {
+- recursive_action((option_mask32 & ARG_a) ? moddir_base : *argv,
+- ACTION_RECURSE, parse_module, NULL, &modules, 0);
+- } while (!(option_mask32 & ARG_a) && *(++argv));
++ if (*argv) {
++ char *modfile;
++ struct stat sb;
++ do {
++ modfile = concat_path_file(moddir, *argv);
++ xstat(modfile, &sb);
++ parse_module(modfile, &sb, &modules, 0);
++ free(modfile);
++ } while (*(++argv));
++ } else {
++ recursive_action(moddir, ACTION_RECURSE,
++ parse_module, NULL, &modules, 0);
++ }
++
++ /* Prepare for writing out the dep files */
++ xchdir(moddir);
+ if (ENABLE_FEATURE_CLEAN_UP)
+- free(moddir_base);
++ free(moddir);
+
+ /* Generate dependency and alias files */
+ if (!(option_mask32 & ARG_n))
+- freopen(CONFIG_DEFAULT_DEPMOD_FILE, "w", stdout);
++ xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
+ for (m = modules; m != NULL; m = m->next) {
+ printf("%s:", m->name);
+
+@@ -174,12 +191,12 @@
+ dep->dprev->dnext = dep->dnext;
+ dep->dnext = dep->dprev = dep;
+ }
+- puts("");
++ bb_putchar('\n');
+ }
+
+ #if ENABLE_FEATURE_MODUTILS_ALIAS
+ if (!(option_mask32 & ARG_n))
+- freopen("modules.alias", "w", stdout);
++ xfreopen_write("modules.alias", stdout);
+ for (m = modules; m != NULL; m = m->next) {
+ while (m->aliases) {
+ printf("alias %s %s\n",
+@@ -190,7 +207,7 @@
+ #endif
+ #if ENABLE_FEATURE_MODUTILS_SYMBOLS
+ if (!(option_mask32 & ARG_n))
+- freopen("modules.symbols", "w", stdout);
++ xfreopen_write("modules.symbols", stdout);
+ for (m = modules; m != NULL; m = m->next) {
+ while (m->symbols) {
+ printf("alias symbol:%s %s\n",
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2009-01-12 9:36 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2009-01-12 9:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-12 09:36:57 +0000 (Mon, 12 Jan 2009)
New Revision: 24789
Log:
busybox: 1.13.2 mdev fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.2-mdev.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.2-mdev.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.2-mdev.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.2-mdev.patch 2009-01-12 09:36:57 UTC (rev 24789)
@@ -0,0 +1,39 @@
+--- busybox-1.13.2/testsuite/mdev.tests Sun Nov 9 18:28:19 2008
++++ busybox-1.13.2-mdev/testsuite/mdev.tests Mon Jan 12 08:59:15 2009
+@@ -111,6 +111,22 @@
+
+ # continuing to use directory structure from prev test
+ rm -rf mdev.testdir/dev/*
++echo "sda 0:0 644 =block/ @echo @echo TEST" >mdev.testdir/etc/mdev.conf
++testing "mdev move and command" \
++ "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
++ ls -lnR mdev.testdir/dev | $FILTER_LS2" \
++"\
++ at echo TEST
++mdev.testdir/dev:
++drwxr-xr-x 2 0 0 block
++
++mdev.testdir/dev/block:
++brw-r--r-- 1 0 0 sda
++" \
++ "" ""
++
++# continuing to use directory structure from prev test
++rm -rf mdev.testdir/dev/*
+ echo "@8,0 :1 644" >mdev.testdir/etc/mdev.conf
+ testing "mdev #maj,min and no explicit uid" \
+ "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
+--- busybox-1.13.2/util-linux/mdev.c Sun Nov 9 18:28:22 2008
++++ busybox-1.13.2-mdev/util-linux/mdev.c Mon Jan 12 08:59:15 2009
+@@ -179,8 +179,9 @@
+ unsigned i, n;
+ #endif
+ char *a = val;
+- s = strchr(val, ' ');
+- val = (s && s[1]) ? s+1 : NULL;
++ s = strchrnul(val, ' ');
++ val = (s[0] && s[1]) ? s+1 : NULL;
++ s[0] = '\0';
+ #if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+ /* substitute %1..9 with off[1..9], if any */
+ n = 0;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-31 9:35 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-31 9:35 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-31 09:35:21 +0000 (Wed, 31 Dec 2008)
New Revision: 24626
Log:
busybox: bump 1.12.x / 1.13.x versions
Removed:
trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch
trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch
trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch
trunk/buildroot/package/busybox/busybox-1.13.1-init.patch
trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch
trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch
trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/Config.in 2008-12-31 09:35:21 UTC (rev 24626)
@@ -65,8 +65,8 @@
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X
- default "1.12.3" if BR2_BUSYBOX_VERSION_1_12_X
- default "1.13.1" if BR2_BUSYBOX_VERSION_1_13_X
+ default "1.12.4" if BR2_BUSYBOX_VERSION_1_12_X
+ default "1.13.2" if BR2_BUSYBOX_VERSION_1_13_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,86 +0,0 @@
---- busybox-1.13.1/include/libbb.h Sun Nov 9 18:28:17 2008
-+++ busybox-1.13.1-bindtodevice/include/libbb.h Wed Dec 10 12:10:30 2008
-@@ -437,6 +437,7 @@
- * Turn it on before you call bind(). */
- void setsockopt_reuseaddr(int fd) FAST_FUNC; /* On Linux this never fails. */
- int setsockopt_broadcast(int fd) FAST_FUNC;
-+int setsockopt_bindtodevice(int fd, const char *iface) FAST_FUNC;
- /* NB: returns port in host byte order */
- unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port) FAST_FUNC;
- typedef struct len_and_sockaddr {
---- busybox-1.13.1/libbb/xconnect.c Sun Nov 9 18:28:09 2008
-+++ busybox-1.13.1-bindtodevice/libbb/xconnect.c Wed Dec 10 23:20:29 2008
-@@ -7,6 +7,7 @@
- */
-
- #include <netinet/in.h>
-+#include <net/if.h>
- #include "libbb.h"
-
- void FAST_FUNC setsockopt_reuseaddr(int fd)
-@@ -17,6 +18,20 @@
- {
- return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1));
- }
-+int FAST_FUNC setsockopt_bindtodevice(int fd, const char *iface)
-+{
-+ int r;
-+ struct ifreq ifr;
-+ strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-+ /* Actually, ifr_name is at offset 0, and in practice
-+ * just giving char[IFNAMSIZ] instead of struct ifreq works too.
-+ * But just in case it's not true on some obscure arch... */
-+ r = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
-+ if (r)
-+ bb_perror_msg("can't bind to interface %s", iface);
-+ return r;
-+}
-+
-
- void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
- {
---- busybox-1.13.1/networking/arping.c Sun Nov 9 18:27:59 2008
-+++ busybox-1.13.1-bindtodevice/networking/arping.c Wed Dec 10 12:10:30 2008
-@@ -322,8 +322,7 @@
- struct sockaddr_in saddr;
- int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
-
-- if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
-- bb_perror_msg("cannot bind to device %s", device);
-+ setsockopt_bindtodevice(probe_fd, device);
- memset(&saddr, 0, sizeof(saddr));
- saddr.sin_family = AF_INET;
- if (src.s_addr) {
---- busybox-1.13.1/networking/ping.c Sun Nov 9 18:27:59 2008
-+++ busybox-1.13.1-bindtodevice/networking/ping.c Wed Dec 10 12:10:30 2008
-@@ -572,7 +572,7 @@
- xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
- }
- if (str_I)
-- setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1);
-+ setsockopt_bindtodevice(pingsock, str_I);
-
- /* enable broadcast pings */
- setsockopt_broadcast(pingsock);
-@@ -622,7 +622,7 @@
- if (source_lsa)
- xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
- if (str_I)
-- setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1);
-+ setsockopt_bindtodevice(pingsock, str_I);
-
- #ifdef ICMP6_FILTER
- {
---- busybox-1.13.1/networking/udhcp/socket.c Sun Nov 9 18:27:58 2008
-+++ busybox-1.13.1-bindtodevice/networking/udhcp/socket.c Wed Dec 10 12:10:30 2008
-@@ -98,8 +98,8 @@
- bb_perror_msg_and_die("SO_BROADCAST");
-
- /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
-- if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &inf, strlen(inf) + 1) == -1)
-- bb_perror_msg_and_die("SO_BINDTODEVICE");
-+ if (setsockopt_bindtodevice(fd, inf))
-+ xfunc_die(); /* warning is already printed */
-
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,20 +0,0 @@
---- busybox-1.13.1/miscutils/crond.c Sun Nov 9 18:28:17 2008
-+++ busybox-1.13.1-crond/miscutils/crond.c Thu Dec 4 14:56:10 2008
-@@ -779,6 +779,8 @@
- xmove_fd(mailFd, mail_filename ? 1 : 0);
- dup2(1, 2);
- }
-+ /* crond 3.0pl1-100 puts tasks in separate process groups */
-+ bb_setpgrp();
- execlp(prog, prog, cmd, arg, NULL);
- crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, prog, cmd, arg);
- if (mail_filename) {
-@@ -914,6 +916,8 @@
- if (DebugOpt) {
- crondlog(LVL5 "child running %s", DEFAULT_SHELL);
- }
-+ /* crond 3.0pl1-100 puts tasks in separate process groups */
-+ bb_setpgrp();
- execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL);
- crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user,
- DEFAULT_SHELL, "-c", line->cl_Shell);
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,13 +0,0 @@
---- busybox-1.13.1/miscutils/dc.c Sun Nov 9 18:28:16 2008
-+++ busybox-1.13.1-dc/miscutils/dc.c Tue Dec 30 11:36:52 2008
-@@ -19,7 +19,9 @@
- #define pointer (G.pointer )
- #define base (G.base )
- #define stack (G.stack )
--#define INIT_G() do { } while (0)
-+#define INIT_G() do { \
-+ base = 10; \
-+} while (0)
-
-
- static void push(double a)
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-init.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-init.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-init.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,28 +0,0 @@
---- busybox-1.13.1/init/init.c Sat Nov 29 07:48:56 2008
-+++ busybox-1.13.1-init/init/init.c Tue Dec 9 22:17:43 2008
-@@ -118,18 +118,18 @@
-
- msg[0] = '\r';
- va_start(arguments, fmt);
-- l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
-- if (l > sizeof(msg) - 2)
-- l = sizeof(msg) - 2;
-+ l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
-+ if (l > sizeof(msg) - 1)
-+ l = sizeof(msg) - 1;
- msg[l] = '\0';
- va_end(arguments);
-
- if (ENABLE_FEATURE_INIT_SYSLOG) {
-- /* Log the message to syslogd */
- if (where & L_LOG) {
-- /* don't print out "\r" */
-- openlog(applet_name, 0, LOG_DAEMON);
-- syslog(LOG_INFO, "init: %s", msg + 1);
-+ /* Log the message to syslogd */
-+ openlog("init", 0, LOG_DAEMON);
-+ /* don't print "\r" */
-+ syslog(LOG_INFO, "%s", msg + 1);
- closelog();
- }
- msg[l++] = '\n';
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,11 +0,0 @@
---- busybox-1.13.1/networking/ip.c Sun Nov 9 18:27:59 2008
-+++ busybox-1.13.1-ip/networking/ip.c Thu Dec 4 13:16:29 2008
-@@ -31,7 +31,7 @@
-
- static int ip_do(int (*ip_func)(char **argv), char **argv)
- {
-- argv = ip_parse_common_args(argv);
-+ argv = ip_parse_common_args(argv + 1);
- return ip_func(argv);
- }
-
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,80 +0,0 @@
-From 2534c277b4b1c519ec05689eb3525e95d4f6c602 Mon Sep 17 00:00:00 2001
-From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
-Date: Wed, 3 Dec 2008 20:16:11 +0000
-Subject: [PATCH] iptunnel: fix problems with including linux/ip_tunnel.h
- on some systems
-
-git-svn-id: svn://busybox.net/trunk/busybox at 24253 69ca8d6d-28ef-0310-b511-8ec308f3f277
----
- networking/libiproute/iptunnel.c | 45 ++++++++++++++++++++++++++++++++++++-
- 1 files changed, 43 insertions(+), 2 deletions(-)
-
-diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
-index ab4d65b..5349587 100644
---- a/networking/libiproute/iptunnel.c
-+++ b/networking/libiproute/iptunnel.c
-@@ -6,7 +6,6 @@
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
-- *
- * Changes:
- *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
-@@ -18,10 +17,52 @@
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <asm/types.h>
-+
- #ifndef __constant_htons
- #define __constant_htons htons
- #endif
--#include <linux/if_tunnel.h>
-+
-+// FYI: #define SIOCDEVPRIVATE 0x89F0
-+
-+/* From linux/if_tunnel.h. #including it proved troublesome
-+ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
-+#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
-+#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
-+#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2)
-+#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3)
-+//#define SIOCGETPRL (SIOCDEVPRIVATE + 4)
-+//#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
-+//#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
-+//#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
-+#define GRE_CSUM __constant_htons(0x8000)
-+//#define GRE_ROUTING __constant_htons(0x4000)
-+#define GRE_KEY __constant_htons(0x2000)
-+#define GRE_SEQ __constant_htons(0x1000)
-+//#define GRE_STRICT __constant_htons(0x0800)
-+//#define GRE_REC __constant_htons(0x0700)
-+//#define GRE_FLAGS __constant_htons(0x00F8)
-+//#define GRE_VERSION __constant_htons(0x0007)
-+struct ip_tunnel_parm {
-+ char name[IFNAMSIZ];
-+ int link;
-+ uint16_t i_flags;
-+ uint16_t o_flags;
-+ uint32_t i_key;
-+ uint32_t o_key;
-+ struct iphdr iph;
-+};
-+/* SIT-mode i_flags */
-+//#define SIT_ISATAP 0x0001
-+//struct ip_tunnel_prl {
-+// uint32_t addr;
-+// uint16_t flags;
-+// uint16_t __reserved;
-+// uint32_t datalen;
-+// uint32_t __reserved2;
-+// /* data follows */
-+//};
-+///* PRL flags */
-+//#define PRL_DEFAULT 0x0001
-
- #include "ip_common.h" /* #include "libbb.h" is inside */
- #include "rt_names.h"
---
-1.5.6.5
-
Deleted: trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch 2008-12-31 09:35:15 UTC (rev 24625)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch 2008-12-31 09:35:21 UTC (rev 24626)
@@ -1,19 +0,0 @@
---- busybox-1.13.1/coreutils/printf.c Sun Nov 9 18:28:07 2008
-+++ busybox-1.13.1-printf/coreutils/printf.c Wed Dec 10 12:50:55 2008
-@@ -359,8 +359,15 @@
- * We will mimic coreutils. */
- if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
- argv++;
-- if (!argv[1])
-+ if (!argv[1]) {
-+ if (ENABLE_ASH_BUILTIN_PRINTF
-+ && applet_name[0] != 'p'
-+ ) {
-+ bb_error_msg("usage: printf FORMAT [ARGUMENT...]");
-+ return 2; /* bash compat */
-+ }
- bb_show_usage();
-+ }
-
- format = argv[1];
- argv2 = argv + 2;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-30 19:15 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-30 19:15 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-30 19:15:22 +0000 (Tue, 30 Dec 2008)
New Revision: 24616
Log:
busybox: 1.13.1 dc fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-dc.patch 2008-12-30 19:15:22 UTC (rev 24616)
@@ -0,0 +1,13 @@
+--- busybox-1.13.1/miscutils/dc.c Sun Nov 9 18:28:16 2008
++++ busybox-1.13.1-dc/miscutils/dc.c Tue Dec 30 11:36:52 2008
+@@ -19,7 +19,9 @@
+ #define pointer (G.pointer )
+ #define base (G.base )
+ #define stack (G.stack )
+-#define INIT_G() do { } while (0)
++#define INIT_G() do { \
++ base = 10; \
++} while (0)
+
+
+ static void push(double a)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-29 10:09 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-29 10:09 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-29 10:09:50 +0000 (Mon, 29 Dec 2008)
New Revision: 24590
Log:
busybox; fix iptunnel compile with 2.6.28 headers (from r24253)
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-iptunnel-fix-problems-with-linux-include.patch 2008-12-29 10:09:50 UTC (rev 24590)
@@ -0,0 +1,80 @@
+From 2534c277b4b1c519ec05689eb3525e95d4f6c602 Mon Sep 17 00:00:00 2001
+From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
+Date: Wed, 3 Dec 2008 20:16:11 +0000
+Subject: [PATCH] iptunnel: fix problems with including linux/ip_tunnel.h
+ on some systems
+
+git-svn-id: svn://busybox.net/trunk/busybox at 24253 69ca8d6d-28ef-0310-b511-8ec308f3f277
+---
+ networking/libiproute/iptunnel.c | 45 ++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 43 insertions(+), 2 deletions(-)
+
+diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
+index ab4d65b..5349587 100644
+--- a/networking/libiproute/iptunnel.c
++++ b/networking/libiproute/iptunnel.c
+@@ -6,7 +6,6 @@
+ *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *
+- *
+ * Changes:
+ *
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+@@ -18,10 +17,52 @@
+ #include <net/if.h>
+ #include <net/if_arp.h>
+ #include <asm/types.h>
++
+ #ifndef __constant_htons
+ #define __constant_htons htons
+ #endif
+-#include <linux/if_tunnel.h>
++
++// FYI: #define SIOCDEVPRIVATE 0x89F0
++
++/* From linux/if_tunnel.h. #including it proved troublesome
++ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
++#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
++#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
++#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2)
++#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3)
++//#define SIOCGETPRL (SIOCDEVPRIVATE + 4)
++//#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
++//#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
++//#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
++#define GRE_CSUM __constant_htons(0x8000)
++//#define GRE_ROUTING __constant_htons(0x4000)
++#define GRE_KEY __constant_htons(0x2000)
++#define GRE_SEQ __constant_htons(0x1000)
++//#define GRE_STRICT __constant_htons(0x0800)
++//#define GRE_REC __constant_htons(0x0700)
++//#define GRE_FLAGS __constant_htons(0x00F8)
++//#define GRE_VERSION __constant_htons(0x0007)
++struct ip_tunnel_parm {
++ char name[IFNAMSIZ];
++ int link;
++ uint16_t i_flags;
++ uint16_t o_flags;
++ uint32_t i_key;
++ uint32_t o_key;
++ struct iphdr iph;
++};
++/* SIT-mode i_flags */
++//#define SIT_ISATAP 0x0001
++//struct ip_tunnel_prl {
++// uint32_t addr;
++// uint16_t flags;
++// uint16_t __reserved;
++// uint32_t datalen;
++// uint32_t __reserved2;
++// /* data follows */
++//};
++///* PRL flags */
++//#define PRL_DEFAULT 0x0001
+
+ #include "ip_common.h" /* #include "libbb.h" is inside */
+ #include "rt_names.h"
+--
+1.5.6.5
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-11 9:35 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-11 9:35 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-11 01:35:07 -0800 (Thu, 11 Dec 2008)
New Revision: 24367
Log:
busybox: 1.13.1 bindtodevice fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-bindtodevice.patch 2008-12-11 09:35:07 UTC (rev 24367)
@@ -0,0 +1,86 @@
+--- busybox-1.13.1/include/libbb.h Sun Nov 9 18:28:17 2008
++++ busybox-1.13.1-bindtodevice/include/libbb.h Wed Dec 10 12:10:30 2008
+@@ -437,6 +437,7 @@
+ * Turn it on before you call bind(). */
+ void setsockopt_reuseaddr(int fd) FAST_FUNC; /* On Linux this never fails. */
+ int setsockopt_broadcast(int fd) FAST_FUNC;
++int setsockopt_bindtodevice(int fd, const char *iface) FAST_FUNC;
+ /* NB: returns port in host byte order */
+ unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port) FAST_FUNC;
+ typedef struct len_and_sockaddr {
+--- busybox-1.13.1/libbb/xconnect.c Sun Nov 9 18:28:09 2008
++++ busybox-1.13.1-bindtodevice/libbb/xconnect.c Wed Dec 10 23:20:29 2008
+@@ -7,6 +7,7 @@
+ */
+
+ #include <netinet/in.h>
++#include <net/if.h>
+ #include "libbb.h"
+
+ void FAST_FUNC setsockopt_reuseaddr(int fd)
+@@ -17,6 +18,20 @@
+ {
+ return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1));
+ }
++int FAST_FUNC setsockopt_bindtodevice(int fd, const char *iface)
++{
++ int r;
++ struct ifreq ifr;
++ strncpy(ifr.ifr_name, iface, IFNAMSIZ);
++ /* Actually, ifr_name is at offset 0, and in practice
++ * just giving char[IFNAMSIZ] instead of struct ifreq works too.
++ * But just in case it's not true on some obscure arch... */
++ r = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
++ if (r)
++ bb_perror_msg("can't bind to interface %s", iface);
++ return r;
++}
++
+
+ void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
+ {
+--- busybox-1.13.1/networking/arping.c Sun Nov 9 18:27:59 2008
++++ busybox-1.13.1-bindtodevice/networking/arping.c Wed Dec 10 12:10:30 2008
+@@ -322,8 +322,7 @@
+ struct sockaddr_in saddr;
+ int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+
+- if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
+- bb_perror_msg("cannot bind to device %s", device);
++ setsockopt_bindtodevice(probe_fd, device);
+ memset(&saddr, 0, sizeof(saddr));
+ saddr.sin_family = AF_INET;
+ if (src.s_addr) {
+--- busybox-1.13.1/networking/ping.c Sun Nov 9 18:27:59 2008
++++ busybox-1.13.1-bindtodevice/networking/ping.c Wed Dec 10 12:10:30 2008
+@@ -572,7 +572,7 @@
+ xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+ }
+ if (str_I)
+- setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1);
++ setsockopt_bindtodevice(pingsock, str_I);
+
+ /* enable broadcast pings */
+ setsockopt_broadcast(pingsock);
+@@ -622,7 +622,7 @@
+ if (source_lsa)
+ xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+ if (str_I)
+- setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, str_I, strlen(str_I) + 1);
++ setsockopt_bindtodevice(pingsock, str_I);
+
+ #ifdef ICMP6_FILTER
+ {
+--- busybox-1.13.1/networking/udhcp/socket.c Sun Nov 9 18:27:58 2008
++++ busybox-1.13.1-bindtodevice/networking/udhcp/socket.c Wed Dec 10 12:10:30 2008
+@@ -98,8 +98,8 @@
+ bb_perror_msg_and_die("SO_BROADCAST");
+
+ /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
+- if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &inf, strlen(inf) + 1) == -1)
+- bb_perror_msg_and_die("SO_BINDTODEVICE");
++ if (setsockopt_bindtodevice(fd, inf))
++ xfunc_die(); /* warning is already printed */
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-10 13:46 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-10 13:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-10 05:46:19 -0800 (Wed, 10 Dec 2008)
New Revision: 24359
Log:
busybox: additional 1.13.1 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-init.patch
trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-init.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-init.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-init.patch 2008-12-10 13:46:19 UTC (rev 24359)
@@ -0,0 +1,28 @@
+--- busybox-1.13.1/init/init.c Sat Nov 29 07:48:56 2008
++++ busybox-1.13.1-init/init/init.c Tue Dec 9 22:17:43 2008
+@@ -118,18 +118,18 @@
+
+ msg[0] = '\r';
+ va_start(arguments, fmt);
+- l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
+- if (l > sizeof(msg) - 2)
+- l = sizeof(msg) - 2;
++ l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
++ if (l > sizeof(msg) - 1)
++ l = sizeof(msg) - 1;
+ msg[l] = '\0';
+ va_end(arguments);
+
+ if (ENABLE_FEATURE_INIT_SYSLOG) {
+- /* Log the message to syslogd */
+ if (where & L_LOG) {
+- /* don't print out "\r" */
+- openlog(applet_name, 0, LOG_DAEMON);
+- syslog(LOG_INFO, "init: %s", msg + 1);
++ /* Log the message to syslogd */
++ openlog("init", 0, LOG_DAEMON);
++ /* don't print "\r" */
++ syslog(LOG_INFO, "%s", msg + 1);
+ closelog();
+ }
+ msg[l++] = '\n';
Added: trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-printf.patch 2008-12-10 13:46:19 UTC (rev 24359)
@@ -0,0 +1,19 @@
+--- busybox-1.13.1/coreutils/printf.c Sun Nov 9 18:28:07 2008
++++ busybox-1.13.1-printf/coreutils/printf.c Wed Dec 10 12:50:55 2008
+@@ -359,8 +359,15 @@
+ * We will mimic coreutils. */
+ if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
+ argv++;
+- if (!argv[1])
++ if (!argv[1]) {
++ if (ENABLE_ASH_BUILTIN_PRINTF
++ && applet_name[0] != 'p'
++ ) {
++ bb_error_msg("usage: printf FORMAT [ARGUMENT...]");
++ return 2; /* bash compat */
++ }
+ bb_show_usage();
++ }
+
+ format = argv[1];
+ argv2 = argv + 2;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-07 21:22 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-07 21:22 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-07 13:22:48 -0800 (Sun, 07 Dec 2008)
New Revision: 24302
Log:
busybox: 1.13.1 crond fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-crond.patch 2008-12-07 21:22:48 UTC (rev 24302)
@@ -0,0 +1,20 @@
+--- busybox-1.13.1/miscutils/crond.c Sun Nov 9 18:28:17 2008
++++ busybox-1.13.1-crond/miscutils/crond.c Thu Dec 4 14:56:10 2008
+@@ -779,6 +779,8 @@
+ xmove_fd(mailFd, mail_filename ? 1 : 0);
+ dup2(1, 2);
+ }
++ /* crond 3.0pl1-100 puts tasks in separate process groups */
++ bb_setpgrp();
+ execlp(prog, prog, cmd, arg, NULL);
+ crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user, prog, cmd, arg);
+ if (mail_filename) {
+@@ -914,6 +916,8 @@
+ if (DebugOpt) {
+ crondlog(LVL5 "child running %s", DEFAULT_SHELL);
+ }
++ /* crond 3.0pl1-100 puts tasks in separate process groups */
++ bb_setpgrp();
+ execl(DEFAULT_SHELL, DEFAULT_SHELL, "-c", line->cl_Shell, NULL);
+ crondlog(ERR20 "can't exec, user %s cmd %s %s %s", user,
+ DEFAULT_SHELL, "-c", line->cl_Shell);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-12-04 13:21 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-12-04 13:21 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-04 05:21:36 -0800 (Thu, 04 Dec 2008)
New Revision: 24260
Log:
busybox: 1.13.1 ip fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.1-ip.patch 2008-12-04 13:21:36 UTC (rev 24260)
@@ -0,0 +1,11 @@
+--- busybox-1.13.1/networking/ip.c Sun Nov 9 18:27:59 2008
++++ busybox-1.13.1-ip/networking/ip.c Thu Dec 4 13:16:29 2008
+@@ -31,7 +31,7 @@
+
+ static int ip_do(int (*ip_func)(char **argv), char **argv)
+ {
+- argv = ip_parse_common_args(argv);
++ argv = ip_parse_common_args(argv + 1);
+ return ip_func(argv);
+ }
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-29 20:12 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-29 20:12 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-29 12:12:17 -0800 (Sat, 29 Nov 2008)
New Revision: 24185
Log:
busybox: bump 1.12.x / 1.13.x versions
Removed:
trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch
trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch
trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch
trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch
trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch
trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch
trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/Config.in 2008-11-29 20:12:17 UTC (rev 24185)
@@ -65,8 +65,8 @@
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X
- default "1.12.2" if BR2_BUSYBOX_VERSION_1_12_X
- default "1.13.0" if BR2_BUSYBOX_VERSION_1_13_X
+ default "1.12.3" if BR2_BUSYBOX_VERSION_1_12_X
+ default "1.13.1" if BR2_BUSYBOX_VERSION_1_13_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
Deleted: trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,22 +0,0 @@
---- busybox-1.12.2/libbb/getopt32.c Sun Nov 9 18:20:37 2008
-+++ busybox-1.12.2-getopt/libbb/getopt32.c Wed Nov 12 23:03:33 2008
-@@ -515,6 +515,19 @@
- }
- }
-
-+ /* In case getopt32 was already called:
-+ * reset the libc getopt() function, which keeps internal state.
-+ * run_nofork_applet_prime() does this, but we might end up here
-+ * also via gunzip_main() -> gzip_main(). Play safe.
-+ */
-+#ifdef __GLIBC__
-+ optind = 0;
-+#else /* BSD style */
-+ optind = 1;
-+ /* optreset = 1; */
-+#endif
-+ /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
-+
- pargv = NULL;
-
- /* Note: just "getopt() <= 0" will not work well for
Deleted: trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,13 +0,0 @@
---- busybox-1.12.2/libbb/lineedit.c Sun Nov 9 18:20:16 2008
-+++ busybox-1.12.2-lineedit/libbb/lineedit.c Tue Nov 11 21:02:04 2008
-@@ -1415,8 +1415,10 @@
- if ((state->flags & SAVE_HISTORY) && state->hist_file)
- load_history(state->hist_file);
- #endif
-+#if MAX_HISTORY > 0
- if (state->flags & DO_HISTORY)
- state->cur_history = state->cnt_history;
-+#endif
-
- /* prepare before init handlers */
- cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,275 +0,0 @@
---- busybox-1.13.0/shell/ash.c Thu Oct 30 08:41:32 2008
-+++ busybox-1.13.0-ash/shell/ash.c Fri Nov 28 04:39:17 2008
-@@ -536,6 +536,7 @@
- #define NHERE 24
- #define NXHERE 25
- #define NNOT 26
-+#define N_NUMBER 27
-
- union node;
-
-@@ -7546,43 +7547,46 @@
-
- /* ============ eval.c */
-
--static int funcblocksize; /* size of structures in function */
--static int funcstringsize; /* size of strings in node */
--static void *funcblock; /* block to allocate function from */
--static char *funcstring; /* block to allocate strings from */
-+static int funcblocksize; /* size of structures in function */
-+static int funcstringsize; /* size of strings in node */
-+static void *funcblock; /* block to allocate function from */
-+static char *funcstring; /* block to allocate strings from */
-
- /* flags in argument to evaltree */
--#define EV_EXIT 01 /* exit after evaluating tree */
--#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
-+#define EV_EXIT 01 /* exit after evaluating tree */
-+#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
- #define EV_BACKCMD 04 /* command executing within back quotes */
-
--static const short nodesize[26] = {
-- SHELL_ALIGN(sizeof(struct ncmd)),
-- SHELL_ALIGN(sizeof(struct npipe)),
-- SHELL_ALIGN(sizeof(struct nredir)),
-- SHELL_ALIGN(sizeof(struct nredir)),
-- SHELL_ALIGN(sizeof(struct nredir)),
-- SHELL_ALIGN(sizeof(struct nbinary)),
-- SHELL_ALIGN(sizeof(struct nbinary)),
-- SHELL_ALIGN(sizeof(struct nbinary)),
-- SHELL_ALIGN(sizeof(struct nif)),
-- SHELL_ALIGN(sizeof(struct nbinary)),
-- SHELL_ALIGN(sizeof(struct nbinary)),
-- SHELL_ALIGN(sizeof(struct nfor)),
-- SHELL_ALIGN(sizeof(struct ncase)),
-- SHELL_ALIGN(sizeof(struct nclist)),
-- SHELL_ALIGN(sizeof(struct narg)),
-- SHELL_ALIGN(sizeof(struct narg)),
-- SHELL_ALIGN(sizeof(struct nfile)),
-- SHELL_ALIGN(sizeof(struct nfile)),
-- SHELL_ALIGN(sizeof(struct nfile)),
-- SHELL_ALIGN(sizeof(struct nfile)),
-- SHELL_ALIGN(sizeof(struct nfile)),
-- SHELL_ALIGN(sizeof(struct ndup)),
-- SHELL_ALIGN(sizeof(struct ndup)),
-- SHELL_ALIGN(sizeof(struct nhere)),
-- SHELL_ALIGN(sizeof(struct nhere)),
-- SHELL_ALIGN(sizeof(struct nnot)),
-+static const short nodesize[N_NUMBER] = {
-+ [NCMD ] = SHELL_ALIGN(sizeof(struct ncmd)),
-+ [NPIPE ] = SHELL_ALIGN(sizeof(struct npipe)),
-+ [NREDIR ] = SHELL_ALIGN(sizeof(struct nredir)),
-+ [NBACKGND ] = SHELL_ALIGN(sizeof(struct nredir)),
-+ [NSUBSHELL] = SHELL_ALIGN(sizeof(struct nredir)),
-+ [NAND ] = SHELL_ALIGN(sizeof(struct nbinary)),
-+ [NOR ] = SHELL_ALIGN(sizeof(struct nbinary)),
-+ [NSEMI ] = SHELL_ALIGN(sizeof(struct nbinary)),
-+ [NIF ] = SHELL_ALIGN(sizeof(struct nif)),
-+ [NWHILE ] = SHELL_ALIGN(sizeof(struct nbinary)),
-+ [NUNTIL ] = SHELL_ALIGN(sizeof(struct nbinary)),
-+ [NFOR ] = SHELL_ALIGN(sizeof(struct nfor)),
-+ [NCASE ] = SHELL_ALIGN(sizeof(struct ncase)),
-+ [NCLIST ] = SHELL_ALIGN(sizeof(struct nclist)),
-+ [NDEFUN ] = SHELL_ALIGN(sizeof(struct narg)),
-+ [NARG ] = SHELL_ALIGN(sizeof(struct narg)),
-+ [NTO ] = SHELL_ALIGN(sizeof(struct nfile)),
-+#if ENABLE_ASH_BASH_COMPAT
-+ [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)),
-+#endif
-+ [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)),
-+ [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)),
-+ [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)),
-+ [NAPPEND ] = SHELL_ALIGN(sizeof(struct nfile)),
-+ [NTOFD ] = SHELL_ALIGN(sizeof(struct ndup)),
-+ [NFROMFD ] = SHELL_ALIGN(sizeof(struct ndup)),
-+ [NHERE ] = SHELL_ALIGN(sizeof(struct nhere)),
-+ [NXHERE ] = SHELL_ALIGN(sizeof(struct nhere)),
-+ [NNOT ] = SHELL_ALIGN(sizeof(struct nnot)),
- };
-
- static void calcsize(union node *n);
-@@ -9065,8 +9069,6 @@
- * This implements the input routines used by the parser.
- */
-
--#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
--
- enum {
- INPUT_PUSH_FILE = 1,
- INPUT_NOFILE_OK = 2,
-@@ -9107,7 +9109,6 @@
- #endif
- parsenextc = sp->prevstring;
- parsenleft = sp->prevnleft;
--/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
- g_parsefile->strpush = sp->prev;
- if (sp != &(g_parsefile->basestrpush))
- free(sp);
-@@ -9123,7 +9124,7 @@
-
- #if ENABLE_FEATURE_EDITING
- retry:
-- if (!iflag || g_parsefile->fd)
-+ if (!iflag || g_parsefile->fd != STDIN_FILENO)
- nr = nonblock_safe_read(g_parsefile->fd, buf, BUFSIZ - 1);
- else {
- #if ENABLE_FEATURE_TAB_COMPLETION
-@@ -9171,55 +9172,76 @@
- * Refill the input buffer and return the next input character:
- *
- * 1) If a string was pushed back on the input, pop it;
-- * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
-+ * 2) If an EOF was pushed back (parsenleft < -BIGNUM) or we are reading
- * from a string so we can't refill the buffer, return EOF.
- * 3) If the is more stuff in this buffer, use it else call read to fill it.
- * 4) Process input up to the next newline, deleting nul characters.
- */
-+//#define pgetc_debug(...) bb_error_msg(__VA_ARGS__)
-+#define pgetc_debug(...) ((void)0)
- static int
- preadbuffer(void)
- {
- char *q;
- int more;
-- char savec;
-
- while (g_parsefile->strpush) {
- #if ENABLE_ASH_ALIAS
-- if (parsenleft == -1 && g_parsefile->strpush->ap &&
-- parsenextc[-1] != ' ' && parsenextc[-1] != '\t') {
-+ if (parsenleft == -1 && g_parsefile->strpush->ap
-+ && parsenextc[-1] != ' ' && parsenextc[-1] != '\t'
-+ ) {
-+ pgetc_debug("preadbuffer PEOA");
- return PEOA;
- }
- #endif
- popstring();
-+ /* try "pgetc" now: */
-+ pgetc_debug("internal pgetc at %d:%p'%s'", parsenleft, parsenextc, parsenextc);
- if (--parsenleft >= 0)
- return signed_char2int(*parsenextc++);
- }
-- if (parsenleft == EOF_NLEFT || g_parsefile->buf == NULL)
-+ /* on both branches above parsenleft < 0.
-+ * "pgetc" needs refilling.
-+ */
-+
-+ /* -90 is -BIGNUM. Below we use -99 to mark "EOF on read",
-+ * pungetc() may decrement it a few times. -90 is enough.
-+ */
-+ if (parsenleft < -90 || g_parsefile->buf == NULL) {
-+ pgetc_debug("preadbuffer PEOF1");
-+ /* even in failure keep them in lock step,
-+ * for correct pungetc. */
-+ parsenextc++;
- return PEOF;
-- flush_stdout_stderr();
-+ }
-
- more = parselleft;
- if (more <= 0) {
-+ flush_stdout_stderr();
- again:
- more = preadfd();
- if (more <= 0) {
-- parselleft = parsenleft = EOF_NLEFT;
-+ parselleft = parsenleft = -99;
-+ pgetc_debug("preadbuffer PEOF2");
-+ parsenextc++;
- return PEOF;
- }
- }
-
-+ /* Find out where's the end of line.
-+ * Set parsenleft/parselleft acordingly.
-+ * NUL chars are deleted.
-+ */
- q = parsenextc;
--
-- /* delete nul characters */
- for (;;) {
-- int c;
-+ char c;
-
- more--;
-- c = *q;
-
-- if (!c)
-+ c = *q;
-+ if (c == '\0') {
- memmove(q, q + 1, more);
-- else {
-+ } else {
- q++;
- if (c == '\n') {
- parsenleft = q - parsenextc - 1;
-@@ -9236,22 +9258,23 @@
- }
- parselleft = more;
-
-- savec = *q;
-- *q = '\0';
--
- if (vflag) {
-+ char save = *q;
-+ *q = '\0';
- out2str(parsenextc);
-+ *q = save;
- }
-
-- *q = savec;
--
-+ pgetc_debug("preadbuffer@%d:%p'%s'", parsenleft, parsenextc, parsenextc);
- return signed_char2int(*parsenextc++);
- }
-
- #define pgetc_as_macro() (--parsenleft >= 0 ? signed_char2int(*parsenextc++) : preadbuffer())
-+
- static int
- pgetc(void)
- {
-+ pgetc_debug("pgetc at %d:%p'%s'", parsenleft, parsenextc, parsenextc);
- return pgetc_as_macro();
- }
-
-@@ -9312,6 +9335,7 @@
- {
- parsenleft++;
- parsenextc--;
-+ pgetc_debug("pushed back to %d:%p'%s'", parsenleft, parsenextc, parsenextc);
- }
-
- /*
-@@ -9325,16 +9349,17 @@
- pushstring(char *s, struct alias *ap)
- {
- struct strpush *sp;
-- size_t len;
-+ int len;
-
- len = strlen(s);
- INT_OFF;
- if (g_parsefile->strpush) {
-- sp = ckzalloc(sizeof(struct strpush));
-+ sp = ckzalloc(sizeof(*sp));
- sp->prev = g_parsefile->strpush;
-- g_parsefile->strpush = sp;
-- } else
-- sp = g_parsefile->strpush = &(g_parsefile->basestrpush);
-+ } else {
-+ sp = &(g_parsefile->basestrpush);
-+ }
-+ g_parsefile->strpush = sp;
- sp->prevstring = parsenextc;
- sp->prevnleft = parsenleft;
- #if ENABLE_ASH_ALIAS
-@@ -9424,7 +9449,7 @@
- close_on_exec_on(fd);
- if (push) {
- pushfile();
-- g_parsefile->buf = 0;
-+ g_parsefile->buf = NULL;
- }
- g_parsefile->fd = fd;
- if (g_parsefile->buf == NULL)
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,22 +0,0 @@
---- busybox-1.13.0/libbb/getopt32.c Thu Oct 30 08:41:34 2008
-+++ busybox-1.13.0-getopt/libbb/getopt32.c Wed Nov 12 23:04:01 2008
-@@ -515,6 +515,19 @@
- }
- }
-
-+ /* In case getopt32 was already called:
-+ * reset the libc getopt() function, which keeps internal state.
-+ * run_nofork_applet_prime() does this, but we might end up here
-+ * also via gunzip_main() -> gzip_main(). Play safe.
-+ */
-+#ifdef __GLIBC__
-+ optind = 0;
-+#else /* BSD style */
-+ optind = 1;
-+ /* optreset = 1; */
-+#endif
-+ /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
-+
- pargv = NULL;
-
- /* Note: just "getopt() <= 0" will not work well for
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-id.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-id.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,17 +0,0 @@
---- busybox-1.13.0/coreutils/id.c Wed Nov 5 22:39:54 2008
-+++ busybox-1.13.0-id/coreutils/id.c Mon Nov 17 01:10:04 2008
-@@ -17,6 +17,14 @@
-
- #include "libbb.h"
-
-+#if !ENABLE_USE_BB_PWD_GRP
-+#if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0)
-+#if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30)
-+#error "Sorry, you need@least uClibc version 0.9.30 for id applet to build"
-+#endif
-+#endif
-+#endif
-+
- enum {
- PRINT_REAL = (1 << 0),
- NAME_NOT_NUMBER = (1 << 1),
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,101 +0,0 @@
---- busybox-1.13.0/miscutils/inotifyd.c Thu Oct 30 08:41:37 2008
-+++ busybox-1.13.0-inotify/miscutils/inotifyd.c Fri Nov 14 22:33:27 2008
-@@ -51,6 +51,7 @@
- int inotifyd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int inotifyd_main(int argc UNUSED_PARAM, char **argv)
- {
-+ int n;
- unsigned mask = IN_ALL_EVENTS; // assume we want all events
- struct pollfd pfd;
- char **watched = ++argv; // watched name list
-@@ -69,7 +70,6 @@
- while (*++argv) {
- char *path = *argv;
- char *masks = strchr(path, ':');
-- int wd; // watch descriptor
- // if mask is specified ->
- if (masks) {
- *masks = '\0'; // split path and mask
-@@ -83,32 +83,39 @@
- }
- }
- // add watch
-- wd = inotify_add_watch(pfd.fd, path, mask);
-- if (wd < 0) {
-+ n = inotify_add_watch(pfd.fd, path, mask);
-+ if (n < 0)
- bb_perror_msg_and_die("add watch (%s) failed", path);
--// } else {
--// bb_error_msg("added %d [%s]:%4X", wd, path, mask);
-- }
-+ //bb_error_msg("added %d [%s]:%4X", n, path, mask);
- }
-
- // setup signals
-- bb_signals(0
-- + (1 << SIGHUP)
-- + (1 << SIGINT)
-- + (1 << SIGTERM)
-- + (1 << SIGPIPE)
-- , record_signo);
-+ bb_signals(BB_FATAL_SIGS, record_signo);
-
- // do watch
--
--// pfd.fd = fd;
- pfd.events = POLLIN;
--
-- while (!bb_got_signal && poll(&pfd, 1, -1) > 0) {
-+ while (1) {
- ssize_t len;
- void *buf;
- struct inotify_event *ie;
-
-+ again:
-+ if (bb_got_signal)
-+ break;
-+ n = poll(&pfd, 1, -1);
-+ /* Signal interrupted us? */
-+ if (n < 0 && errno == EINTR)
-+ goto again;
-+ // Under Linux, above if() is not necessary.
-+ // Non-fatal signals, e.g. SIGCHLD, when set to SIG_DFL,
-+ // are not interrupting poll().
-+ // Thus we can just break if n <= 0 (see below),
-+ // because EINTR will happen only on SIGTERM et al.
-+ // But this might be not true under other Unixes,
-+ // and is generally way too subtle to depend on.
-+ if (n <= 0) // strange error?
-+ break;
-+
- // read out all pending events
- xioctl(pfd.fd, FIONREAD, &len);
- #define eventbuf bb_common_bufsiz1
-@@ -117,21 +124,21 @@
- // process events. N.B. events may vary in length
- while (len > 0) {
- int i;
-- char events[12];
-+ char events[sizeof(mask_names)];
- char *s = events;
- unsigned m = ie->mask;
-
-- for (i = 0; i < 12; ++i, m >>= 1) {
-- if (m & 1) {
-+ for (i = 0; i < sizeof(mask_names)-1; ++i, m >>= 1) {
-+ if (m & 1)
- *s++ = mask_names[i];
-- }
- }
- *s = '\0';
--// bb_error_msg("exec %s %08X\t%s\t%s\t%s", agent, ie->mask, events, watched[ie->wd], ie->len ? ie->name : "");
-+ //bb_error_msg("exec %s %08X\t%s\t%s\t%s", agent,
-+ // ie->mask, events, watched[ie->wd], ie->len ? ie->name : "");
- args[1] = events;
- args[2] = watched[ie->wd];
- args[3] = ie->len ? ie->name : NULL;
-- xspawn((char **)args);
-+ wait4pid(xspawn((char **)args));
- // next event
- i = sizeof(struct inotify_event) + ie->len;
- len -= i;
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,29 +0,0 @@
---- busybox-1.13.0/sysklogd/klogd.c Thu Oct 30 08:41:28 2008
-+++ busybox-1.13.0-klogd/sysklogd/klogd.c Thu Nov 20 00:46:00 2008
-@@ -73,9 +73,6 @@
-
- syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
-
-- /* Initially null terminate the buffer in case of a very long line */
-- log_buffer[KLOGD_LOGBUF_SIZE - 1] = '\0';
--
- while (1) {
- int n;
- int priority;
-@@ -89,6 +86,7 @@
- errno);
- break;
- }
-+ log_buffer[used + n] = '\0';
-
- /* klogctl buffer parsing modelled after code in dmesg.c */
- start = &log_buffer[0];
-@@ -101,7 +99,7 @@
- /* This line is incomplete... */
- if (start != log_buffer) {
- /* move it to the front of the buffer */
-- strcpy(log_buffer, start);
-+ overlapping_strcpy(log_buffer, start);
- /* don't log it yet */
- used = strlen(log_buffer);
- break;
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,13 +0,0 @@
---- busybox-1.13.0/libbb/lineedit.c Wed Nov 5 22:39:54 2008
-+++ busybox-1.13.0-lineedit/libbb/lineedit.c Wed Nov 12 23:18:05 2008
-@@ -1415,8 +1415,10 @@
- if ((state->flags & SAVE_HISTORY) && state->hist_file)
- load_history(state->hist_file);
- #endif
-+#if MAX_HISTORY > 0
- if (state->flags & DO_HISTORY)
- state->cur_history = state->cnt_history;
-+#endif
-
- /* prepare before init handlers */
- cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
Deleted: trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch 2008-11-29 16:46:07 UTC (rev 24184)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch 2008-11-29 20:12:17 UTC (rev 24185)
@@ -1,47 +0,0 @@
---- busybox-1.13.0/modutils/modprobe-small.c Thu Oct 30 08:41:28 2008
-+++ busybox-1.13.0-modprobe/modutils/modprobe-small.c Mon Nov 10 22:19:03 2008
-@@ -600,18 +600,22 @@
- free(deps);
-
- /* modprobe -> load it */
-- if (!is_rmmod && (options && !strstr(options, "blacklist"))) {
-- errno = 0;
-- if (load_module(info->pathname, options) != 0) {
-- if (EEXIST != errno) {
-- bb_error_msg("'%s': %s",
-+ if (!is_rmmod) {
-+ if (!options || strstr(options, "blacklist") == NULL) {
-+ errno = 0;
-+ if (load_module(info->pathname, options) != 0) {
-+ if (EEXIST != errno) {
-+ bb_error_msg("'%s': %s",
- info->pathname,
- moderror(errno));
-- } else {
-- dbg1_error_msg("'%s': %s",
-+ } else {
-+ dbg1_error_msg("'%s': %s",
- info->pathname,
- moderror(errno));
-+ }
- }
-+ } else {
-+ dbg1_error_msg("'%s': blacklisted", info->pathname);
- }
- }
- ret:
---- busybox-1.13.0/modutils/modutils-24.c Thu Oct 30 08:41:28 2008
-+++ busybox-1.13.0-modprobe/modutils/modutils-24.c Wed Nov 12 01:02:54 2008
-@@ -3236,8 +3236,10 @@
- }
-
- shnum = f->header.e_shnum;
-- f->sections = xmalloc(sizeof(struct obj_section *) * shnum);
-- memset(f->sections, 0, sizeof(struct obj_section *) * shnum);
-+ /* Growth of ->sections vector will be done by
-+ * xrealloc_vector(..., 2, ...), therefore we must allocate
-+ * at least 2^2 = 4 extra elements here. */
-+ f->sections = xzalloc(sizeof(f->sections[0]) * (shnum + 4));
-
- section_headers = alloca(sizeof(ElfW(Shdr)) * shnum);
- fseek(fp, f->header.e_shoff, SEEK_SET);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-28 8:19 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-28 8:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-28 00:19:23 -0800 (Fri, 28 Nov 2008)
New Revision: 24172
Log:
busybox: updated 1.13.0 ash fix
Modified:
trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
Changeset:
Modified: trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-28 04:01:03 UTC (rev 24171)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-28 08:19:23 UTC (rev 24172)
@@ -1,5 +1,5 @@
--- busybox-1.13.0/shell/ash.c Thu Oct 30 08:41:32 2008
-+++ busybox-1.13.0-ash/shell/ash.c Sat Nov 22 02:31:06 2008
++++ busybox-1.13.0-ash/shell/ash.c Fri Nov 28 04:39:17 2008
@@ -536,6 +536,7 @@
#define NHERE 24
#define NXHERE 25
@@ -88,3 +88,188 @@
};
static void calcsize(union node *n);
+@@ -9065,8 +9069,6 @@
+ * This implements the input routines used by the parser.
+ */
+
+-#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
+-
+ enum {
+ INPUT_PUSH_FILE = 1,
+ INPUT_NOFILE_OK = 2,
+@@ -9107,7 +9109,6 @@
+ #endif
+ parsenextc = sp->prevstring;
+ parsenleft = sp->prevnleft;
+-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+ g_parsefile->strpush = sp->prev;
+ if (sp != &(g_parsefile->basestrpush))
+ free(sp);
+@@ -9123,7 +9124,7 @@
+
+ #if ENABLE_FEATURE_EDITING
+ retry:
+- if (!iflag || g_parsefile->fd)
++ if (!iflag || g_parsefile->fd != STDIN_FILENO)
+ nr = nonblock_safe_read(g_parsefile->fd, buf, BUFSIZ - 1);
+ else {
+ #if ENABLE_FEATURE_TAB_COMPLETION
+@@ -9171,55 +9172,76 @@
+ * Refill the input buffer and return the next input character:
+ *
+ * 1) If a string was pushed back on the input, pop it;
+- * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
++ * 2) If an EOF was pushed back (parsenleft < -BIGNUM) or we are reading
+ * from a string so we can't refill the buffer, return EOF.
+ * 3) If the is more stuff in this buffer, use it else call read to fill it.
+ * 4) Process input up to the next newline, deleting nul characters.
+ */
++//#define pgetc_debug(...) bb_error_msg(__VA_ARGS__)
++#define pgetc_debug(...) ((void)0)
+ static int
+ preadbuffer(void)
+ {
+ char *q;
+ int more;
+- char savec;
+
+ while (g_parsefile->strpush) {
+ #if ENABLE_ASH_ALIAS
+- if (parsenleft == -1 && g_parsefile->strpush->ap &&
+- parsenextc[-1] != ' ' && parsenextc[-1] != '\t') {
++ if (parsenleft == -1 && g_parsefile->strpush->ap
++ && parsenextc[-1] != ' ' && parsenextc[-1] != '\t'
++ ) {
++ pgetc_debug("preadbuffer PEOA");
+ return PEOA;
+ }
+ #endif
+ popstring();
++ /* try "pgetc" now: */
++ pgetc_debug("internal pgetc at %d:%p'%s'", parsenleft, parsenextc, parsenextc);
+ if (--parsenleft >= 0)
+ return signed_char2int(*parsenextc++);
+ }
+- if (parsenleft == EOF_NLEFT || g_parsefile->buf == NULL)
++ /* on both branches above parsenleft < 0.
++ * "pgetc" needs refilling.
++ */
++
++ /* -90 is -BIGNUM. Below we use -99 to mark "EOF on read",
++ * pungetc() may decrement it a few times. -90 is enough.
++ */
++ if (parsenleft < -90 || g_parsefile->buf == NULL) {
++ pgetc_debug("preadbuffer PEOF1");
++ /* even in failure keep them in lock step,
++ * for correct pungetc. */
++ parsenextc++;
+ return PEOF;
+- flush_stdout_stderr();
++ }
+
+ more = parselleft;
+ if (more <= 0) {
++ flush_stdout_stderr();
+ again:
+ more = preadfd();
+ if (more <= 0) {
+- parselleft = parsenleft = EOF_NLEFT;
++ parselleft = parsenleft = -99;
++ pgetc_debug("preadbuffer PEOF2");
++ parsenextc++;
+ return PEOF;
+ }
+ }
+
++ /* Find out where's the end of line.
++ * Set parsenleft/parselleft acordingly.
++ * NUL chars are deleted.
++ */
+ q = parsenextc;
+-
+- /* delete nul characters */
+ for (;;) {
+- int c;
++ char c;
+
+ more--;
+- c = *q;
+
+- if (!c)
++ c = *q;
++ if (c == '\0') {
+ memmove(q, q + 1, more);
+- else {
++ } else {
+ q++;
+ if (c == '\n') {
+ parsenleft = q - parsenextc - 1;
+@@ -9236,22 +9258,23 @@
+ }
+ parselleft = more;
+
+- savec = *q;
+- *q = '\0';
+-
+ if (vflag) {
++ char save = *q;
++ *q = '\0';
+ out2str(parsenextc);
++ *q = save;
+ }
+
+- *q = savec;
+-
++ pgetc_debug("preadbuffer@%d:%p'%s'", parsenleft, parsenextc, parsenextc);
+ return signed_char2int(*parsenextc++);
+ }
+
+ #define pgetc_as_macro() (--parsenleft >= 0 ? signed_char2int(*parsenextc++) : preadbuffer())
++
+ static int
+ pgetc(void)
+ {
++ pgetc_debug("pgetc at %d:%p'%s'", parsenleft, parsenextc, parsenextc);
+ return pgetc_as_macro();
+ }
+
+@@ -9312,6 +9335,7 @@
+ {
+ parsenleft++;
+ parsenextc--;
++ pgetc_debug("pushed back to %d:%p'%s'", parsenleft, parsenextc, parsenextc);
+ }
+
+ /*
+@@ -9325,16 +9349,17 @@
+ pushstring(char *s, struct alias *ap)
+ {
+ struct strpush *sp;
+- size_t len;
++ int len;
+
+ len = strlen(s);
+ INT_OFF;
+ if (g_parsefile->strpush) {
+- sp = ckzalloc(sizeof(struct strpush));
++ sp = ckzalloc(sizeof(*sp));
+ sp->prev = g_parsefile->strpush;
+- g_parsefile->strpush = sp;
+- } else
+- sp = g_parsefile->strpush = &(g_parsefile->basestrpush);
++ } else {
++ sp = &(g_parsefile->basestrpush);
++ }
++ g_parsefile->strpush = sp;
+ sp->prevstring = parsenextc;
+ sp->prevnleft = parsenleft;
+ #if ENABLE_ASH_ALIAS
+@@ -9424,7 +9449,7 @@
+ close_on_exec_on(fd);
+ if (push) {
+ pushfile();
+- g_parsefile->buf = 0;
++ g_parsefile->buf = NULL;
+ }
+ g_parsefile->fd = fd;
+ if (g_parsefile->buf == NULL)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-22 6:49 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-22 6:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-21 22:49:33 -0800 (Fri, 21 Nov 2008)
New Revision: 24119
Log:
busybox: updated 1.13.0 ash fix
Modified:
trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
Changeset:
Modified: trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-22 06:49:30 UTC (rev 24118)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-22 06:49:33 UTC (rev 24119)
@@ -1,7 +1,6 @@
-diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c
---- busybox-1.13.0/shell/ash.c 2008-10-30 08:41:32.000000000 +0100
-+++ busybox-1.13.0-ash/shell/ash.c 2008-11-21 11:38:04.000000000 +0100
-@@ -536,6 +536,7 @@ static const char dolatstr[] ALIGN1 = {
+--- busybox-1.13.0/shell/ash.c Thu Oct 30 08:41:32 2008
++++ busybox-1.13.0-ash/shell/ash.c Sat Nov 22 02:31:06 2008
+@@ -536,6 +536,7 @@
#define NHERE 24
#define NXHERE 25
#define NNOT 26
@@ -9,7 +8,7 @@
union node;
-@@ -7546,43 +7547,44 @@ commandcmd(int argc UNUSED_PARAM, char *
+@@ -7546,43 +7547,46 @@
/* ============ eval.c */
@@ -74,7 +73,9 @@
+ [NDEFUN ] = SHELL_ALIGN(sizeof(struct narg)),
+ [NARG ] = SHELL_ALIGN(sizeof(struct narg)),
+ [NTO ] = SHELL_ALIGN(sizeof(struct nfile)),
++#if ENABLE_ASH_BASH_COMPAT
+ [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)),
++#endif
+ [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)),
+ [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)),
+ [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)),
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-21 14:36 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-21 14:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-21 06:36:48 -0800 (Fri, 21 Nov 2008)
New Revision: 24114
Log:
busybox: fixup id applet on 1.13.0 for old uclibc versions
The id applet in 1.13.0 only compiles with uclibc < 0.9.30 if the
busybox internal passwd/grp functions are used.
Therefore, automatically enable CONFIG_USE_BB_PWD_GRP if that situation
is detected and warn the user.
Modified:
trunk/buildroot/package/busybox/busybox-1.13.x.config
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox-1.13.x.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.x.config 2008-11-21 11:50:13 UTC (rev 24113)
+++ trunk/buildroot/package/busybox/busybox-1.13.x.config 2008-11-21 14:36:48 UTC (rev 24114)
@@ -171,7 +171,7 @@
CONFIG_HEAD=y
CONFIG_FEATURE_FANCY_HEAD=y
CONFIG_HOSTID=y
-# CONFIG_ID is not set
+CONFIG_ID=y
CONFIG_INSTALL=y
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
CONFIG_LENGTH=y
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2008-11-21 11:50:13 UTC (rev 24113)
+++ trunk/buildroot/package/busybox/busybox.mk 2008-11-21 14:36:48 UTC (rev 24114)
@@ -60,6 +60,14 @@
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config
endif
+# id applet breaks on 1.13.0 with old uclibc unless the bb pwd routines are used
+ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_UCLIBC_VERSION_0_9_28_3)$(BR2_UCLIBC_VERSION_0_9_29),yy)
+ if grep -q 'CONFIG_ID=y' $(BUSYBOX_DIR)/.config; \
+ then \
+ echo 'warning: CONFIG_ID needs BB_PWD_GRP with old uclibc, enabling' >&2;\
+ $(SED) "s/^.*CONFIG_USE_BB_PWD_GRP.*/CONFIG_USE_BB_PWD_GRP=y/;" $(BUSYBOX_DIR)/.config; \
+ fi
+endif
ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-21 10:59 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-21 10:59 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-21 02:59:01 -0800 (Fri, 21 Nov 2008)
New Revision: 24111
Log:
busybox: 1.13.0 ash fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-ash.patch 2008-11-21 10:59:01 UTC (rev 24111)
@@ -0,0 +1,89 @@
+diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c
+--- busybox-1.13.0/shell/ash.c 2008-10-30 08:41:32.000000000 +0100
++++ busybox-1.13.0-ash/shell/ash.c 2008-11-21 11:38:04.000000000 +0100
+@@ -536,6 +536,7 @@ static const char dolatstr[] ALIGN1 = {
+ #define NHERE 24
+ #define NXHERE 25
+ #define NNOT 26
++#define N_NUMBER 27
+
+ union node;
+
+@@ -7546,43 +7547,44 @@ commandcmd(int argc UNUSED_PARAM, char *
+
+ /* ============ eval.c */
+
+-static int funcblocksize; /* size of structures in function */
+-static int funcstringsize; /* size of strings in node */
+-static void *funcblock; /* block to allocate function from */
+-static char *funcstring; /* block to allocate strings from */
++static int funcblocksize; /* size of structures in function */
++static int funcstringsize; /* size of strings in node */
++static void *funcblock; /* block to allocate function from */
++static char *funcstring; /* block to allocate strings from */
+
+ /* flags in argument to evaltree */
+-#define EV_EXIT 01 /* exit after evaluating tree */
+-#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
++#define EV_EXIT 01 /* exit after evaluating tree */
++#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
+ #define EV_BACKCMD 04 /* command executing within back quotes */
+
+-static const short nodesize[26] = {
+- SHELL_ALIGN(sizeof(struct ncmd)),
+- SHELL_ALIGN(sizeof(struct npipe)),
+- SHELL_ALIGN(sizeof(struct nredir)),
+- SHELL_ALIGN(sizeof(struct nredir)),
+- SHELL_ALIGN(sizeof(struct nredir)),
+- SHELL_ALIGN(sizeof(struct nbinary)),
+- SHELL_ALIGN(sizeof(struct nbinary)),
+- SHELL_ALIGN(sizeof(struct nbinary)),
+- SHELL_ALIGN(sizeof(struct nif)),
+- SHELL_ALIGN(sizeof(struct nbinary)),
+- SHELL_ALIGN(sizeof(struct nbinary)),
+- SHELL_ALIGN(sizeof(struct nfor)),
+- SHELL_ALIGN(sizeof(struct ncase)),
+- SHELL_ALIGN(sizeof(struct nclist)),
+- SHELL_ALIGN(sizeof(struct narg)),
+- SHELL_ALIGN(sizeof(struct narg)),
+- SHELL_ALIGN(sizeof(struct nfile)),
+- SHELL_ALIGN(sizeof(struct nfile)),
+- SHELL_ALIGN(sizeof(struct nfile)),
+- SHELL_ALIGN(sizeof(struct nfile)),
+- SHELL_ALIGN(sizeof(struct nfile)),
+- SHELL_ALIGN(sizeof(struct ndup)),
+- SHELL_ALIGN(sizeof(struct ndup)),
+- SHELL_ALIGN(sizeof(struct nhere)),
+- SHELL_ALIGN(sizeof(struct nhere)),
+- SHELL_ALIGN(sizeof(struct nnot)),
++static const short nodesize[N_NUMBER] = {
++ [NCMD ] = SHELL_ALIGN(sizeof(struct ncmd)),
++ [NPIPE ] = SHELL_ALIGN(sizeof(struct npipe)),
++ [NREDIR ] = SHELL_ALIGN(sizeof(struct nredir)),
++ [NBACKGND ] = SHELL_ALIGN(sizeof(struct nredir)),
++ [NSUBSHELL] = SHELL_ALIGN(sizeof(struct nredir)),
++ [NAND ] = SHELL_ALIGN(sizeof(struct nbinary)),
++ [NOR ] = SHELL_ALIGN(sizeof(struct nbinary)),
++ [NSEMI ] = SHELL_ALIGN(sizeof(struct nbinary)),
++ [NIF ] = SHELL_ALIGN(sizeof(struct nif)),
++ [NWHILE ] = SHELL_ALIGN(sizeof(struct nbinary)),
++ [NUNTIL ] = SHELL_ALIGN(sizeof(struct nbinary)),
++ [NFOR ] = SHELL_ALIGN(sizeof(struct nfor)),
++ [NCASE ] = SHELL_ALIGN(sizeof(struct ncase)),
++ [NCLIST ] = SHELL_ALIGN(sizeof(struct nclist)),
++ [NDEFUN ] = SHELL_ALIGN(sizeof(struct narg)),
++ [NARG ] = SHELL_ALIGN(sizeof(struct narg)),
++ [NTO ] = SHELL_ALIGN(sizeof(struct nfile)),
++ [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)),
++ [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)),
++ [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)),
++ [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)),
++ [NAPPEND ] = SHELL_ALIGN(sizeof(struct nfile)),
++ [NTOFD ] = SHELL_ALIGN(sizeof(struct ndup)),
++ [NFROMFD ] = SHELL_ALIGN(sizeof(struct ndup)),
++ [NHERE ] = SHELL_ALIGN(sizeof(struct nhere)),
++ [NXHERE ] = SHELL_ALIGN(sizeof(struct nhere)),
++ [NNOT ] = SHELL_ALIGN(sizeof(struct nnot)),
+ };
+
+ static void calcsize(union node *n);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-20 6:49 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-20 6:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-19 22:49:20 -0800 (Wed, 19 Nov 2008)
New Revision: 24103
Log:
busybox: 1.13.0 klogd fix
Added:
trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-klogd.patch 2008-11-20 06:49:20 UTC (rev 24103)
@@ -0,0 +1,29 @@
+--- busybox-1.13.0/sysklogd/klogd.c Thu Oct 30 08:41:28 2008
++++ busybox-1.13.0-klogd/sysklogd/klogd.c Thu Nov 20 00:46:00 2008
+@@ -73,9 +73,6 @@
+
+ syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
+
+- /* Initially null terminate the buffer in case of a very long line */
+- log_buffer[KLOGD_LOGBUF_SIZE - 1] = '\0';
+-
+ while (1) {
+ int n;
+ int priority;
+@@ -89,6 +86,7 @@
+ errno);
+ break;
+ }
++ log_buffer[used + n] = '\0';
+
+ /* klogctl buffer parsing modelled after code in dmesg.c */
+ start = &log_buffer[0];
+@@ -101,7 +99,7 @@
+ /* This line is incomplete... */
+ if (start != log_buffer) {
+ /* move it to the front of the buffer */
+- strcpy(log_buffer, start);
++ overlapping_strcpy(log_buffer, start);
+ /* don't log it yet */
+ used = strlen(log_buffer);
+ break;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-17 12:38 ` Hamish Moffatt
@ 2008-11-17 12:45 ` Peter Korsgaard
0 siblings, 0 replies; 161+ messages in thread
From: Peter Korsgaard @ 2008-11-17 12:45 UTC (permalink / raw)
To: buildroot
>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
Hi,
Hamish> This patch isn't right, id builds if CONFIG_USE_BB_PWD_GRP=y.
>>
>> Ok, you better tell Denys / the busybox list.
Hamish> I did, and Denys has updated the patch. Will you update buildroot?
Hamish> (Or else I can do it tomorrow.)
I did already (r24070).
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-17 7:13 ` Peter Korsgaard
@ 2008-11-17 12:38 ` Hamish Moffatt
2008-11-17 12:45 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: Hamish Moffatt @ 2008-11-17 12:38 UTC (permalink / raw)
To: buildroot
On Mon, Nov 17, 2008 at 08:13:47AM +0100, Peter Korsgaard wrote:
> >>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
>
> Hi,
>
> >> ++#error "Sorry, you need at least uClibc version 0.9.30 for id applet to build"
> >> ++#endif
> >> ++#endif
> >> ++
> >> + enum {
> >> + PRINT_REAL = (1 << 0),
> >> + NAME_NOT_NUMBER = (1 << 1),
>
> Hamish> This patch isn't right, id builds if CONFIG_USE_BB_PWD_GRP=y.
>
> Ok, you better tell Denys / the busybox list.
I did, and Denys has updated the patch. Will you update buildroot?
(Or else I can do it tomorrow.)
thanks
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-17 7:40 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-17 7:40 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-16 23:40:14 -0800 (Sun, 16 Nov 2008)
New Revision: 24070
Log:
busybox: updated 1.13.0 id patch (only error out if needed)
Modified:
trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
Changeset:
Modified: trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-id.patch 2008-11-17 03:31:47 UTC (rev 24069)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-id.patch 2008-11-17 07:40:14 UTC (rev 24070)
@@ -1,14 +1,16 @@
--- busybox-1.13.0/coreutils/id.c Wed Nov 5 22:39:54 2008
-+++ busybox-1.13.0-id/coreutils/id.c Sun Nov 16 15:59:46 2008
-@@ -17,6 +17,12 @@
++++ busybox-1.13.0-id/coreutils/id.c Mon Nov 17 01:10:04 2008
+@@ -17,6 +17,14 @@
#include "libbb.h"
++#if !ENABLE_USE_BB_PWD_GRP
+#if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0)
+#if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30)
+#error "Sorry, you need@least uClibc version 0.9.30 for id applet to build"
+#endif
+#endif
++#endif
+
enum {
PRINT_REAL = (1 << 0),
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-16 23:46 ` Hamish Moffatt
@ 2008-11-17 7:13 ` Peter Korsgaard
2008-11-17 12:38 ` Hamish Moffatt
0 siblings, 1 reply; 161+ messages in thread
From: Peter Korsgaard @ 2008-11-17 7:13 UTC (permalink / raw)
To: buildroot
>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
Hi,
>> ++#error "Sorry, you need at least uClibc version 0.9.30 for id applet to build"
>> ++#endif
>> ++#endif
>> ++
>> + enum {
>> + PRINT_REAL = (1 << 0),
>> + NAME_NOT_NUMBER = (1 << 1),
Hamish> This patch isn't right, id builds if CONFIG_USE_BB_PWD_GRP=y.
Ok, you better tell Denys / the busybox list.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-16 23:42 ` Hamish Moffatt
@ 2008-11-17 7:13 ` Peter Korsgaard
0 siblings, 0 replies; 161+ messages in thread
From: Peter Korsgaard @ 2008-11-17 7:13 UTC (permalink / raw)
To: buildroot
>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
Hi,
>> Yes, busybox 1.13.0 id applet requires functionality not available in
>> uclibc 0.9.29 / 0.9.28.
Hamish> OR, you can enable CONFIG_USE_BB_PWD_GRP and busybox will use its
Hamish> internal getgrouplist (etc) rather than requiring one from libc.
Ahh ok, maybe we should enforce that option if 1.13.0 is used on pre
0.9.30 and id applet is enabled.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-16 17:22 jacmet at uclibc.org
@ 2008-11-16 23:46 ` Hamish Moffatt
2008-11-17 7:13 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: Hamish Moffatt @ 2008-11-16 23:46 UTC (permalink / raw)
To: buildroot
On Sun, Nov 16, 2008 at 09:22:08AM -0800, jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2008-11-16 09:22:08 -0800 (Sun, 16 Nov 2008)
> New Revision: 24061
>
> Log:
> busybox: 1.13.0 id patch (check)
>
> Added:
> trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
>
>
> Changeset:
> Added: trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
> ===================================================================
> --- trunk/buildroot/package/busybox/busybox-1.13.0-id.patch (rev 0)
> +++ trunk/buildroot/package/busybox/busybox-1.13.0-id.patch 2008-11-16 17:22:08 UTC (rev 24061)
> @@ -0,0 +1,15 @@
> +--- busybox-1.13.0/coreutils/id.c Wed Nov 5 22:39:54 2008
> ++++ busybox-1.13.0-id/coreutils/id.c Sun Nov 16 15:59:46 2008
> +@@ -17,6 +17,12 @@
> +
> + #include "libbb.h"
> +
> ++#if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0)
> ++#if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30)
> ++#error "Sorry, you need at least uClibc version 0.9.30 for id applet to build"
> ++#endif
> ++#endif
> ++
> + enum {
> + PRINT_REAL = (1 << 0),
> + NAME_NOT_NUMBER = (1 << 1),
This patch isn't right, id builds if CONFIG_USE_BB_PWD_GRP=y.
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-15 21:29 ` Peter Korsgaard
@ 2008-11-16 23:42 ` Hamish Moffatt
2008-11-17 7:13 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: Hamish Moffatt @ 2008-11-16 23:42 UTC (permalink / raw)
To: buildroot
On Sat, Nov 15, 2008 at 10:29:57PM +0100, Peter Korsgaard wrote:
> >>>>> "hartleys" == hartleys <hartleys@visionengravers.com> writes:
>
> Hi,
>
> hartleys> With revision 24042 of buildroot I get an error building busybox. During
> hartleys> the build I get:
>
> Yes, busybox 1.13.0 id applet requires functionality not available in
> uclibc 0.9.29 / 0.9.28.
OR, you can enable CONFIG_USE_BB_PWD_GRP and busybox will use its
internal getgrouplist (etc) rather than requiring one from libc.
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-16 17:22 jacmet at uclibc.org
2008-11-16 23:46 ` Hamish Moffatt
0 siblings, 1 reply; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-16 17:22 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-16 09:22:08 -0800 (Sun, 16 Nov 2008)
New Revision: 24061
Log:
busybox: 1.13.0 id patch (check)
Added:
trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.13.0-id.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-id.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-id.patch 2008-11-16 17:22:08 UTC (rev 24061)
@@ -0,0 +1,15 @@
+--- busybox-1.13.0/coreutils/id.c Wed Nov 5 22:39:54 2008
++++ busybox-1.13.0-id/coreutils/id.c Sun Nov 16 15:59:46 2008
+@@ -17,6 +17,12 @@
+
+ #include "libbb.h"
+
++#if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0)
++#if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30)
++#error "Sorry, you need@least uClibc version 0.9.30 for id applet to build"
++#endif
++#endif
++
+ enum {
+ PRINT_REAL = (1 << 0),
+ NAME_NOT_NUMBER = (1 << 1),
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-14 16:42 ` hartleys
@ 2008-11-15 21:29 ` Peter Korsgaard
2008-11-16 23:42 ` Hamish Moffatt
0 siblings, 1 reply; 161+ messages in thread
From: Peter Korsgaard @ 2008-11-15 21:29 UTC (permalink / raw)
To: buildroot
>>>>> "hartleys" == hartleys <hartleys@visionengravers.com> writes:
Hi,
hartleys> With revision 24042 of buildroot I get an error building busybox. During
hartleys> the build I get:
Yes, busybox 1.13.0 id applet requires functionality not available in
uclibc 0.9.29 / 0.9.28.
I've disabled the id applet in the default config for now.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-15 21:25 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-15 21:25 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-15 13:25:29 -0800 (Sat, 15 Nov 2008)
New Revision: 24055
Log:
busybox: disable id applet for 1.13.x
busybox 1.13.0 id applet doesn't compile with uclibc 0.9.29 / 0.9.28, so
disable it for now.
Added:
trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch
trunk/buildroot/package/busybox/busybox-1.13.x.config
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-11-15 16:15:25 UTC (rev 24054)
+++ trunk/buildroot/package/busybox/Config.in 2008-11-15 21:25:29 UTC (rev 24055)
@@ -93,7 +93,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
- default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_13_X
+ default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-inotify.patch 2008-11-15 21:25:29 UTC (rev 24055)
@@ -0,0 +1,101 @@
+--- busybox-1.13.0/miscutils/inotifyd.c Thu Oct 30 08:41:37 2008
++++ busybox-1.13.0-inotify/miscutils/inotifyd.c Fri Nov 14 22:33:27 2008
+@@ -51,6 +51,7 @@
+ int inotifyd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int inotifyd_main(int argc UNUSED_PARAM, char **argv)
+ {
++ int n;
+ unsigned mask = IN_ALL_EVENTS; // assume we want all events
+ struct pollfd pfd;
+ char **watched = ++argv; // watched name list
+@@ -69,7 +70,6 @@
+ while (*++argv) {
+ char *path = *argv;
+ char *masks = strchr(path, ':');
+- int wd; // watch descriptor
+ // if mask is specified ->
+ if (masks) {
+ *masks = '\0'; // split path and mask
+@@ -83,32 +83,39 @@
+ }
+ }
+ // add watch
+- wd = inotify_add_watch(pfd.fd, path, mask);
+- if (wd < 0) {
++ n = inotify_add_watch(pfd.fd, path, mask);
++ if (n < 0)
+ bb_perror_msg_and_die("add watch (%s) failed", path);
+-// } else {
+-// bb_error_msg("added %d [%s]:%4X", wd, path, mask);
+- }
++ //bb_error_msg("added %d [%s]:%4X", n, path, mask);
+ }
+
+ // setup signals
+- bb_signals(0
+- + (1 << SIGHUP)
+- + (1 << SIGINT)
+- + (1 << SIGTERM)
+- + (1 << SIGPIPE)
+- , record_signo);
++ bb_signals(BB_FATAL_SIGS, record_signo);
+
+ // do watch
+-
+-// pfd.fd = fd;
+ pfd.events = POLLIN;
+-
+- while (!bb_got_signal && poll(&pfd, 1, -1) > 0) {
++ while (1) {
+ ssize_t len;
+ void *buf;
+ struct inotify_event *ie;
+
++ again:
++ if (bb_got_signal)
++ break;
++ n = poll(&pfd, 1, -1);
++ /* Signal interrupted us? */
++ if (n < 0 && errno == EINTR)
++ goto again;
++ // Under Linux, above if() is not necessary.
++ // Non-fatal signals, e.g. SIGCHLD, when set to SIG_DFL,
++ // are not interrupting poll().
++ // Thus we can just break if n <= 0 (see below),
++ // because EINTR will happen only on SIGTERM et al.
++ // But this might be not true under other Unixes,
++ // and is generally way too subtle to depend on.
++ if (n <= 0) // strange error?
++ break;
++
+ // read out all pending events
+ xioctl(pfd.fd, FIONREAD, &len);
+ #define eventbuf bb_common_bufsiz1
+@@ -117,21 +124,21 @@
+ // process events. N.B. events may vary in length
+ while (len > 0) {
+ int i;
+- char events[12];
++ char events[sizeof(mask_names)];
+ char *s = events;
+ unsigned m = ie->mask;
+
+- for (i = 0; i < 12; ++i, m >>= 1) {
+- if (m & 1) {
++ for (i = 0; i < sizeof(mask_names)-1; ++i, m >>= 1) {
++ if (m & 1)
+ *s++ = mask_names[i];
+- }
+ }
+ *s = '\0';
+-// bb_error_msg("exec %s %08X\t%s\t%s\t%s", agent, ie->mask, events, watched[ie->wd], ie->len ? ie->name : "");
++ //bb_error_msg("exec %s %08X\t%s\t%s\t%s", agent,
++ // ie->mask, events, watched[ie->wd], ie->len ? ie->name : "");
+ args[1] = events;
+ args[2] = watched[ie->wd];
+ args[3] = ie->len ? ie->name : NULL;
+- xspawn((char **)args);
++ wait4pid(xspawn((char **)args));
+ // next event
+ i = sizeof(struct inotify_event) + ie->len;
+ len -= i;
Added: trunk/buildroot/package/busybox/busybox-1.13.x.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.x.config (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.x.config 2008-11-15 21:25:29 UTC (rev 24055)
@@ -0,0 +1,869 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.13.0
+# Sat Nov 15 17:33:29 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+# CONFIG_ID is not set
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=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=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+# CONFIG_SHOWKEY is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=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=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLKID is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+# CONFIG_FDISK is not set
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+CONFIG_EJECT=y
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TTYSIZE is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_DHCPRELAY=y
+CONFIG_APP_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+# CONFIG_FEATURE_SENDMAIL_MAILX is not set
+# CONFIG_FEATURE_SENDMAIL_MAILXX is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-11-13 16:32 jacmet at uclibc.org
@ 2008-11-14 16:42 ` hartleys
2008-11-15 21:29 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: hartleys @ 2008-11-14 16:42 UTC (permalink / raw)
To: buildroot
On Thursday, November 13, 2008 9:33 AM, jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2008-11-13 08:32:56 -0800 (Thu, 13 Nov 2008) New Revision: 24031
>
> Log:
> busybox: add 1.13.x, mark older as deprecated
>
> Added:
> trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch
> trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch
> trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch
>
> Modified:
> trunk/buildroot/package/busybox/Config.in
With revision 24042 of buildroot I get an error building busybox. During
the build I get:
...
CC coreutils/id.o
coreutils/id.c: In function 'get_groups':
coreutils/id.c:81: warning: implicit declaration of function
'getgrouplist'
...
Then at the final link:
...
coreutils/lib.a(id.o): In function `get_groups':
id.c:(.text.get_groups+0x10): undefined reference to `getgrouplist'
collect2: ld returned 1 exit status
make[1]: *** [busybox_unstripped] Error 1
...
Any ideas?
Thanks,
Hartley
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-13 16:32 jacmet at uclibc.org
2008-11-14 16:42 ` hartleys
0 siblings, 1 reply; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-13 16:32 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-13 08:32:56 -0800 (Thu, 13 Nov 2008)
New Revision: 24031
Log:
busybox: add 1.13.x, mark older as deprecated
Added:
trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch
trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch
trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-11-13 16:32:52 UTC (rev 24030)
+++ trunk/buildroot/package/busybox/Config.in 2008-11-13 16:32:56 UTC (rev 24031)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends on BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_12_X
+ default BR2_BUSYBOX_VERSION_1_13_X
help
Select the version of BusyBox you wish to use.
@@ -38,14 +38,19 @@
config BR2_BUSYBOX_VERSION_1_10_X
bool "BusyBox 1.10.x"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_11_X
bool "BusyBox 1.11.x"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_12_X
bool "BusyBox 1.12.x"
+ depends on BR2_DEPRECATED || BR2_RECENT
+ config BR2_BUSYBOX_VERSION_1_13_X
+ bool "BusyBox 1.13.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -61,6 +66,7 @@
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X
default "1.12.2" if BR2_BUSYBOX_VERSION_1_12_X
+ default "1.13.0" if BR2_BUSYBOX_VERSION_1_13_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
@@ -87,6 +93,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
+ default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_13_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-getopt.patch 2008-11-13 16:32:56 UTC (rev 24031)
@@ -0,0 +1,22 @@
+--- busybox-1.13.0/libbb/getopt32.c Thu Oct 30 08:41:34 2008
++++ busybox-1.13.0-getopt/libbb/getopt32.c Wed Nov 12 23:04:01 2008
+@@ -515,6 +515,19 @@
+ }
+ }
+
++ /* In case getopt32 was already called:
++ * reset the libc getopt() function, which keeps internal state.
++ * run_nofork_applet_prime() does this, but we might end up here
++ * also via gunzip_main() -> gzip_main(). Play safe.
++ */
++#ifdef __GLIBC__
++ optind = 0;
++#else /* BSD style */
++ optind = 1;
++ /* optreset = 1; */
++#endif
++ /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
++
+ pargv = NULL;
+
+ /* Note: just "getopt() <= 0" will not work well for
Added: trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-lineedit.patch 2008-11-13 16:32:56 UTC (rev 24031)
@@ -0,0 +1,13 @@
+--- busybox-1.13.0/libbb/lineedit.c Wed Nov 5 22:39:54 2008
++++ busybox-1.13.0-lineedit/libbb/lineedit.c Wed Nov 12 23:18:05 2008
+@@ -1415,8 +1415,10 @@
+ if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ load_history(state->hist_file);
+ #endif
++#if MAX_HISTORY > 0
+ if (state->flags & DO_HISTORY)
+ state->cur_history = state->cnt_history;
++#endif
+
+ /* prepare before init handlers */
+ cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
Added: trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.13.0-modprobe.patch 2008-11-13 16:32:56 UTC (rev 24031)
@@ -0,0 +1,47 @@
+--- busybox-1.13.0/modutils/modprobe-small.c Thu Oct 30 08:41:28 2008
++++ busybox-1.13.0-modprobe/modutils/modprobe-small.c Mon Nov 10 22:19:03 2008
+@@ -600,18 +600,22 @@
+ free(deps);
+
+ /* modprobe -> load it */
+- if (!is_rmmod && (options && !strstr(options, "blacklist"))) {
+- errno = 0;
+- if (load_module(info->pathname, options) != 0) {
+- if (EEXIST != errno) {
+- bb_error_msg("'%s': %s",
++ if (!is_rmmod) {
++ if (!options || strstr(options, "blacklist") == NULL) {
++ errno = 0;
++ if (load_module(info->pathname, options) != 0) {
++ if (EEXIST != errno) {
++ bb_error_msg("'%s': %s",
+ info->pathname,
+ moderror(errno));
+- } else {
+- dbg1_error_msg("'%s': %s",
++ } else {
++ dbg1_error_msg("'%s': %s",
+ info->pathname,
+ moderror(errno));
++ }
+ }
++ } else {
++ dbg1_error_msg("'%s': blacklisted", info->pathname);
+ }
+ }
+ ret:
+--- busybox-1.13.0/modutils/modutils-24.c Thu Oct 30 08:41:28 2008
++++ busybox-1.13.0-modprobe/modutils/modutils-24.c Wed Nov 12 01:02:54 2008
+@@ -3236,8 +3236,10 @@
+ }
+
+ shnum = f->header.e_shnum;
+- f->sections = xmalloc(sizeof(struct obj_section *) * shnum);
+- memset(f->sections, 0, sizeof(struct obj_section *) * shnum);
++ /* Growth of ->sections vector will be done by
++ * xrealloc_vector(..., 2, ...), therefore we must allocate
++ * at least 2^2 = 4 extra elements here. */
++ f->sections = xzalloc(sizeof(f->sections[0]) * (shnum + 4));
+
+ section_headers = alloca(sizeof(ElfW(Shdr)) * shnum);
+ fseek(fp, f->header.e_shoff, SEEK_SET);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-13 16:32 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-13 16:32 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-13 08:32:52 -0800 (Thu, 13 Nov 2008)
New Revision: 24030
Log:
busybox: bump 1.12.x version
Added:
trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch
trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch
Removed:
trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch
trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch
trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch
trunk/buildroot/package/busybox/busybox-1.12.1-login.patch
trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch
trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch
trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/Config.in 2008-11-13 16:32:52 UTC (rev 24030)
@@ -60,7 +60,7 @@
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X
- default "1.12.1" if BR2_BUSYBOX_VERSION_1_12_X
+ default "1.12.2" if BR2_BUSYBOX_VERSION_1_12_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,10 +0,0 @@
-diff -urpN busybox-1.12.1/coreutils/basename.c busybox-1.12.1-basename/coreutils/basename.c
---- busybox-1.12.1/coreutils/basename.c 2008-09-28 20:04:18.000000000 +0200
-+++ busybox-1.12.1-basename/coreutils/basename.c 2008-11-06 16:10:54.000000000 +0100
-@@ -48,5 +48,5 @@ int basename_main(int argc, char **argv)
-
- /* puts(s) will do, but we can do without stdio this way: */
- s[m++] = '\n';
-- return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;
-+ return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,27 +0,0 @@
---- busybox-1.12.1/findutils/grep.c Sun Sep 28 20:04:28 2008
-+++ busybox-1.12.1-grep/findutils/grep.c Wed Oct 1 00:45:49 2008
-@@ -363,12 +363,22 @@
- * (unless -v: -Fov doesnt print anything at all) */
- if (found)
- print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
-- } else {
-+ } else while (1) {
-+ char old = line[gl->matched_range.rm_eo];
- line[gl->matched_range.rm_eo] = '\0';
- print_line(line + gl->matched_range.rm_so,
- gl->matched_range.rm_eo - gl->matched_range.rm_so,
- linenum, ':');
-- }
-+ line[gl->matched_range.rm_eo] = old;
-+#if !ENABLE_EXTRA_COMPAT
-+ break;
-+#else
-+ if (re_search(&gl->compiled_regex, line, line_len,
-+ gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo,
-+ &gl->matched_range) < 0)
-+ break;
-+#endif
-+ }
- } else {
- print_line(line, line_len, linenum, ':');
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,12 +0,0 @@
---- busybox-1.12.1/libbb/lineedit.c Sun Sep 28 20:04:20 2008
-+++ busybox-1.12.1-lineedit/libbb/lineedit.c Sun Nov 2 01:39:52 2008
-@@ -1415,7 +1415,8 @@
- if ((state->flags & SAVE_HISTORY) && state->hist_file)
- load_history(state->hist_file);
- #endif
-- state->cur_history = state->cnt_history;
-+ if (state->flags & DO_HISTORY)
-+ state->cur_history = state->cnt_history;
-
- /* prepare before init handlers */
- cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-login.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-login.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-login.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,25 +0,0 @@
---- busybox-1.12.1/libbb/setup_environment.c Sun Sep 28 20:04:20 2008
-+++ busybox-1.12.1-login/libbb/setup_environment.c Fri Oct 31 00:56:51 2008
-@@ -32,15 +32,15 @@
-
- void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw)
- {
-+ /* Change the current working directory to be the home directory
-+ * of the user */
-+ if (chdir(pw->pw_dir)) {
-+ xchdir("/");
-+ bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
-+ }
-+
- if (clear_env) {
- const char *term;
--
-- /* Change the current working directory to be the home directory
-- * of the user */
-- if (chdir(pw->pw_dir)) {
-- xchdir("/");
-- bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
-- }
-
- /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
- Unset all other environment variables. */
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,33 +0,0 @@
-diff -urpN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
---- busybox-1.12.1/modutils/modprobe.c 2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1-modprobe/modutils/modprobe.c 2008-10-10 14:36:58.000000000 +0200
-@@ -263,9 +263,9 @@ static int FAST_FUNC include_conf_dir_ac
- return TRUE;
- }
-
--static int include_conf_recursive(struct include_conf_t *conf, const char *filename)
-+static int include_conf_recursive(struct include_conf_t *conf, const char *filename, int flags)
- {
-- return recursive_action(filename, ACTION_RECURSE,
-+ return recursive_action(filename, ACTION_RECURSE | flags,
- include_conf_file_act,
- include_conf_dir_act,
- conf, 1);
-@@ -362,7 +362,7 @@ static int FAST_FUNC include_conf_file_a
- char *includefile;
-
- includefile = skip_whitespace(line_buffer + 8);
-- include_conf_recursive(conf, includefile);
-+ include_conf_recursive(conf, includefile, 0);
- } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
- (is_conf_command(line_buffer, "blacklist"))) {
- char *mod;
-@@ -559,7 +559,7 @@ static struct dep_t *build_dep(void)
- if (ENABLE_FEATURE_2_6_MODULES) {
- if (include_conf_file(&conf, "/etc/modprobe.conf"))
- r = TRUE;
-- if (include_conf_recursive(&conf, "/etc/modprobe.d"))
-+ if (include_conf_recursive(&conf, "/etc/modprobe.d", ACTION_QUIET))
- r = TRUE;
- }
- if (ENABLE_FEATURE_2_4_MODULES && !r)
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,185 +0,0 @@
-diff -urpN busybox-1.12.1/coreutils/env.c busybox-1.12.1-standalone/coreutils/env.c
---- busybox-1.12.1/coreutils/env.c 2008-09-28 20:04:18.000000000 +0200
-+++ busybox-1.12.1-standalone/coreutils/env.c 2008-10-20 10:21:54.000000000 +0200
-@@ -29,6 +29,8 @@
- * - use xfunc_error_retval
- */
-
-+/* This is a NOEXEC applet. Be very careful! */
-+
- #include "libbb.h"
-
- #if ENABLE_FEATURE_ENV_LONG_OPTIONS
-@@ -119,5 +121,3 @@ int env_main(int argc UNUSED_PARAM, char
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
--
--
-diff -urpN busybox-1.12.1/include/applets.h busybox-1.12.1-standalone/include/applets.h
---- busybox-1.12.1/include/applets.h 2008-09-28 20:04:26.000000000 +0200
-+++ busybox-1.12.1-standalone/include/applets.h 2008-10-20 10:21:54.000000000 +0200
-@@ -136,7 +136,7 @@ USE_ECHO(APPLET_NOFORK(echo, echo, _BB_D
- USE_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER, egrep))
- USE_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
--USE_ENV(APPLET(env, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-+USE_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_NEVER, env))
- USE_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envdir))
- USE_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envuidgid))
- USE_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ether_wake))
-@@ -171,7 +171,7 @@ USE_GREP(APPLET(grep, _BB_DIR_BIN, _BB_S
- USE_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_NEVER))
--USE_HD(APPLET_ODDNAME(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
-+USE_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
- USE_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_HEAD(APPLET(head, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
- USE_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hexdump))
-diff -urpN busybox-1.12.1/libbb/getopt32.c busybox-1.12.1-standalone/libbb/getopt32.c
---- busybox-1.12.1/libbb/getopt32.c 2008-09-28 20:04:20.000000000 +0200
-+++ busybox-1.12.1-standalone/libbb/getopt32.c 2008-10-20 10:21:34.000000000 +0200
-@@ -515,28 +515,6 @@ getopt32(char **argv, const char *applet
- }
- }
-
-- /* In case getopt32 was already called:
-- * reset the libc getopt() function, which keeps internal state.
-- *
-- * BSD-derived getopt() functions require that optind be set to 1 in
-- * order to reset getopt() state. This used to be generally accepted
-- * way of resetting getopt(). However, glibc's getopt()
-- * has additional getopt() state beyond optind, and requires that
-- * optind be set to zero to reset its state. So the unfortunate state of
-- * affairs is that BSD-derived versions of getopt() misbehave if
-- * optind is set to 0 in order to reset getopt(), and glibc's getopt()
-- * will core dump if optind is set 1 in order to reset getopt().
-- *
-- * More modern versions of BSD require that optreset be set to 1 in
-- * order to reset getopt(). Sigh. Standards, anyone?
-- */
--#ifdef __GLIBC__
-- optind = 0;
--#else /* BSD style */
-- optind = 1;
-- /* optreset = 1; */
--#endif
-- /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
- pargv = NULL;
-
- /* Note: just "getopt() <= 0" will not work well for
-diff -urpN busybox-1.12.1/libbb/vfork_daemon_rexec.c busybox-1.12.1-standalone/libbb/vfork_daemon_rexec.c
---- busybox-1.12.1/libbb/vfork_daemon_rexec.c 2008-09-28 20:04:20.000000000 +0200
-+++ busybox-1.12.1-standalone/libbb/vfork_daemon_rexec.c 2008-10-20 10:21:34.000000000 +0200
-@@ -125,6 +125,7 @@ int FAST_FUNC run_nofork_applet_prime(st
- int rc, argc;
-
- applet_name = APPLET_NAME(applet_no);
-+
- xfunc_error_retval = EXIT_FAILURE;
-
- /* Special flag for xfunc_die(). If xfunc will "die"
-@@ -132,7 +133,30 @@ int FAST_FUNC run_nofork_applet_prime(st
- * die_sleep and longjmp here instead. */
- die_sleep = -1;
-
-- /* option_mask32 = 0; - not needed */
-+ /* In case getopt() or getopt32() was already called:
-+ * reset the libc getopt() function, which keeps internal state.
-+ *
-+ * BSD-derived getopt() functions require that optind be set to 1 in
-+ * order to reset getopt() state. This used to be generally accepted
-+ * way of resetting getopt(). However, glibc's getopt()
-+ * has additional getopt() state beyond optind, and requires that
-+ * optind be set to zero to reset its state. So the unfortunate state of
-+ * affairs is that BSD-derived versions of getopt() misbehave if
-+ * optind is set to 0 in order to reset getopt(), and glibc's getopt()
-+ * will core dump if optind is set 1 in order to reset getopt().
-+ *
-+ * More modern versions of BSD require that optreset be set to 1 in
-+ * order to reset getopt(). Sigh. Standards, anyone?
-+ */
-+#ifdef __GLIBC__
-+ optind = 0;
-+#else /* BSD style */
-+ optind = 1;
-+ /* optreset = 1; */
-+#endif
-+ /* optarg = NULL; opterr = 1; optopt = 63; - do we need this too? */
-+ /* (values above are what they initialized to in glibc and uclibc) */
-+ /* option_mask32 = 0; - not needed, no applet depends on it being 0 */
-
- argc = 1;
- while (argv[argc])
-@@ -161,8 +185,16 @@ int FAST_FUNC run_nofork_applet_prime(st
- rc = 0;
- }
-
-- /* Restoring globals */
-+ /* Restoring some globals */
- restore_nofork_data(old);
-+
-+ /* Other globals can be simply reset to defaults */
-+#ifdef __GLIBC__
-+ optind = 0;
-+#else /* BSD style */
-+ optind = 1;
-+#endif
-+
- return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
- }
-
-diff -urpN busybox-1.12.1/shell/ash.c busybox-1.12.1-standalone/shell/ash.c
---- busybox-1.12.1/shell/ash.c 2008-09-28 20:04:18.000000000 +0200
-+++ busybox-1.12.1-standalone/shell/ash.c 2008-10-20 10:21:54.000000000 +0200
-@@ -6964,8 +6964,11 @@ tryexec(USE_FEATURE_SH_STANDALONE(int ap
-
- #if ENABLE_FEATURE_SH_STANDALONE
- if (applet_no >= 0) {
-- if (APPLET_IS_NOEXEC(applet_no))
-+ if (APPLET_IS_NOEXEC(applet_no)) {
-+ while (*envp)
-+ putenv(*envp++);
- run_applet_no_and_exit(applet_no, argv);
-+ }
- /* re-exec ourselves with the new arguments */
- execve(bb_busybox_exec_path, argv, envp);
- /* If they called chroot or otherwise made the binary no longer
-@@ -12014,7 +12017,7 @@ exportcmd(int argc UNUSED_PARAM, char **
- char *name;
- const char *p;
- char **aptr;
-- int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
-+ int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
-
- if (nextopt("p") != 'p') {
- aptr = argptr;
-diff -urpN busybox-1.12.1/util-linux/getopt.c busybox-1.12.1-standalone/util-linux/getopt.c
---- busybox-1.12.1/util-linux/getopt.c 2008-09-28 20:04:30.000000000 +0200
-+++ busybox-1.12.1-standalone/util-linux/getopt.c 2008-10-20 10:21:34.000000000 +0200
-@@ -142,7 +142,8 @@ static const char *normalize(const char
- * Other settings are found in global variables.
- */
- #if !ENABLE_GETOPT_LONG
--#define generate_output(argv,argc,optstr,longopts) generate_output(argv,argc,optstr)
-+#define generate_output(argv,argc,optstr,longopts) \
-+ generate_output(argv,argc,optstr)
- #endif
- static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
- {
-@@ -156,14 +157,6 @@ static int generate_output(char **argv,
- if (quiet_errors) /* No error reporting from getopt(3) */
- opterr = 0;
-
-- /* Reset getopt(3) (see libbb/getopt32.c for long rant) */
--#ifdef __GLIBC__
-- optind = 0;
--#else /* BSD style */
-- optind = 1;
-- /* optreset = 1; */
--#endif
--
- while (1) {
- opt =
- #if ENABLE_GETOPT_LONG
Deleted: trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch 2008-11-13 14:07:50 UTC (rev 24029)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -1,46 +0,0 @@
---- busybox-1.12.1/editors/vi.c Sun Sep 28 20:04:29 2008
-+++ busybox-1.12.1-vi/editors/vi.c Thu Oct 30 23:54:30 2008
-@@ -291,6 +291,8 @@
- #define INIT_G() do { \
- SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
- last_file_modified = -1; \
-+ /* "" but has space for 2 chars */ \
-+ USE_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
- } while (0)
-
-
-@@ -2974,7 +2976,7 @@
- const char *msg = msg; // for compiler
- char c1, *p, *q, *save_dot;
- char buf[12];
-- int dir = dir; // for compiler
-+ int dir;
- int cnt, i, j;
-
- // c1 = c; // quiet the compiler
-@@ -3316,7 +3318,7 @@
- q = get_input_line(buf); // get input line- use "status line"
- if (q[0] && !q[1]) {
- if (last_search_pattern[0])
-- last_search_pattern[0] = c;
-+ last_search_pattern[0] = c;
- goto dc3; // if no pat re-use old pat
- }
- if (q[0]) { // strlen(q) > 1: new pat- save it and find
-@@ -3346,14 +3348,8 @@
- do_cmd(c);
- } // repeat cnt
- dc3:
-- if (last_search_pattern == 0) {
-- msg = "No previous regular expression";
-- goto dc2;
-- }
-- if (last_search_pattern[0] == '/') {
-- dir = FORWARD; // assume FORWARD search
-- p = dot + 1;
-- }
-+ dir = FORWARD; // assume FORWARD search
-+ p = dot + 1;
- if (last_search_pattern[0] == '?') {
- dir = BACK;
- p = dot - 1;
Added: trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.2-getopt.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -0,0 +1,22 @@
+--- busybox-1.12.2/libbb/getopt32.c Sun Nov 9 18:20:37 2008
++++ busybox-1.12.2-getopt/libbb/getopt32.c Wed Nov 12 23:03:33 2008
+@@ -515,6 +515,19 @@
+ }
+ }
+
++ /* In case getopt32 was already called:
++ * reset the libc getopt() function, which keeps internal state.
++ * run_nofork_applet_prime() does this, but we might end up here
++ * also via gunzip_main() -> gzip_main(). Play safe.
++ */
++#ifdef __GLIBC__
++ optind = 0;
++#else /* BSD style */
++ optind = 1;
++ /* optreset = 1; */
++#endif
++ /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
++
+ pargv = NULL;
+
+ /* Note: just "getopt() <= 0" will not work well for
Added: trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.2-lineedit.patch 2008-11-13 16:32:52 UTC (rev 24030)
@@ -0,0 +1,13 @@
+--- busybox-1.12.2/libbb/lineedit.c Sun Nov 9 18:20:16 2008
++++ busybox-1.12.2-lineedit/libbb/lineedit.c Tue Nov 11 21:02:04 2008
+@@ -1415,8 +1415,10 @@
+ if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ load_history(state->hist_file);
+ #endif
++#if MAX_HISTORY > 0
+ if (state->flags & DO_HISTORY)
+ state->cur_history = state->cnt_history;
++#endif
+
+ /* prepare before init handlers */
+ cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-07 10:16 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-07 10:16 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-07 02:16:55 -0800 (Fri, 07 Nov 2008)
New Revision: 23957
Log:
busybox: basename 1.12.1 fix
Added:
trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-basename.patch 2008-11-07 10:16:55 UTC (rev 23957)
@@ -0,0 +1,10 @@
+diff -urpN busybox-1.12.1/coreutils/basename.c busybox-1.12.1-basename/coreutils/basename.c
+--- busybox-1.12.1/coreutils/basename.c 2008-09-28 20:04:18.000000000 +0200
++++ busybox-1.12.1-basename/coreutils/basename.c 2008-11-06 16:10:54.000000000 +0100
+@@ -48,5 +48,5 @@ int basename_main(int argc, char **argv)
+
+ /* puts(s) will do, but we can do without stdio this way: */
+ s[m++] = '\n';
+- return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;
++ return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
+ }
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-11-02 13:06 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-11-02 13:06 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-11-02 05:06:44 -0800 (Sun, 02 Nov 2008)
New Revision: 23902
Log:
busybox: additional 1.12.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch
trunk/buildroot/package/busybox/busybox-1.12.1-login.patch
trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch
trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch
Modified:
trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-lineedit.patch 2008-11-02 13:06:44 UTC (rev 23902)
@@ -0,0 +1,12 @@
+--- busybox-1.12.1/libbb/lineedit.c Sun Sep 28 20:04:20 2008
++++ busybox-1.12.1-lineedit/libbb/lineedit.c Sun Nov 2 01:39:52 2008
+@@ -1415,7 +1415,8 @@
+ if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ load_history(state->hist_file);
+ #endif
+- state->cur_history = state->cnt_history;
++ if (state->flags & DO_HISTORY)
++ state->cur_history = state->cnt_history;
+
+ /* prepare before init handlers */
+ cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
Added: trunk/buildroot/package/busybox/busybox-1.12.1-login.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-login.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-login.patch 2008-11-02 13:06:44 UTC (rev 23902)
@@ -0,0 +1,25 @@
+--- busybox-1.12.1/libbb/setup_environment.c Sun Sep 28 20:04:20 2008
++++ busybox-1.12.1-login/libbb/setup_environment.c Fri Oct 31 00:56:51 2008
+@@ -32,15 +32,15 @@
+
+ void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw)
+ {
++ /* Change the current working directory to be the home directory
++ * of the user */
++ if (chdir(pw->pw_dir)) {
++ xchdir("/");
++ bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
++ }
++
+ if (clear_env) {
+ const char *term;
+-
+- /* Change the current working directory to be the home directory
+- * of the user */
+- if (chdir(pw->pw_dir)) {
+- xchdir("/");
+- bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
+- }
+
+ /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
+ Unset all other environment variables. */
Modified: trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch 2008-11-02 12:13:00 UTC (rev 23901)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch 2008-11-02 13:06:44 UTC (rev 23902)
@@ -1,7 +1,7 @@
-diff -urN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
+diff -urpN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
--- busybox-1.12.1/modutils/modprobe.c 2008-09-28 20:04:15.000000000 +0200
+++ busybox-1.12.1-modprobe/modutils/modprobe.c 2008-10-10 14:36:58.000000000 +0200
-@@ -263,9 +263,9 @@
+@@ -263,9 +263,9 @@ static int FAST_FUNC include_conf_dir_ac
return TRUE;
}
@@ -13,7 +13,7 @@
include_conf_file_act,
include_conf_dir_act,
conf, 1);
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ static int FAST_FUNC include_conf_file_a
char *includefile;
includefile = skip_whitespace(line_buffer + 8);
@@ -22,7 +22,7 @@
} else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
(is_conf_command(line_buffer, "blacklist"))) {
char *mod;
-@@ -559,7 +559,7 @@
+@@ -559,7 +559,7 @@ static struct dep_t *build_dep(void)
if (ENABLE_FEATURE_2_6_MODULES) {
if (include_conf_file(&conf, "/etc/modprobe.conf"))
r = TRUE;
Added: trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-standalone.patch 2008-11-02 13:06:44 UTC (rev 23902)
@@ -0,0 +1,185 @@
+diff -urpN busybox-1.12.1/coreutils/env.c busybox-1.12.1-standalone/coreutils/env.c
+--- busybox-1.12.1/coreutils/env.c 2008-09-28 20:04:18.000000000 +0200
++++ busybox-1.12.1-standalone/coreutils/env.c 2008-10-20 10:21:54.000000000 +0200
+@@ -29,6 +29,8 @@
+ * - use xfunc_error_retval
+ */
+
++/* This is a NOEXEC applet. Be very careful! */
++
+ #include "libbb.h"
+
+ #if ENABLE_FEATURE_ENV_LONG_OPTIONS
+@@ -119,5 +121,3 @@ int env_main(int argc UNUSED_PARAM, char
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-
+-
+diff -urpN busybox-1.12.1/include/applets.h busybox-1.12.1-standalone/include/applets.h
+--- busybox-1.12.1/include/applets.h 2008-09-28 20:04:26.000000000 +0200
++++ busybox-1.12.1-standalone/include/applets.h 2008-10-20 10:21:54.000000000 +0200
+@@ -136,7 +136,7 @@ USE_ECHO(APPLET_NOFORK(echo, echo, _BB_D
+ USE_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER, egrep))
+ USE_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+-USE_ENV(APPLET(env, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
++USE_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_NEVER, env))
+ USE_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envdir))
+ USE_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envuidgid))
+ USE_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ether_wake))
+@@ -171,7 +171,7 @@ USE_GREP(APPLET(grep, _BB_DIR_BIN, _BB_S
+ USE_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_NEVER))
+-USE_HD(APPLET_ODDNAME(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
++USE_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
+ USE_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_HEAD(APPLET(head, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hexdump))
+diff -urpN busybox-1.12.1/libbb/getopt32.c busybox-1.12.1-standalone/libbb/getopt32.c
+--- busybox-1.12.1/libbb/getopt32.c 2008-09-28 20:04:20.000000000 +0200
++++ busybox-1.12.1-standalone/libbb/getopt32.c 2008-10-20 10:21:34.000000000 +0200
+@@ -515,28 +515,6 @@ getopt32(char **argv, const char *applet
+ }
+ }
+
+- /* In case getopt32 was already called:
+- * reset the libc getopt() function, which keeps internal state.
+- *
+- * BSD-derived getopt() functions require that optind be set to 1 in
+- * order to reset getopt() state. This used to be generally accepted
+- * way of resetting getopt(). However, glibc's getopt()
+- * has additional getopt() state beyond optind, and requires that
+- * optind be set to zero to reset its state. So the unfortunate state of
+- * affairs is that BSD-derived versions of getopt() misbehave if
+- * optind is set to 0 in order to reset getopt(), and glibc's getopt()
+- * will core dump if optind is set 1 in order to reset getopt().
+- *
+- * More modern versions of BSD require that optreset be set to 1 in
+- * order to reset getopt(). Sigh. Standards, anyone?
+- */
+-#ifdef __GLIBC__
+- optind = 0;
+-#else /* BSD style */
+- optind = 1;
+- /* optreset = 1; */
+-#endif
+- /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
+ pargv = NULL;
+
+ /* Note: just "getopt() <= 0" will not work well for
+diff -urpN busybox-1.12.1/libbb/vfork_daemon_rexec.c busybox-1.12.1-standalone/libbb/vfork_daemon_rexec.c
+--- busybox-1.12.1/libbb/vfork_daemon_rexec.c 2008-09-28 20:04:20.000000000 +0200
++++ busybox-1.12.1-standalone/libbb/vfork_daemon_rexec.c 2008-10-20 10:21:34.000000000 +0200
+@@ -125,6 +125,7 @@ int FAST_FUNC run_nofork_applet_prime(st
+ int rc, argc;
+
+ applet_name = APPLET_NAME(applet_no);
++
+ xfunc_error_retval = EXIT_FAILURE;
+
+ /* Special flag for xfunc_die(). If xfunc will "die"
+@@ -132,7 +133,30 @@ int FAST_FUNC run_nofork_applet_prime(st
+ * die_sleep and longjmp here instead. */
+ die_sleep = -1;
+
+- /* option_mask32 = 0; - not needed */
++ /* In case getopt() or getopt32() was already called:
++ * reset the libc getopt() function, which keeps internal state.
++ *
++ * BSD-derived getopt() functions require that optind be set to 1 in
++ * order to reset getopt() state. This used to be generally accepted
++ * way of resetting getopt(). However, glibc's getopt()
++ * has additional getopt() state beyond optind, and requires that
++ * optind be set to zero to reset its state. So the unfortunate state of
++ * affairs is that BSD-derived versions of getopt() misbehave if
++ * optind is set to 0 in order to reset getopt(), and glibc's getopt()
++ * will core dump if optind is set 1 in order to reset getopt().
++ *
++ * More modern versions of BSD require that optreset be set to 1 in
++ * order to reset getopt(). Sigh. Standards, anyone?
++ */
++#ifdef __GLIBC__
++ optind = 0;
++#else /* BSD style */
++ optind = 1;
++ /* optreset = 1; */
++#endif
++ /* optarg = NULL; opterr = 1; optopt = 63; - do we need this too? */
++ /* (values above are what they initialized to in glibc and uclibc) */
++ /* option_mask32 = 0; - not needed, no applet depends on it being 0 */
+
+ argc = 1;
+ while (argv[argc])
+@@ -161,8 +185,16 @@ int FAST_FUNC run_nofork_applet_prime(st
+ rc = 0;
+ }
+
+- /* Restoring globals */
++ /* Restoring some globals */
+ restore_nofork_data(old);
++
++ /* Other globals can be simply reset to defaults */
++#ifdef __GLIBC__
++ optind = 0;
++#else /* BSD style */
++ optind = 1;
++#endif
++
+ return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
+ }
+
+diff -urpN busybox-1.12.1/shell/ash.c busybox-1.12.1-standalone/shell/ash.c
+--- busybox-1.12.1/shell/ash.c 2008-09-28 20:04:18.000000000 +0200
++++ busybox-1.12.1-standalone/shell/ash.c 2008-10-20 10:21:54.000000000 +0200
+@@ -6964,8 +6964,11 @@ tryexec(USE_FEATURE_SH_STANDALONE(int ap
+
+ #if ENABLE_FEATURE_SH_STANDALONE
+ if (applet_no >= 0) {
+- if (APPLET_IS_NOEXEC(applet_no))
++ if (APPLET_IS_NOEXEC(applet_no)) {
++ while (*envp)
++ putenv(*envp++);
+ run_applet_no_and_exit(applet_no, argv);
++ }
+ /* re-exec ourselves with the new arguments */
+ execve(bb_busybox_exec_path, argv, envp);
+ /* If they called chroot or otherwise made the binary no longer
+@@ -12014,7 +12017,7 @@ exportcmd(int argc UNUSED_PARAM, char **
+ char *name;
+ const char *p;
+ char **aptr;
+- int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
++ int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
+
+ if (nextopt("p") != 'p') {
+ aptr = argptr;
+diff -urpN busybox-1.12.1/util-linux/getopt.c busybox-1.12.1-standalone/util-linux/getopt.c
+--- busybox-1.12.1/util-linux/getopt.c 2008-09-28 20:04:30.000000000 +0200
++++ busybox-1.12.1-standalone/util-linux/getopt.c 2008-10-20 10:21:34.000000000 +0200
+@@ -142,7 +142,8 @@ static const char *normalize(const char
+ * Other settings are found in global variables.
+ */
+ #if !ENABLE_GETOPT_LONG
+-#define generate_output(argv,argc,optstr,longopts) generate_output(argv,argc,optstr)
++#define generate_output(argv,argc,optstr,longopts) \
++ generate_output(argv,argc,optstr)
+ #endif
+ static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
+ {
+@@ -156,14 +157,6 @@ static int generate_output(char **argv,
+ if (quiet_errors) /* No error reporting from getopt(3) */
+ opterr = 0;
+
+- /* Reset getopt(3) (see libbb/getopt32.c for long rant) */
+-#ifdef __GLIBC__
+- optind = 0;
+-#else /* BSD style */
+- optind = 1;
+- /* optreset = 1; */
+-#endif
+-
+ while (1) {
+ opt =
+ #if ENABLE_GETOPT_LONG
Added: trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-vi.patch 2008-11-02 13:06:44 UTC (rev 23902)
@@ -0,0 +1,46 @@
+--- busybox-1.12.1/editors/vi.c Sun Sep 28 20:04:29 2008
++++ busybox-1.12.1-vi/editors/vi.c Thu Oct 30 23:54:30 2008
+@@ -291,6 +291,8 @@
+ #define INIT_G() do { \
+ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ last_file_modified = -1; \
++ /* "" but has space for 2 chars */ \
++ USE_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
+ } while (0)
+
+
+@@ -2974,7 +2976,7 @@
+ const char *msg = msg; // for compiler
+ char c1, *p, *q, *save_dot;
+ char buf[12];
+- int dir = dir; // for compiler
++ int dir;
+ int cnt, i, j;
+
+ // c1 = c; // quiet the compiler
+@@ -3316,7 +3318,7 @@
+ q = get_input_line(buf); // get input line- use "status line"
+ if (q[0] && !q[1]) {
+ if (last_search_pattern[0])
+- last_search_pattern[0] = c;
++ last_search_pattern[0] = c;
+ goto dc3; // if no pat re-use old pat
+ }
+ if (q[0]) { // strlen(q) > 1: new pat- save it and find
+@@ -3346,14 +3348,8 @@
+ do_cmd(c);
+ } // repeat cnt
+ dc3:
+- if (last_search_pattern == 0) {
+- msg = "No previous regular expression";
+- goto dc2;
+- }
+- if (last_search_pattern[0] == '/') {
+- dir = FORWARD; // assume FORWARD search
+- p = dot + 1;
+- }
++ dir = FORWARD; // assume FORWARD search
++ p = dot + 1;
+ if (last_search_pattern[0] == '?') {
+ dir = BACK;
+ p = dot - 1;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-10-13 12:42 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-10-13 12:42 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-13 05:42:29 -0700 (Mon, 13 Oct 2008)
New Revision: 23667
Log:
busybox: add 1.12.1 modprobe fix
Added:
trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-modprobe.patch 2008-10-13 12:42:29 UTC (rev 23667)
@@ -0,0 +1,33 @@
+diff -urN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
+--- busybox-1.12.1/modutils/modprobe.c 2008-09-28 20:04:15.000000000 +0200
++++ busybox-1.12.1-modprobe/modutils/modprobe.c 2008-10-10 14:36:58.000000000 +0200
+@@ -263,9 +263,9 @@
+ return TRUE;
+ }
+
+-static int include_conf_recursive(struct include_conf_t *conf, const char *filename)
++static int include_conf_recursive(struct include_conf_t *conf, const char *filename, int flags)
+ {
+- return recursive_action(filename, ACTION_RECURSE,
++ return recursive_action(filename, ACTION_RECURSE | flags,
+ include_conf_file_act,
+ include_conf_dir_act,
+ conf, 1);
+@@ -362,7 +362,7 @@
+ char *includefile;
+
+ includefile = skip_whitespace(line_buffer + 8);
+- include_conf_recursive(conf, includefile);
++ include_conf_recursive(conf, includefile, 0);
+ } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
+ (is_conf_command(line_buffer, "blacklist"))) {
+ char *mod;
+@@ -559,7 +559,7 @@
+ if (ENABLE_FEATURE_2_6_MODULES) {
+ if (include_conf_file(&conf, "/etc/modprobe.conf"))
+ r = TRUE;
+- if (include_conf_recursive(&conf, "/etc/modprobe.d"))
++ if (include_conf_recursive(&conf, "/etc/modprobe.d", ACTION_QUIET))
+ r = TRUE;
+ }
+ if (ENABLE_FEATURE_2_4_MODULES && !r)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-10-06 18:52 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-10-06 18:52 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-06 11:52:02 -0700 (Mon, 06 Oct 2008)
New Revision: 23602
Log:
busybox: 1.12.1 grep fix
Added:
trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.1-grep.patch 2008-10-06 18:52:02 UTC (rev 23602)
@@ -0,0 +1,27 @@
+--- busybox-1.12.1/findutils/grep.c Sun Sep 28 20:04:28 2008
++++ busybox-1.12.1-grep/findutils/grep.c Wed Oct 1 00:45:49 2008
+@@ -363,12 +363,22 @@
+ * (unless -v: -Fov doesnt print anything at all) */
+ if (found)
+ print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
+- } else {
++ } else while (1) {
++ char old = line[gl->matched_range.rm_eo];
+ line[gl->matched_range.rm_eo] = '\0';
+ print_line(line + gl->matched_range.rm_so,
+ gl->matched_range.rm_eo - gl->matched_range.rm_so,
+ linenum, ':');
+- }
++ line[gl->matched_range.rm_eo] = old;
++#if !ENABLE_EXTRA_COMPAT
++ break;
++#else
++ if (re_search(&gl->compiled_regex, line, line_len,
++ gl->matched_range.rm_eo, line_len - gl->matched_range.rm_eo,
++ &gl->matched_range) < 0)
++ break;
++#endif
++ }
+ } else {
+ print_line(line, line_len, linenum, ':');
+ }
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-09-28 19:28 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-09-28 19:28 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-28 12:28:51 -0700 (Sun, 28 Sep 2008)
New Revision: 23546
Log:
busybox: bump 1.11.x and 1.12.x versions
Removed:
trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch
trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch
trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch
trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch
trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch
trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch
trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/Config.in 2008-09-28 19:28:51 UTC (rev 23546)
@@ -59,8 +59,8 @@
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
- default "1.11.2" if BR2_BUSYBOX_VERSION_1_11_X
- default "1.12.0" if BR2_BUSYBOX_VERSION_1_12_X
+ default "1.11.3" if BR2_BUSYBOX_VERSION_1_11_X
+ default "1.12.1" if BR2_BUSYBOX_VERSION_1_12_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
Deleted: trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,21 +0,0 @@
---- busybox-1.11.2/console-tools/kbd_mode.c Thu Aug 21 21:40:12 2008
-+++ busybox-1.11.2-kbdmode/console-tools/kbd_mode.c Wed Sep 3 23:52:26 2008
-@@ -2,7 +2,7 @@
- /*
- * Mini kbd_mode implementation for busybox
- *
-- * Copyright (C) 2007 Lo?c Greni? <loic.grenie@gmail.com>
-+ * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com>
- * written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from
- * console-utils v0.2.3, licensed under GNU GPLv2
- *
-@@ -46,7 +46,8 @@
- printf("The keyboard is in %s mode\n", mode);
- } else {
- opt = opt & UNICODE ? 3 : opt >> 1;
-- xioctl(fd, KDSKBMODE, opt);
-+ /* double cast prevents warnings about widening conversion */
-+ xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt);
- }
-
- if (ENABLE_FEATURE_CLEAN_UP)
Deleted: trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,53 +0,0 @@
---- busybox-1.12.0/editors/awk.c Wed Aug 6 00:56:11 2008
-+++ busybox-1.12.0-awk/editors/awk.c Fri Aug 29 01:17:05 2008
-@@ -973,7 +973,12 @@
-
- } else if (*p == '.' || isdigit(*p)) {
- /* it's a number */
-- t_double = strtod(p, &p);
-+#if ENABLE_DESKTOP
-+ if (p[0] == '0' && (p[1] | 0x20) == 'x')
-+ t_double = strtoll(p, &p, 0);
-+ else
-+#endif
-+ t_double = strtod(p, &p);
- if (*p == '.')
- syntax_error(EMSG_UNEXP_TOKEN);
- tc = TC_NUMBER;
-@@ -2034,28 +2039,30 @@
- setvar_p(res, s);
- break;
-
-+ /* Bitwise ops must assume that operands are unsigned. GNU Awk 3.1.5:
-+ * awk '{ print or(-1,1) }' gives "4.29497e+09", not "-2.xxxe+09" */
- case B_an:
-- setvar_i(res, (long)getvar_i(av[0]) & (long)getvar_i(av[1]));
-+ setvar_i(res, (unsigned long)getvar_i(av[0]) & (unsigned long)getvar_i(av[1]));
- break;
-
- case B_co:
-- setvar_i(res, ~(long)getvar_i(av[0]));
-+ setvar_i(res, ~(unsigned long)getvar_i(av[0]));
- break;
-
- case B_ls:
-- setvar_i(res, (long)getvar_i(av[0]) << (long)getvar_i(av[1]));
-+ setvar_i(res, (unsigned long)getvar_i(av[0]) << (unsigned long)getvar_i(av[1]));
- break;
-
- case B_or:
-- setvar_i(res, (long)getvar_i(av[0]) | (long)getvar_i(av[1]));
-+ setvar_i(res, (unsigned long)getvar_i(av[0]) | (unsigned long)getvar_i(av[1]));
- break;
-
- case B_rs:
-- setvar_i(res, (long)((unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1])));
-+ setvar_i(res, (unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1]));
- break;
-
- case B_xo:
-- setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1]));
-+ setvar_i(res, (unsigned long)getvar_i(av[0]) ^ (unsigned long)getvar_i(av[1]));
- break;
-
- case B_lo:
Deleted: trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,164 +0,0 @@
---- busybox-1.12.0/editors/vi.c Wed Aug 6 00:56:11 2008
-+++ busybox-1.12.0-crontab_vi/editors/vi.c Sun Sep 21 17:30:47 2008
-@@ -147,10 +147,10 @@
- #endif
-
- smallint editing; // >0 while we are editing a file
-- // [code audit says "can be 0 or 1 only"]
-+ // [code audit says "can be 0, 1 or 2 only"]
- smallint cmd_mode; // 0=command 1=insert 2=replace
- int file_modified; // buffer contents changed (counter, not flag!)
-- int last_file_modified; // = -1;
-+ int last_file_modified; // = -1;
- int fn_start; // index of first cmd line file name
- int save_argc; // how many file names on cmd line
- int cmdcnt; // repetition count
-@@ -623,7 +623,7 @@
- // These are commands that change text[].
- // Remember the input for the "." command
- if (!adding2q && ioq_start == NULL
-- && strchr(modifying_cmds, c)
-+ && c != '\0' && strchr(modifying_cmds, c)
- ) {
- start_new_cmd_q(c);
- }
-@@ -645,8 +645,8 @@
- }
- //-------------------------------------------------------------------
-
-- place_cursor(rows, 0, FALSE); // go to bottom of screen
-- clear_to_eol(); // Erase to end of line
-+ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
-+ clear_to_eol(); // erase to end of line
- cookmode();
- #undef cur_line
- }
-@@ -2009,9 +2009,9 @@
- {
- // get buffer for new cmd
- // if there is a current cmd count put it in the buffer first
-- if (cmdcnt > 0)
-+ if (cmdcnt > 0) {
- lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);
-- else { // just save char c onto queue
-+ } else { // just save char c onto queue
- last_modifying_cmd[0] = c;
- lmc_len = 1;
- }
-@@ -2157,21 +2157,21 @@
- //----- Come here when we get a continue signal -------------------
- static void cont_sig(int sig UNUSED_PARAM)
- {
-- rawmode(); // terminal to "raw"
-- last_status_cksum = 0; // force status update
-- redraw(TRUE); // re-draw the screen
-+ rawmode(); // terminal to "raw"
-+ last_status_cksum = 0; // force status update
-+ redraw(TRUE); // re-draw the screen
-
- signal(SIGTSTP, suspend_sig);
- signal(SIGCONT, SIG_DFL);
-- kill(my_pid, SIGCONT);
-+ kill(my_pid, SIGCONT); // huh? why? we are already "continued"...
- }
-
- //----- Come here when we get a Suspend signal -------------------
- static void suspend_sig(int sig UNUSED_PARAM)
- {
-- place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
-- clear_to_eol(); // Erase to end of line
-- cookmode(); // terminal to "cooked"
-+ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
-+ clear_to_eol(); // erase to end of line
-+ cookmode(); // terminal to "cooked"
-
- signal(SIGCONT, cont_sig);
- signal(SIGTSTP, SIG_DFL);
-@@ -2247,18 +2247,20 @@
-
- fflush(stdout);
- n = chars_to_parse;
-- // get input from User- are there already input chars in Q?
-+ // get input from User - are there already input chars in Q?
- if (n <= 0) {
- // the Q is empty, wait for a typed char
-+ again:
- n = safe_read(STDIN_FILENO, readbuffer, sizeof(readbuffer));
-- if (n < 0) {
-- if (errno == EBADF || errno == EFAULT || errno == EINVAL
-- || errno == EIO)
-- editing = 0; // want to exit
-- errno = 0;
-+ if (n <= 0) {
-+ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
-+ clear_to_eol(); // erase to end of line
-+ cookmode(); // terminal to "cooked"
-+ bb_error_msg_and_die("can't read user input");
- }
-- if (n <= 0)
-- return 0; // error
-+ /* elsewhere we can get very confused by NULs */
-+ if (readbuffer[0] == '\0')
-+ goto again;
- if (readbuffer[0] == 27) {
- // This is an ESC char. Is this Esc sequence?
- // Could be bare Esc key. See if there are any
---- busybox-1.12.0/miscutils/crontab.c Wed Aug 6 00:56:08 2008
-+++ busybox-1.12.0-crontab_vi/miscutils/crontab.c Sun Sep 21 17:30:47 2008
-@@ -93,6 +93,7 @@
- char *new_fname;
- char *user_name; /* -u USER */
- int fd;
-+ int src_fd;
- int opt_ler;
-
- /* file [opts] Replace crontab from file
-@@ -144,15 +145,15 @@
- bb_show_usage();
-
- /* Read replacement file under user's UID/GID/group vector */
-+ src_fd = STDIN_FILENO;
- if (!opt_ler) { /* Replace? */
- if (!argv[0])
- bb_show_usage();
- if (NOT_LONE_DASH(argv[0])) {
-- fd = open_as_user(pas, argv[0]);
-- if (fd < 0)
-+ src_fd = open_as_user(pas, argv[0]);
-+ if (src_fd < 0)
- bb_error_msg_and_die("user %s cannot read %s",
- pas->pw_name, argv[0]);
-- xmove_fd(fd, STDIN_FILENO);
- }
- }
-
-@@ -180,23 +181,23 @@
- tmp_fname = xasprintf("%s.%u", crontab_dir, (unsigned)getpid());
- /* No O_EXCL: we don't want to be stuck if earlier crontabs
- * were killed, leaving stale temp file behind */
-- fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
-- xmove_fd(fd, STDIN_FILENO);
-- fchown(STDIN_FILENO, pas->pw_uid, pas->pw_gid);
-+ src_fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
-+ fchown(src_fd, pas->pw_uid, pas->pw_gid);
- fd = open(pas->pw_name, O_RDONLY);
- if (fd >= 0) {
-- bb_copyfd_eof(fd, STDIN_FILENO);
-+ bb_copyfd_eof(fd, src_fd);
- close(fd);
-+ xlseek(src_fd, 0, SEEK_SET);
- }
-+ close_on_exec_on(src_fd); /* don't want editor to see this fd */
- edit_file(pas, tmp_fname);
-- xlseek(STDIN_FILENO, 0, SEEK_SET);
- /* fall through */
-
- case 0: /* Replace (no -l, -e, or -r were given) */
- new_fname = xasprintf("%s.new", pas->pw_name);
- fd = open(new_fname, O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, 0600);
- if (fd >= 0) {
-- bb_copyfd_eof(STDIN_FILENO, fd);
-+ bb_copyfd_eof(src_fd, fd);
- close(fd);
- xrename(new_fname, pas->pw_name);
- } else {
Deleted: trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,15 +0,0 @@
---- busybox-1.12.0/networking/udhcp/dhcpc.c Wed Aug 6 00:55:58 2008
-+++ busybox-1.12.0-dhcp/networking/udhcp/dhcpc.c Thu Aug 28 00:05:23 2008
-@@ -259,9 +259,10 @@
- if (opt & OPT_o)
- client_config.no_default_options = 1;
- while (list_O) {
-- int n = index_in_strings(dhcp_option_strings, llist_pop(&list_O));
-+ char *optstr = llist_pop(&list_O);
-+ int n = index_in_strings(dhcp_option_strings, optstr);
- if (n < 0)
-- bb_error_msg_and_die("unknown option '%s'", list_O->data);
-+ bb_error_msg_and_die("unknown option '%s'", optstr);
- n = dhcp_options[n].code;
- client_config.opt_mask[n >> 3] |= 1 << (n & 7);
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,78 +0,0 @@
---- busybox-1.12.0/findutils/grep.c Sat Aug 9 18:14:59 2008
-+++ busybox-1.12.0-grep/findutils/grep.c Fri Sep 19 23:33:15 2008
-@@ -87,7 +87,11 @@
-
- struct globals {
- int max_matches;
-+#if !ENABLE_EXTRA_COMPAT
- int reflags;
-+#else
-+ RE_TRANSLATE_TYPE case_fold; /* RE_TRANSLATE_TYPE is [[un]signed] char* */
-+#endif
- smalluint invert_search;
- smalluint print_filename;
- smalluint open_errors;
-@@ -110,7 +114,19 @@
- }; \
- } while (0)
- #define max_matches (G.max_matches )
-+#if !ENABLE_EXTRA_COMPAT
- #define reflags (G.reflags )
-+#else
-+#define case_fold (G.case_fold )
-+/* http://www.delorie.com/gnu/docs/regex/regex_46.html */
-+#define reflags re_syntax_options
-+#undef REG_NOSUB
-+#undef REG_EXTENDED
-+#undef REG_ICASE
-+#define REG_NOSUB bug:is:here /* should not be used */
-+#define REG_EXTENDED RE_SYNTAX_EGREP
-+#define REG_ICASE bug:is:here /* should not be used */
-+#endif
- #define invert_search (G.invert_search )
- #define print_filename (G.print_filename )
- #define open_errors (G.open_errors )
-@@ -240,6 +256,7 @@
- xregcomp(&gl->compiled_regex, gl->pattern, reflags);
- #else
- memset(&gl->compiled_regex, 0, sizeof(gl->compiled_regex));
-+ gl->compiled_regex.translate = case_fold; /* for -i */
- if (re_compile_pattern(gl->pattern, strlen(gl->pattern), &gl->compiled_regex))
- bb_error_msg_and_die("bad regex '%s'", gl->pattern);
- #endif
-@@ -532,17 +549,34 @@
- if (ENABLE_FEATURE_GREP_FGREP_ALIAS && applet_name[0] == 'f')
- option_mask32 |= OPT_F;
-
-+#if !ENABLE_EXTRA_COMPAT
- if (!(option_mask32 & (OPT_o | OPT_w)))
- reflags = REG_NOSUB;
-+#endif
-
- if (ENABLE_FEATURE_GREP_EGREP_ALIAS
- && (applet_name[0] == 'e' || (option_mask32 & OPT_E))
- ) {
- reflags |= REG_EXTENDED;
- }
-+#if ENABLE_EXTRA_COMPAT
-+ else {
-+ reflags = RE_SYNTAX_GREP;
-+ }
-+#endif
-
-- if (option_mask32 & OPT_i)
-+ if (option_mask32 & OPT_i) {
-+#if !ENABLE_EXTRA_COMPAT
- reflags |= REG_ICASE;
-+#else
-+ int i;
-+ case_fold = xmalloc(256);
-+ for (i = 0; i < 256; i++)
-+ case_fold[i] = (unsigned char)i;
-+ for (i = 'a'; i <= 'z'; i++)
-+ case_fold[i] = (unsigned char)(i - ('a' - 'A'));
-+#endif
-+ }
-
- argv += optind;
- argc -= optind;
Deleted: trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,333 +0,0 @@
---- busybox-1.12.0/modutils/insmod.c Wed Aug 6 00:56:02 2008
-+++ busybox-1.12.0-insmod/modutils/insmod.c Sun Aug 31 23:56:28 2008
-@@ -1059,8 +1059,9 @@
-
- case R_68K_PC8:
- v -= dot;
-- if ((ElfW(Sword))v > 0x7f ||
-- (ElfW(Sword))v < -(ElfW(Sword))0x80) {
-+ if ((ElfW(Sword))v > 0x7f
-+ || (ElfW(Sword))v < -(ElfW(Sword))0x80
-+ ) {
- ret = obj_reloc_overflow;
- }
- *(char *)loc = v;
-@@ -1068,8 +1069,9 @@
-
- case R_68K_PC16:
- v -= dot;
-- if ((ElfW(Sword))v > 0x7fff ||
-- (ElfW(Sword))v < -(ElfW(Sword))0x8000) {
-+ if ((ElfW(Sword))v > 0x7fff
-+ || (ElfW(Sword))v < -(ElfW(Sword))0x8000
-+ ) {
- ret = obj_reloc_overflow;
- }
- *(short *)loc = v;
-@@ -1208,8 +1210,9 @@
- {
- Elf32_Addr word;
-
-- if ((Elf32_Sword)v > 0x7fff ||
-- (Elf32_Sword)v < -(Elf32_Sword)0x8000) {
-+ if ((Elf32_Sword)v > 0x7fff
-+ || (Elf32_Sword)v < -(Elf32_Sword)0x8000
-+ ) {
- ret = obj_reloc_overflow;
- }
-
-@@ -1238,8 +1241,9 @@
- Elf32_Addr word;
-
- v -= dot + 4;
-- if ((Elf32_Sword)v > 0x7fff ||
-- (Elf32_Sword)v < -(Elf32_Sword)0x8000) {
-+ if ((Elf32_Sword)v > 0x7fff
-+ || (Elf32_Sword)v < -(Elf32_Sword)0x8000
-+ ) {
- ret = obj_reloc_overflow;
- }
-
-@@ -1253,9 +1257,10 @@
- Elf32_Addr word, gp;
- /* get _gp */
- gp = obj_symbol_final_value(f, obj_find_symbol(f, SPFX "_gp"));
-- v-=gp;
-- if ((Elf32_Sword)v > 0x7fff ||
-- (Elf32_Sword)v < -(Elf32_Sword)0x8000) {
-+ v -= gp;
-+ if ((Elf32_Sword)v > 0x7fff
-+ || (Elf32_Sword)v < -(Elf32_Sword)0x8000
-+ ) {
- ret = obj_reloc_overflow;
- }
-
-@@ -2132,7 +2137,6 @@
- for (sym = f->symtab[hash]; sym; sym = sym->next)
- if (f->symbol_cmp(sym->name, name) == 0)
- return sym;
--
- return NULL;
- }
-
-@@ -2141,12 +2145,10 @@
- if (sym) {
- if (sym->secidx >= SHN_LORESERVE)
- return sym->value;
--
- return sym->value + f->sections[sym->secidx]->header.sh_addr;
-- } else {
-- /* As a special case, a NULL sym has value zero. */
-- return 0;
- }
-+ /* As a special case, a NULL sym has value zero. */
-+ return 0;
- }
-
- static struct obj_section *obj_find_section(struct obj_file *f, const char *name)
-@@ -2156,7 +2158,6 @@
- for (i = 0; i < n; ++i)
- if (strcmp(f->sections[i]->name, name) == 0)
- return f->sections[i];
--
- return NULL;
- }
-
-@@ -2167,9 +2168,11 @@
- af = a->header.sh_flags;
-
- ac = 0;
-- if (a->name[0] != '.' || strlen(a->name) != 10 ||
-- strcmp(a->name + 5, ".init"))
-+ if (a->name[0] != '.' || strlen(a->name) != 10
-+ || strcmp(a->name + 5, ".init") != 0
-+ ) {
- ac |= 32;
-+ }
- if (af & SHF_ALLOC)
- ac |= 16;
- if (!(af & SHF_WRITE))
-@@ -2212,7 +2215,7 @@
- sec->name = name;
- sec->idx = newidx;
- if (size)
-- sec->contents = xmalloc(size);
-+ sec->contents = xzalloc(size);
-
- obj_insert_section_load_order(f, sec);
-
-@@ -2227,7 +2230,7 @@
- int newidx = f->header.e_shnum++;
- struct obj_section *sec;
-
-- f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
-+ f->sections = xrealloc_vector(f->sections, 2, newidx);
- f->sections[newidx] = sec = arch_new_section();
-
- sec->header.sh_type = SHT_PROGBITS;
-@@ -2237,7 +2240,7 @@
- sec->name = name;
- sec->idx = newidx;
- if (size)
-- sec->contents = xmalloc(size);
-+ sec->contents = xzalloc(size);
-
- sec->load_next = f->load_order;
- f->load_order = sec;
-@@ -2689,8 +2692,7 @@
- /* Collect the modules' symbols. */
-
- if (nmod) {
-- ext_modules = modules = xmalloc(nmod * sizeof(*modules));
-- memset(modules, 0, nmod * sizeof(*modules));
-+ ext_modules = modules = xzalloc(nmod * sizeof(*modules));
- for (i = 0, mn = module_names, m = modules;
- i < nmod; ++i, ++m, mn += strlen(mn) + 1) {
- struct new_module_info info;
-@@ -2770,13 +2772,14 @@
- }
-
-
--static void new_create_this_module(struct obj_file *f, const char *m_name)
-+static void new_create_this_module(struct obj_file *f, const char *m_name)
- {
- struct obj_section *sec;
-
- sec = obj_create_alloced_section_first(f, ".this", tgt_sizeof_long,
- sizeof(struct new_module));
-- memset(sec->contents, 0, sizeof(struct new_module));
-+ /* done by obj_create_alloced_section_first: */
-+ /*memset(sec->contents, 0, sizeof(struct new_module));*/
-
- obj_add_symbol(f, SPFX "__this_module", -1,
- ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0,
-@@ -2856,18 +2859,19 @@
- /* We don't want to export symbols residing in sections that
- aren't loaded. There are a number of these created so that
- we make sure certain module options don't appear twice. */
--
-- loaded = alloca(sizeof(int) * (i = f->header.e_shnum));
-+ i = f->header.e_shnum;
-+ loaded = alloca(sizeof(int) * i);
- while (--i >= 0)
- loaded[i] = (f->sections[i]->header.sh_flags & SHF_ALLOC) != 0;
-
- for (nsyms = i = 0; i < HASH_BUCKETS; ++i) {
- struct obj_symbol *sym;
-- for (sym = f->symtab[i]; sym; sym = sym->next)
-+ for (sym = f->symtab[i]; sym; sym = sym->next) {
- if (ELF_ST_BIND(sym->info) != STB_LOCAL
- && sym->secidx <= SHN_HIRESERVE
- && (sym->secidx >= SHN_LORESERVE
-- || loaded[sym->secidx])) {
-+ || loaded[sym->secidx])
-+ ) {
- ElfW(Addr) ofs = nsyms * 2 * tgt_sizeof_void_p;
-
- obj_symbol_patch(f, sec->idx, ofs, sym);
-@@ -2876,6 +2880,7 @@
-
- nsyms++;
- }
-+ }
- }
-
- obj_extend_section(sec, nsyms * 2 * tgt_sizeof_char_p);
-@@ -2934,9 +2939,11 @@
- }
- sec = obj_find_section(f, ".data.init");
- if (sec) {
-- if (!module->runsize ||
-- module->runsize > sec->header.sh_addr - m_addr)
-+ if (!module->runsize
-+ || module->runsize > sec->header.sh_addr - m_addr
-+ ) {
- module->runsize = sec->header.sh_addr - m_addr;
-+ }
- }
- sec = obj_find_section(f, ARCHDATA_SEC_NAME);
- if (sec && sec->header.sh_size) {
-@@ -3083,9 +3090,9 @@
- if (i == f->header.e_shnum) {
- struct obj_section *sec;
-
-+ f->header.e_shnum++;
- f->sections = xrealloc_vector(f->sections, 2, i);
- f->sections[i] = sec = arch_new_section();
-- f->header.e_shnum = i + 1;
-
- sec->header.sh_type = SHT_PROGBITS;
- sec->header.sh_flags = SHF_WRITE | SHF_ALLOC;
-@@ -3124,12 +3131,9 @@
- for (i = 0; i < f->header.e_shnum; ++i) {
- struct obj_section *s = f->sections[i];
- if (s->header.sh_type == SHT_NOBITS) {
-+ s->contents = NULL;
- if (s->header.sh_size != 0)
-- s->contents = memset(xmalloc(s->header.sh_size),
-- 0, s->header.sh_size);
-- else
-- s->contents = NULL;
--
-+ s->contents = xzalloc(s->header.sh_size),
- s->header.sh_type = SHT_PROGBITS;
- }
- }
-@@ -3222,8 +3226,8 @@
- #if SHT_RELM == SHT_RELA
- #if defined(__alpha__) && defined(AXP_BROKEN_GAS)
- /* Work around a nasty GAS bug, that is fixed as of 2.7.0.9. */
-- if (!extsym || !extsym->st_name ||
-- ELF_ST_BIND(extsym->st_info) != STB_LOCAL)
-+ if (!extsym || !extsym->st_name
-+ || ELF_ST_BIND(extsym->st_info) != STB_LOCAL)
- #endif
- value += rel->r_addend;
- #endif
-@@ -3329,16 +3333,17 @@
- }
-
- if (f->header.e_ident[EI_MAG0] != ELFMAG0
-- || f->header.e_ident[EI_MAG1] != ELFMAG1
-- || f->header.e_ident[EI_MAG2] != ELFMAG2
-- || f->header.e_ident[EI_MAG3] != ELFMAG3) {
-+ || f->header.e_ident[EI_MAG1] != ELFMAG1
-+ || f->header.e_ident[EI_MAG2] != ELFMAG2
-+ || f->header.e_ident[EI_MAG3] != ELFMAG3
-+ ) {
- bb_error_msg_and_die("not an ELF file");
- }
- if (f->header.e_ident[EI_CLASS] != ELFCLASSM
-- || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN
-- ? ELFDATA2MSB : ELFDATA2LSB)
-- || f->header.e_ident[EI_VERSION] != EV_CURRENT
-- || !MATCH_MACHINE(f->header.e_machine)) {
-+ || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB)
-+ || f->header.e_ident[EI_VERSION] != EV_CURRENT
-+ || !MATCH_MACHINE(f->header.e_machine)
-+ ) {
- bb_error_msg_and_die("ELF file not for this architecture");
- }
- if (f->header.e_type != ET_REL) {
-@@ -3354,8 +3359,10 @@
- }
-
- shnum = f->header.e_shnum;
-- f->sections = xmalloc(sizeof(struct obj_section *) * shnum);
-- memset(f->sections, 0, sizeof(struct obj_section *) * shnum);
-+ /* Growth of ->sections vector will be done by
-+ * xrealloc_vector(..., 2, ...), therefore we must allocate
-+ * at least 2^2 = 4 extra elements here. */
-+ f->sections = xzalloc(sizeof(f->sections[0]) * (shnum + 4));
-
- section_headers = alloca(sizeof(ElfW(Shdr)) * shnum);
- fseek(fp, f->header.e_shoff, SEEK_SET);
-@@ -3391,14 +3398,13 @@
- case SHT_SYMTAB:
- case SHT_STRTAB:
- case SHT_RELM:
-+ sec->contents = NULL;
- if (sec->header.sh_size > 0) {
-- sec->contents = xmalloc(sec->header.sh_size);
-+ sec->contents = xzalloc(sec->header.sh_size);
- fseek(fp, sec->header.sh_offset, SEEK_SET);
- if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
- bb_perror_msg_and_die("error reading ELF section data");
- }
-- } else {
-- sec->contents = NULL;
- }
- break;
-
-@@ -3860,16 +3866,20 @@
- for (nsyms = i = 0; i < HASH_BUCKETS; ++i)
- for (sym = f->symtab[i]; sym; sym = sym->next)
- if (sym->secidx <= SHN_HIRESERVE
-- && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx]))
-+ && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx])
-+ ) {
- ++nsyms;
-+ }
-
- all = alloca(nsyms * sizeof(struct obj_symbol *));
-
- for (i = 0, p = all; i < HASH_BUCKETS; ++i)
- for (sym = f->symtab[i]; sym; sym = sym->next)
- if (sym->secidx <= SHN_HIRESERVE
-- && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx]))
-+ && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx])
-+ ) {
- *p++ = sym;
-+ }
-
- /* And list them. */
- printf("\nSymbols:\n");
-@@ -4265,7 +4275,7 @@
- }
- #else
- len = MAXINT(ssize_t);
-- map = xmalloc_open_read_close(filename, &len);
-+ map = xmalloc_xopen_read_close(filename, &len);
- #endif
-
- if (init_module(map, len, options) != 0)
Deleted: trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch 2008-09-28 18:33:02 UTC (rev 23545)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch 2008-09-28 19:28:51 UTC (rev 23546)
@@ -1,145 +0,0 @@
---- busybox-1.12.0/libbb/lineedit.c Wed Aug 20 02:48:13 2008
-+++ busybox-1.12.0-lineedit/libbb/lineedit.c Mon Sep 22 00:27:18 2008
-@@ -956,24 +956,33 @@
-
- #if MAX_HISTORY > 0
-
-+static void save_command_ps_at_cur_history(void)
-+{
-+ if (command_ps[0] != '\0') {
-+ int cur = state->cur_history;
-+ free(state->history[cur]);
-+ state->history[cur] = xstrdup(command_ps);
-+ }
-+}
-+
- /* state->flags is already checked to be nonzero */
--static void get_previous_history(void)
-+static int get_previous_history(void)
- {
-- if (command_ps[0] != '\0' || state->history[state->cur_history] == NULL) {
-- free(state->history[state->cur_history]);
-- state->history[state->cur_history] = xstrdup(command_ps);
-+ if ((state->flags & DO_HISTORY) && state->cur_history) {
-+ save_command_ps_at_cur_history();
-+ state->cur_history--;
-+ return 1;
- }
-- state->cur_history--;
-+ beep();
-+ return 0;
- }
-
- static int get_next_history(void)
- {
- if (state->flags & DO_HISTORY) {
-- int ch = state->cur_history;
-- if (ch < state->cnt_history) {
-- get_previous_history(); /* save the current history line */
-- state->cur_history = ch + 1;
-- return state->cur_history;
-+ if (state->cur_history < state->cnt_history) {
-+ save_command_ps_at_cur_history(); /* save the current history line */
-+ return ++state->cur_history;
- }
- }
- beep();
-@@ -995,6 +1004,7 @@
- for (hi = state->cnt_history; hi > 0;) {
- hi--;
- free(state->history[hi]);
-+ state->history[hi] = NULL;
- }
-
- for (hi = 0; hi < MAX_HISTORY;) {
-@@ -1006,7 +1016,7 @@
- l = strlen(hl);
- if (l >= MAX_LINELEN)
- hl[MAX_LINELEN-1] = '\0';
-- if (l == 0 || hl[0] == ' ') {
-+ if (l == 0) {
- free(hl);
- continue;
- }
-@@ -1043,19 +1053,27 @@
-
- if (!(state->flags & DO_HISTORY))
- return;
--
-+ if (str[0] == '\0')
-+ return;
- i = state->cnt_history;
-- free(state->history[MAX_HISTORY]);
-- state->history[MAX_HISTORY] = NULL;
-- /* After max history, remove the oldest command */
-+ /* Don't save dupes */
-+ if (i && strcmp(state->history[i-1], str) == 0)
-+ return;
-+
-+ free(state->history[MAX_HISTORY]); /* redundant, paranoia */
-+ state->history[MAX_HISTORY] = NULL; /* redundant, paranoia */
-+
-+ /* If history[] is full, remove the oldest command */
-+ /* we need to keep history[MAX_HISTORY] empty, hence >=, not > */
- if (i >= MAX_HISTORY) {
- free(state->history[0]);
- for (i = 0; i < MAX_HISTORY-1; i++)
- state->history[i] = state->history[i+1];
-+ /* i == MAX_HISTORY-1 */
- }
--// Maybe "if (!i || strcmp(history[i-1], command) != 0) ..."
--// (i.e. do not save dups?)
-+ /* i <= MAX_HISTORY-1 */
- state->history[i++] = xstrdup(str);
-+ /* i <= MAX_HISTORY */
- state->cur_history = i;
- state->cnt_history = i;
- #if ENABLE_FEATURE_EDITING_SAVEHISTORY
-@@ -1432,6 +1450,13 @@
- }
- }
- #endif
-+
-+#if 0
-+ for (ic = 0; ic <= MAX_HISTORY; ic++)
-+ bb_error_msg("history[%d]:'%s'", ic, state->history[ic]);
-+ bb_error_msg("cur_history:%d cnt_history:%d", state->cur_history, state->cnt_history);
-+#endif
-+
- /* Print out the command prompt */
- parse_and_put_prompt(prompt);
-
-@@ -1540,11 +1565,8 @@
- vi_case(CTRL('P')|vbit:)
- vi_case('k'|vbit:)
- /* Control-p -- Get previous command from history */
-- if ((state->flags & DO_HISTORY) && state->cur_history > 0) {
-- get_previous_history();
-+ if (get_previous_history())
- goto rewrite_line;
-- }
-- beep();
- break;
- #endif
-
-@@ -1733,10 +1755,8 @@
- #if MAX_HISTORY > 0
- case 'A':
- /* Up Arrow -- Get previous command from history */
-- if ((state->flags & DO_HISTORY) && state->cur_history > 0) {
-- get_previous_history();
-+ if (get_previous_history())
- goto rewrite_line;
-- }
- beep();
- break;
- case 'B':
-@@ -1746,7 +1766,7 @@
- rewrite_line:
- /* Rewrite the line with the selected history item */
- /* change command */
-- command_len = strlen(strcpy(command, state->history[state->cur_history]));
-+ command_len = strlen(strcpy(command, state->history[state->cur_history] ? : ""));
- /* redraw and go to eol (bol, in vi */
- redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
- break;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-09-22 11:54 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-09-22 11:54 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-22 04:54:17 -0700 (Mon, 22 Sep 2008)
New Revision: 23453
Log:
busybox: more 1.12.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch
trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch
trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch
Modified:
trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-crontab_vi.patch 2008-09-22 11:54:17 UTC (rev 23453)
@@ -0,0 +1,164 @@
+--- busybox-1.12.0/editors/vi.c Wed Aug 6 00:56:11 2008
++++ busybox-1.12.0-crontab_vi/editors/vi.c Sun Sep 21 17:30:47 2008
+@@ -147,10 +147,10 @@
+ #endif
+
+ smallint editing; // >0 while we are editing a file
+- // [code audit says "can be 0 or 1 only"]
++ // [code audit says "can be 0, 1 or 2 only"]
+ smallint cmd_mode; // 0=command 1=insert 2=replace
+ int file_modified; // buffer contents changed (counter, not flag!)
+- int last_file_modified; // = -1;
++ int last_file_modified; // = -1;
+ int fn_start; // index of first cmd line file name
+ int save_argc; // how many file names on cmd line
+ int cmdcnt; // repetition count
+@@ -623,7 +623,7 @@
+ // These are commands that change text[].
+ // Remember the input for the "." command
+ if (!adding2q && ioq_start == NULL
+- && strchr(modifying_cmds, c)
++ && c != '\0' && strchr(modifying_cmds, c)
+ ) {
+ start_new_cmd_q(c);
+ }
+@@ -645,8 +645,8 @@
+ }
+ //-------------------------------------------------------------------
+
+- place_cursor(rows, 0, FALSE); // go to bottom of screen
+- clear_to_eol(); // Erase to end of line
++ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
++ clear_to_eol(); // erase to end of line
+ cookmode();
+ #undef cur_line
+ }
+@@ -2009,9 +2009,9 @@
+ {
+ // get buffer for new cmd
+ // if there is a current cmd count put it in the buffer first
+- if (cmdcnt > 0)
++ if (cmdcnt > 0) {
+ lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);
+- else { // just save char c onto queue
++ } else { // just save char c onto queue
+ last_modifying_cmd[0] = c;
+ lmc_len = 1;
+ }
+@@ -2157,21 +2157,21 @@
+ //----- Come here when we get a continue signal -------------------
+ static void cont_sig(int sig UNUSED_PARAM)
+ {
+- rawmode(); // terminal to "raw"
+- last_status_cksum = 0; // force status update
+- redraw(TRUE); // re-draw the screen
++ rawmode(); // terminal to "raw"
++ last_status_cksum = 0; // force status update
++ redraw(TRUE); // re-draw the screen
+
+ signal(SIGTSTP, suspend_sig);
+ signal(SIGCONT, SIG_DFL);
+- kill(my_pid, SIGCONT);
++ kill(my_pid, SIGCONT); // huh? why? we are already "continued"...
+ }
+
+ //----- Come here when we get a Suspend signal -------------------
+ static void suspend_sig(int sig UNUSED_PARAM)
+ {
+- place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+- clear_to_eol(); // Erase to end of line
+- cookmode(); // terminal to "cooked"
++ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
++ clear_to_eol(); // erase to end of line
++ cookmode(); // terminal to "cooked"
+
+ signal(SIGCONT, cont_sig);
+ signal(SIGTSTP, SIG_DFL);
+@@ -2247,18 +2247,20 @@
+
+ fflush(stdout);
+ n = chars_to_parse;
+- // get input from User- are there already input chars in Q?
++ // get input from User - are there already input chars in Q?
+ if (n <= 0) {
+ // the Q is empty, wait for a typed char
++ again:
+ n = safe_read(STDIN_FILENO, readbuffer, sizeof(readbuffer));
+- if (n < 0) {
+- if (errno == EBADF || errno == EFAULT || errno == EINVAL
+- || errno == EIO)
+- editing = 0; // want to exit
+- errno = 0;
++ if (n <= 0) {
++ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
++ clear_to_eol(); // erase to end of line
++ cookmode(); // terminal to "cooked"
++ bb_error_msg_and_die("can't read user input");
+ }
+- if (n <= 0)
+- return 0; // error
++ /* elsewhere we can get very confused by NULs */
++ if (readbuffer[0] == '\0')
++ goto again;
+ if (readbuffer[0] == 27) {
+ // This is an ESC char. Is this Esc sequence?
+ // Could be bare Esc key. See if there are any
+--- busybox-1.12.0/miscutils/crontab.c Wed Aug 6 00:56:08 2008
++++ busybox-1.12.0-crontab_vi/miscutils/crontab.c Sun Sep 21 17:30:47 2008
+@@ -93,6 +93,7 @@
+ char *new_fname;
+ char *user_name; /* -u USER */
+ int fd;
++ int src_fd;
+ int opt_ler;
+
+ /* file [opts] Replace crontab from file
+@@ -144,15 +145,15 @@
+ bb_show_usage();
+
+ /* Read replacement file under user's UID/GID/group vector */
++ src_fd = STDIN_FILENO;
+ if (!opt_ler) { /* Replace? */
+ if (!argv[0])
+ bb_show_usage();
+ if (NOT_LONE_DASH(argv[0])) {
+- fd = open_as_user(pas, argv[0]);
+- if (fd < 0)
++ src_fd = open_as_user(pas, argv[0]);
++ if (src_fd < 0)
+ bb_error_msg_and_die("user %s cannot read %s",
+ pas->pw_name, argv[0]);
+- xmove_fd(fd, STDIN_FILENO);
+ }
+ }
+
+@@ -180,23 +181,23 @@
+ tmp_fname = xasprintf("%s.%u", crontab_dir, (unsigned)getpid());
+ /* No O_EXCL: we don't want to be stuck if earlier crontabs
+ * were killed, leaving stale temp file behind */
+- fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
+- xmove_fd(fd, STDIN_FILENO);
+- fchown(STDIN_FILENO, pas->pw_uid, pas->pw_gid);
++ src_fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
++ fchown(src_fd, pas->pw_uid, pas->pw_gid);
+ fd = open(pas->pw_name, O_RDONLY);
+ if (fd >= 0) {
+- bb_copyfd_eof(fd, STDIN_FILENO);
++ bb_copyfd_eof(fd, src_fd);
+ close(fd);
++ xlseek(src_fd, 0, SEEK_SET);
+ }
++ close_on_exec_on(src_fd); /* don't want editor to see this fd */
+ edit_file(pas, tmp_fname);
+- xlseek(STDIN_FILENO, 0, SEEK_SET);
+ /* fall through */
+
+ case 0: /* Replace (no -l, -e, or -r were given) */
+ new_fname = xasprintf("%s.new", pas->pw_name);
+ fd = open(new_fname, O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, 0600);
+ if (fd >= 0) {
+- bb_copyfd_eof(STDIN_FILENO, fd);
++ bb_copyfd_eof(src_fd, fd);
+ close(fd);
+ xrename(new_fname, pas->pw_name);
+ } else {
Added: trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-grep.patch 2008-09-22 11:54:17 UTC (rev 23453)
@@ -0,0 +1,78 @@
+--- busybox-1.12.0/findutils/grep.c Sat Aug 9 18:14:59 2008
++++ busybox-1.12.0-grep/findutils/grep.c Fri Sep 19 23:33:15 2008
+@@ -87,7 +87,11 @@
+
+ struct globals {
+ int max_matches;
++#if !ENABLE_EXTRA_COMPAT
+ int reflags;
++#else
++ RE_TRANSLATE_TYPE case_fold; /* RE_TRANSLATE_TYPE is [[un]signed] char* */
++#endif
+ smalluint invert_search;
+ smalluint print_filename;
+ smalluint open_errors;
+@@ -110,7 +114,19 @@
+ }; \
+ } while (0)
+ #define max_matches (G.max_matches )
++#if !ENABLE_EXTRA_COMPAT
+ #define reflags (G.reflags )
++#else
++#define case_fold (G.case_fold )
++/* http://www.delorie.com/gnu/docs/regex/regex_46.html */
++#define reflags re_syntax_options
++#undef REG_NOSUB
++#undef REG_EXTENDED
++#undef REG_ICASE
++#define REG_NOSUB bug:is:here /* should not be used */
++#define REG_EXTENDED RE_SYNTAX_EGREP
++#define REG_ICASE bug:is:here /* should not be used */
++#endif
+ #define invert_search (G.invert_search )
+ #define print_filename (G.print_filename )
+ #define open_errors (G.open_errors )
+@@ -240,6 +256,7 @@
+ xregcomp(&gl->compiled_regex, gl->pattern, reflags);
+ #else
+ memset(&gl->compiled_regex, 0, sizeof(gl->compiled_regex));
++ gl->compiled_regex.translate = case_fold; /* for -i */
+ if (re_compile_pattern(gl->pattern, strlen(gl->pattern), &gl->compiled_regex))
+ bb_error_msg_and_die("bad regex '%s'", gl->pattern);
+ #endif
+@@ -532,17 +549,34 @@
+ if (ENABLE_FEATURE_GREP_FGREP_ALIAS && applet_name[0] == 'f')
+ option_mask32 |= OPT_F;
+
++#if !ENABLE_EXTRA_COMPAT
+ if (!(option_mask32 & (OPT_o | OPT_w)))
+ reflags = REG_NOSUB;
++#endif
+
+ if (ENABLE_FEATURE_GREP_EGREP_ALIAS
+ && (applet_name[0] == 'e' || (option_mask32 & OPT_E))
+ ) {
+ reflags |= REG_EXTENDED;
+ }
++#if ENABLE_EXTRA_COMPAT
++ else {
++ reflags = RE_SYNTAX_GREP;
++ }
++#endif
+
+- if (option_mask32 & OPT_i)
++ if (option_mask32 & OPT_i) {
++#if !ENABLE_EXTRA_COMPAT
+ reflags |= REG_ICASE;
++#else
++ int i;
++ case_fold = xmalloc(256);
++ for (i = 0; i < 256; i++)
++ case_fold[i] = (unsigned char)i;
++ for (i = 'a'; i <= 'z'; i++)
++ case_fold[i] = (unsigned char)(i - ('a' - 'A'));
++#endif
++ }
+
+ argv += optind;
+ argc -= optind;
Modified: trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch 2008-09-22 08:11:05 UTC (rev 23452)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch 2008-09-22 11:54:17 UTC (rev 23453)
@@ -1,6 +1,113 @@
--- busybox-1.12.0/modutils/insmod.c Wed Aug 6 00:56:02 2008
-+++ busybox-1.12.0-insmod/modutils/insmod.c Thu Aug 28 23:38:35 2008
-@@ -2212,7 +2212,7 @@
++++ busybox-1.12.0-insmod/modutils/insmod.c Sun Aug 31 23:56:28 2008
+@@ -1059,8 +1059,9 @@
+
+ case R_68K_PC8:
+ v -= dot;
+- if ((ElfW(Sword))v > 0x7f ||
+- (ElfW(Sword))v < -(ElfW(Sword))0x80) {
++ if ((ElfW(Sword))v > 0x7f
++ || (ElfW(Sword))v < -(ElfW(Sword))0x80
++ ) {
+ ret = obj_reloc_overflow;
+ }
+ *(char *)loc = v;
+@@ -1068,8 +1069,9 @@
+
+ case R_68K_PC16:
+ v -= dot;
+- if ((ElfW(Sword))v > 0x7fff ||
+- (ElfW(Sword))v < -(ElfW(Sword))0x8000) {
++ if ((ElfW(Sword))v > 0x7fff
++ || (ElfW(Sword))v < -(ElfW(Sword))0x8000
++ ) {
+ ret = obj_reloc_overflow;
+ }
+ *(short *)loc = v;
+@@ -1208,8 +1210,9 @@
+ {
+ Elf32_Addr word;
+
+- if ((Elf32_Sword)v > 0x7fff ||
+- (Elf32_Sword)v < -(Elf32_Sword)0x8000) {
++ if ((Elf32_Sword)v > 0x7fff
++ || (Elf32_Sword)v < -(Elf32_Sword)0x8000
++ ) {
+ ret = obj_reloc_overflow;
+ }
+
+@@ -1238,8 +1241,9 @@
+ Elf32_Addr word;
+
+ v -= dot + 4;
+- if ((Elf32_Sword)v > 0x7fff ||
+- (Elf32_Sword)v < -(Elf32_Sword)0x8000) {
++ if ((Elf32_Sword)v > 0x7fff
++ || (Elf32_Sword)v < -(Elf32_Sword)0x8000
++ ) {
+ ret = obj_reloc_overflow;
+ }
+
+@@ -1253,9 +1257,10 @@
+ Elf32_Addr word, gp;
+ /* get _gp */
+ gp = obj_symbol_final_value(f, obj_find_symbol(f, SPFX "_gp"));
+- v-=gp;
+- if ((Elf32_Sword)v > 0x7fff ||
+- (Elf32_Sword)v < -(Elf32_Sword)0x8000) {
++ v -= gp;
++ if ((Elf32_Sword)v > 0x7fff
++ || (Elf32_Sword)v < -(Elf32_Sword)0x8000
++ ) {
+ ret = obj_reloc_overflow;
+ }
+
+@@ -2132,7 +2137,6 @@
+ for (sym = f->symtab[hash]; sym; sym = sym->next)
+ if (f->symbol_cmp(sym->name, name) == 0)
+ return sym;
+-
+ return NULL;
+ }
+
+@@ -2141,12 +2145,10 @@
+ if (sym) {
+ if (sym->secidx >= SHN_LORESERVE)
+ return sym->value;
+-
+ return sym->value + f->sections[sym->secidx]->header.sh_addr;
+- } else {
+- /* As a special case, a NULL sym has value zero. */
+- return 0;
+ }
++ /* As a special case, a NULL sym has value zero. */
++ return 0;
+ }
+
+ static struct obj_section *obj_find_section(struct obj_file *f, const char *name)
+@@ -2156,7 +2158,6 @@
+ for (i = 0; i < n; ++i)
+ if (strcmp(f->sections[i]->name, name) == 0)
+ return f->sections[i];
+-
+ return NULL;
+ }
+
+@@ -2167,9 +2168,11 @@
+ af = a->header.sh_flags;
+
+ ac = 0;
+- if (a->name[0] != '.' || strlen(a->name) != 10 ||
+- strcmp(a->name + 5, ".init"))
++ if (a->name[0] != '.' || strlen(a->name) != 10
++ || strcmp(a->name + 5, ".init") != 0
++ ) {
+ ac |= 32;
++ }
+ if (af & SHF_ALLOC)
+ ac |= 16;
+ if (!(af & SHF_WRITE))
+@@ -2212,7 +2215,7 @@
sec->name = name;
sec->idx = newidx;
if (size)
@@ -9,7 +116,7 @@
obj_insert_section_load_order(f, sec);
-@@ -2227,7 +2227,7 @@
+@@ -2227,7 +2230,7 @@
int newidx = f->header.e_shnum++;
struct obj_section *sec;
@@ -18,7 +125,7 @@
f->sections[newidx] = sec = arch_new_section();
sec->header.sh_type = SHT_PROGBITS;
-@@ -2237,7 +2237,7 @@
+@@ -2237,7 +2240,7 @@
sec->name = name;
sec->idx = newidx;
if (size)
@@ -27,7 +134,7 @@
sec->load_next = f->load_order;
f->load_order = sec;
-@@ -2689,8 +2689,7 @@
+@@ -2689,8 +2692,7 @@
/* Collect the modules' symbols. */
if (nmod) {
@@ -37,7 +144,7 @@
for (i = 0, mn = module_names, m = modules;
i < nmod; ++i, ++m, mn += strlen(mn) + 1) {
struct new_module_info info;
-@@ -2770,13 +2769,14 @@
+@@ -2770,13 +2772,14 @@
}
@@ -54,7 +161,64 @@
obj_add_symbol(f, SPFX "__this_module", -1,
ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0,
-@@ -3124,12 +3124,9 @@
+@@ -2856,18 +2859,19 @@
+ /* We don't want to export symbols residing in sections that
+ aren't loaded. There are a number of these created so that
+ we make sure certain module options don't appear twice. */
+-
+- loaded = alloca(sizeof(int) * (i = f->header.e_shnum));
++ i = f->header.e_shnum;
++ loaded = alloca(sizeof(int) * i);
+ while (--i >= 0)
+ loaded[i] = (f->sections[i]->header.sh_flags & SHF_ALLOC) != 0;
+
+ for (nsyms = i = 0; i < HASH_BUCKETS; ++i) {
+ struct obj_symbol *sym;
+- for (sym = f->symtab[i]; sym; sym = sym->next)
++ for (sym = f->symtab[i]; sym; sym = sym->next) {
+ if (ELF_ST_BIND(sym->info) != STB_LOCAL
+ && sym->secidx <= SHN_HIRESERVE
+ && (sym->secidx >= SHN_LORESERVE
+- || loaded[sym->secidx])) {
++ || loaded[sym->secidx])
++ ) {
+ ElfW(Addr) ofs = nsyms * 2 * tgt_sizeof_void_p;
+
+ obj_symbol_patch(f, sec->idx, ofs, sym);
+@@ -2876,6 +2880,7 @@
+
+ nsyms++;
+ }
++ }
+ }
+
+ obj_extend_section(sec, nsyms * 2 * tgt_sizeof_char_p);
+@@ -2934,9 +2939,11 @@
+ }
+ sec = obj_find_section(f, ".data.init");
+ if (sec) {
+- if (!module->runsize ||
+- module->runsize > sec->header.sh_addr - m_addr)
++ if (!module->runsize
++ || module->runsize > sec->header.sh_addr - m_addr
++ ) {
+ module->runsize = sec->header.sh_addr - m_addr;
++ }
+ }
+ sec = obj_find_section(f, ARCHDATA_SEC_NAME);
+ if (sec && sec->header.sh_size) {
+@@ -3083,9 +3090,9 @@
+ if (i == f->header.e_shnum) {
+ struct obj_section *sec;
+
++ f->header.e_shnum++;
+ f->sections = xrealloc_vector(f->sections, 2, i);
+ f->sections[i] = sec = arch_new_section();
+- f->header.e_shnum = i + 1;
+
+ sec->header.sh_type = SHT_PROGBITS;
+ sec->header.sh_flags = SHF_WRITE | SHF_ALLOC;
+@@ -3124,12 +3131,9 @@
for (i = 0; i < f->header.e_shnum; ++i) {
struct obj_section *s = f->sections[i];
if (s->header.sh_type == SHT_NOBITS) {
@@ -69,9 +233,45 @@
s->header.sh_type = SHT_PROGBITS;
}
}
-@@ -3354,8 +3351,10 @@
+@@ -3222,8 +3226,8 @@
+ #if SHT_RELM == SHT_RELA
+ #if defined(__alpha__) && defined(AXP_BROKEN_GAS)
+ /* Work around a nasty GAS bug, that is fixed as of 2.7.0.9. */
+- if (!extsym || !extsym->st_name ||
+- ELF_ST_BIND(extsym->st_info) != STB_LOCAL)
++ if (!extsym || !extsym->st_name
++ || ELF_ST_BIND(extsym->st_info) != STB_LOCAL)
+ #endif
+ value += rel->r_addend;
+ #endif
+@@ -3329,16 +3333,17 @@
}
+ if (f->header.e_ident[EI_MAG0] != ELFMAG0
+- || f->header.e_ident[EI_MAG1] != ELFMAG1
+- || f->header.e_ident[EI_MAG2] != ELFMAG2
+- || f->header.e_ident[EI_MAG3] != ELFMAG3) {
++ || f->header.e_ident[EI_MAG1] != ELFMAG1
++ || f->header.e_ident[EI_MAG2] != ELFMAG2
++ || f->header.e_ident[EI_MAG3] != ELFMAG3
++ ) {
+ bb_error_msg_and_die("not an ELF file");
+ }
+ if (f->header.e_ident[EI_CLASS] != ELFCLASSM
+- || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN
+- ? ELFDATA2MSB : ELFDATA2LSB)
+- || f->header.e_ident[EI_VERSION] != EV_CURRENT
+- || !MATCH_MACHINE(f->header.e_machine)) {
++ || f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB)
++ || f->header.e_ident[EI_VERSION] != EV_CURRENT
++ || !MATCH_MACHINE(f->header.e_machine)
++ ) {
+ bb_error_msg_and_die("ELF file not for this architecture");
+ }
+ if (f->header.e_type != ET_REL) {
+@@ -3354,8 +3359,10 @@
+ }
+
shnum = f->header.e_shnum;
- f->sections = xmalloc(sizeof(struct obj_section *) * shnum);
- memset(f->sections, 0, sizeof(struct obj_section *) * shnum);
@@ -82,7 +282,7 @@
section_headers = alloca(sizeof(ElfW(Shdr)) * shnum);
fseek(fp, f->header.e_shoff, SEEK_SET);
-@@ -3391,14 +3390,13 @@
+@@ -3391,14 +3398,13 @@
case SHT_SYMTAB:
case SHT_STRTAB:
case SHT_RELM:
@@ -99,3 +299,35 @@
}
break;
+@@ -3860,16 +3866,20 @@
+ for (nsyms = i = 0; i < HASH_BUCKETS; ++i)
+ for (sym = f->symtab[i]; sym; sym = sym->next)
+ if (sym->secidx <= SHN_HIRESERVE
+- && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx]))
++ && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx])
++ ) {
+ ++nsyms;
++ }
+
+ all = alloca(nsyms * sizeof(struct obj_symbol *));
+
+ for (i = 0, p = all; i < HASH_BUCKETS; ++i)
+ for (sym = f->symtab[i]; sym; sym = sym->next)
+ if (sym->secidx <= SHN_HIRESERVE
+- && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx]))
++ && (sym->secidx >= SHN_LORESERVE || loaded[sym->secidx])
++ ) {
+ *p++ = sym;
++ }
+
+ /* And list them. */
+ printf("\nSymbols:\n");
+@@ -4265,7 +4275,7 @@
+ }
+ #else
+ len = MAXINT(ssize_t);
+- map = xmalloc_open_read_close(filename, &len);
++ map = xmalloc_xopen_read_close(filename, &len);
+ #endif
+
+ if (init_module(map, len, options) != 0)
Added: trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-lineedit.patch 2008-09-22 11:54:17 UTC (rev 23453)
@@ -0,0 +1,145 @@
+--- busybox-1.12.0/libbb/lineedit.c Wed Aug 20 02:48:13 2008
++++ busybox-1.12.0-lineedit/libbb/lineedit.c Mon Sep 22 00:27:18 2008
+@@ -956,24 +956,33 @@
+
+ #if MAX_HISTORY > 0
+
++static void save_command_ps_at_cur_history(void)
++{
++ if (command_ps[0] != '\0') {
++ int cur = state->cur_history;
++ free(state->history[cur]);
++ state->history[cur] = xstrdup(command_ps);
++ }
++}
++
+ /* state->flags is already checked to be nonzero */
+-static void get_previous_history(void)
++static int get_previous_history(void)
+ {
+- if (command_ps[0] != '\0' || state->history[state->cur_history] == NULL) {
+- free(state->history[state->cur_history]);
+- state->history[state->cur_history] = xstrdup(command_ps);
++ if ((state->flags & DO_HISTORY) && state->cur_history) {
++ save_command_ps_at_cur_history();
++ state->cur_history--;
++ return 1;
+ }
+- state->cur_history--;
++ beep();
++ return 0;
+ }
+
+ static int get_next_history(void)
+ {
+ if (state->flags & DO_HISTORY) {
+- int ch = state->cur_history;
+- if (ch < state->cnt_history) {
+- get_previous_history(); /* save the current history line */
+- state->cur_history = ch + 1;
+- return state->cur_history;
++ if (state->cur_history < state->cnt_history) {
++ save_command_ps_at_cur_history(); /* save the current history line */
++ return ++state->cur_history;
+ }
+ }
+ beep();
+@@ -995,6 +1004,7 @@
+ for (hi = state->cnt_history; hi > 0;) {
+ hi--;
+ free(state->history[hi]);
++ state->history[hi] = NULL;
+ }
+
+ for (hi = 0; hi < MAX_HISTORY;) {
+@@ -1006,7 +1016,7 @@
+ l = strlen(hl);
+ if (l >= MAX_LINELEN)
+ hl[MAX_LINELEN-1] = '\0';
+- if (l == 0 || hl[0] == ' ') {
++ if (l == 0) {
+ free(hl);
+ continue;
+ }
+@@ -1043,19 +1053,27 @@
+
+ if (!(state->flags & DO_HISTORY))
+ return;
+-
++ if (str[0] == '\0')
++ return;
+ i = state->cnt_history;
+- free(state->history[MAX_HISTORY]);
+- state->history[MAX_HISTORY] = NULL;
+- /* After max history, remove the oldest command */
++ /* Don't save dupes */
++ if (i && strcmp(state->history[i-1], str) == 0)
++ return;
++
++ free(state->history[MAX_HISTORY]); /* redundant, paranoia */
++ state->history[MAX_HISTORY] = NULL; /* redundant, paranoia */
++
++ /* If history[] is full, remove the oldest command */
++ /* we need to keep history[MAX_HISTORY] empty, hence >=, not > */
+ if (i >= MAX_HISTORY) {
+ free(state->history[0]);
+ for (i = 0; i < MAX_HISTORY-1; i++)
+ state->history[i] = state->history[i+1];
++ /* i == MAX_HISTORY-1 */
+ }
+-// Maybe "if (!i || strcmp(history[i-1], command) != 0) ..."
+-// (i.e. do not save dups?)
++ /* i <= MAX_HISTORY-1 */
+ state->history[i++] = xstrdup(str);
++ /* i <= MAX_HISTORY */
+ state->cur_history = i;
+ state->cnt_history = i;
+ #if ENABLE_FEATURE_EDITING_SAVEHISTORY
+@@ -1432,6 +1450,13 @@
+ }
+ }
+ #endif
++
++#if 0
++ for (ic = 0; ic <= MAX_HISTORY; ic++)
++ bb_error_msg("history[%d]:'%s'", ic, state->history[ic]);
++ bb_error_msg("cur_history:%d cnt_history:%d", state->cur_history, state->cnt_history);
++#endif
++
+ /* Print out the command prompt */
+ parse_and_put_prompt(prompt);
+
+@@ -1540,11 +1565,8 @@
+ vi_case(CTRL('P')|vbit:)
+ vi_case('k'|vbit:)
+ /* Control-p -- Get previous command from history */
+- if ((state->flags & DO_HISTORY) && state->cur_history > 0) {
+- get_previous_history();
++ if (get_previous_history())
+ goto rewrite_line;
+- }
+- beep();
+ break;
+ #endif
+
+@@ -1733,10 +1755,8 @@
+ #if MAX_HISTORY > 0
+ case 'A':
+ /* Up Arrow -- Get previous command from history */
+- if ((state->flags & DO_HISTORY) && state->cur_history > 0) {
+- get_previous_history();
++ if (get_previous_history())
+ goto rewrite_line;
+- }
+ beep();
+ break;
+ case 'B':
+@@ -1746,7 +1766,7 @@
+ rewrite_line:
+ /* Rewrite the line with the selected history item */
+ /* change command */
+- command_len = strlen(strcpy(command, state->history[state->cur_history]));
++ command_len = strlen(strcpy(command, state->history[state->cur_history] ? : ""));
+ /* redraw and go to eol (bol, in vi */
+ redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
+ break;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-09-10 1:32 ` Hamish Moffatt
@ 2008-09-10 6:57 ` Peter Korsgaard
0 siblings, 0 replies; 161+ messages in thread
From: Peter Korsgaard @ 2008-09-10 6:57 UTC (permalink / raw)
To: buildroot
>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
Hi,
Hamish> Actually that was deliberate. I noticed that after I changed
Hamish> package/busybox/Config.in, I still had
Hamish> BR2_BUSYBOX_VERSION_1_11_X=y
Hamish> BR2_BUSYBOX_VERSION="1.11.1"
Hamish> until next time I ran a menuconfig/oldconfig/etc. If the patches are
Hamish> removed immediately upon version bump but you don't update your config,
Hamish> you'll be building without those patches. :(
Hamish> I wonder if BR2_BUSYBOX_VERSION should be determined by the Makefiles
Hamish> rather than through the config system, so that this can't happen?
Notice that this isn't a busybox specific issue - It's everywhere we
have a version selection. Maybe it could be done in the makefile, but
I do find it quite handy to have it all in the Config.in.
Maybe the solution is simply to teach people to run make oldconfig
whenever they rebase?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-09-09 8:50 jacmet at uclibc.org
@ 2008-09-10 1:32 ` Hamish Moffatt
2008-09-10 6:57 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: Hamish Moffatt @ 2008-09-10 1:32 UTC (permalink / raw)
To: buildroot
On Tue, Sep 09, 2008 at 01:50:15AM -0700, jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2008-09-09 01:50:15 -0700 (Tue, 09 Sep 2008)
> New Revision: 23361
>
> Log:
> busybox: remove stale busybox 1.11.1 patches
>
> Hamish, don't forget to remove those when you bump the version
>
> Removed:
> trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch
> trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch
> trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch
> trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
Hi Peter,
Actually that was deliberate. I noticed that after I changed
package/busybox/Config.in, I still had
BR2_BUSYBOX_VERSION_1_11_X=y
BR2_BUSYBOX_VERSION="1.11.1"
until next time I ran a menuconfig/oldconfig/etc. If the patches are
removed immediately upon version bump but you don't update your config,
you'll be building without those patches. :(
I wonder if BR2_BUSYBOX_VERSION should be determined by the Makefiles
rather than through the config system, so that this can't happen?
Regards,
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-09-09 8:50 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-09-09 8:50 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-09 01:50:18 -0700 (Tue, 09 Sep 2008)
New Revision: 23362
Log:
busybox: 1.11.2 patch
Added:
trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.2-kbdmode.patch 2008-09-09 08:50:18 UTC (rev 23362)
@@ -0,0 +1,21 @@
+--- busybox-1.11.2/console-tools/kbd_mode.c Thu Aug 21 21:40:12 2008
++++ busybox-1.11.2-kbdmode/console-tools/kbd_mode.c Wed Sep 3 23:52:26 2008
+@@ -2,7 +2,7 @@
+ /*
+ * Mini kbd_mode implementation for busybox
+ *
+- * Copyright (C) 2007 Lo?c Greni? <loic.grenie@gmail.com>
++ * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com>
+ * written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from
+ * console-utils v0.2.3, licensed under GNU GPLv2
+ *
+@@ -46,7 +46,8 @@
+ printf("The keyboard is in %s mode\n", mode);
+ } else {
+ opt = opt & UNICODE ? 3 : opt >> 1;
+- xioctl(fd, KDSKBMODE, opt);
++ /* double cast prevents warnings about widening conversion */
++ xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt);
+ }
+
+ if (ENABLE_FEATURE_CLEAN_UP)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-09-09 8:50 jacmet at uclibc.org
2008-09-10 1:32 ` Hamish Moffatt
0 siblings, 1 reply; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-09-09 8:50 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-09 01:50:15 -0700 (Tue, 09 Sep 2008)
New Revision: 23361
Log:
busybox: remove stale busybox 1.11.1 patches
Hamish, don't forget to remove those when you bump the version
Removed:
trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch
trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch
trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch
trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
Changeset:
Deleted: trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch 2008-09-09 02:06:52 UTC (rev 23360)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch 2008-09-09 08:50:15 UTC (rev 23361)
@@ -1,155 +0,0 @@
---- busybox-1.11.1/shell/ash.c Wed Jun 25 14:51:23 2008
-+++ busybox-1.11.1-ash/shell/ash.c Wed Aug 6 00:47:45 2008
-@@ -1569,14 +1569,14 @@
- static char *optptr; /* used by nextopt */
-
- /*
-- * XXX - should get rid of. have all builtins use getopt(3). the
-- * library getopt must have the BSD extension static variable "optreset"
-- * otherwise it can't be used within the shell safely.
-+ * XXX - should get rid of. Have all builtins use getopt(3).
-+ * The library getopt must have the BSD extension static variable
-+ * "optreset", otherwise it can't be used within the shell safely.
- *
-- * Standard option processing (a la getopt) for builtin routines. The
-- * only argument that is passed to nextopt is the option string; the
-- * other arguments are unnecessary. It return the character, or '\0' on
-- * end of input.
-+ * Standard option processing (a la getopt) for builtin routines.
-+ * The only argument that is passed to nextopt is the option string;
-+ * the other arguments are unnecessary. It returns the character,
-+ * or '\0' on end of input.
- */
- static int
- nextopt(const char *optstring)
-@@ -1587,13 +1587,20 @@
-
- p = optptr;
- if (p == NULL || *p == '\0') {
-+ /* We ate entire "-param", take next one */
- p = *argptr;
-- if (p == NULL || *p != '-' || *++p == '\0')
-+ if (p == NULL)
- return '\0';
-+ if (*p != '-')
-+ return '\0';
-+ if (*++p == '\0') /* just "-" ? */
-+ return '\0';
- argptr++;
-- if (LONE_DASH(p)) /* check for "--" */
-+ if (LONE_DASH(p)) /* "--" ? */
- return '\0';
-+ /* p => next "-param" */
- }
-+ /* p => some option char in the middle of a "-param" */
- c = *p++;
- for (q = optstring; *q != c;) {
- if (*q == '\0')
-@@ -1602,8 +1609,11 @@
- q++;
- }
- if (*++q == ':') {
-- if (*p == '\0' && (p = *argptr++) == NULL)
-- ash_msg_and_raise_error("no arg for -%c option", c);
-+ if (*p == '\0') {
-+ p = *argptr++;
-+ if (p == NULL)
-+ ash_msg_and_raise_error("no arg for -%c option", c);
-+ }
- optionarg = p;
- p = NULL;
- }
-@@ -7428,8 +7438,10 @@
- else if (c != 'p')
- abort();
- #endif
-- if (verify)
-+ /* Mimic bash: just "command -v" doesn't complain, it's a nop */
-+ if (verify && (*argptr != NULL)) {
- return describe_command(*argptr, verify - VERIFY_BRIEF);
-+ }
-
- return 0;
- }
-@@ -7788,16 +7800,33 @@
- static void
- evaltree(union node *n, int flags)
- {
-+
-+ struct jmploc *volatile savehandler = exception_handler;
-+ struct jmploc jmploc;
- int checkexit = 0;
- void (*evalfn)(union node *, int);
-- unsigned isor;
- int status;
-+
- if (n == NULL) {
- TRACE(("evaltree(NULL) called\n"));
-- goto out;
-+ goto out1;
- }
- TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
- getpid(), n, n->type, flags));
-+
-+ exception_handler = &jmploc;
-+ {
-+ int err = setjmp(jmploc.loc);
-+ if (err) {
-+ /* if it was a signal, check for trap handlers */
-+ if (exception == EXSIG)
-+ goto out;
-+ /* continue on the way out */
-+ exception_handler = savehandler;
-+ longjmp(exception_handler->loc, err);
-+ }
-+ }
-+
- switch (n->type) {
- default:
- #if DEBUG
-@@ -7843,19 +7872,20 @@
- goto calleval;
- case NAND:
- case NOR:
-- case NSEMI:
-+ case NSEMI: {
-+
- #if NAND + 1 != NOR
- #error NAND + 1 != NOR
- #endif
- #if NOR + 1 != NSEMI
- #error NOR + 1 != NSEMI
- #endif
-- isor = n->type - NAND;
-+ unsigned is_or = n->type - NAND;
- evaltree(
- n->nbinary.ch1,
-- (flags | ((isor >> 1) - 1)) & EV_TESTED
-+ (flags | ((is_or >> 1) - 1)) & EV_TESTED
- );
-- if (!exitstatus == isor)
-+ if (!exitstatus == is_or)
- break;
- if (!evalskip) {
- n = n->nbinary.ch2;
-@@ -7866,6 +7896,7 @@
- break;
- }
- break;
-+ }
- case NIF:
- evaltree(n->nif.test, EV_TESTED);
- if (evalskip)
-@@ -7886,8 +7917,11 @@
- exitstatus = status;
- break;
- }
-+
- out:
-- if ((checkexit & exitstatus))
-+ exception_handler = savehandler;
-+ out1:
-+ if (checkexit & exitstatus)
- evalskip |= SKIPEVAL;
- else if (pendingsig && dotrap())
- goto exexit;
Deleted: trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch 2008-09-09 02:06:52 UTC (rev 23360)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch 2008-09-09 08:50:15 UTC (rev 23361)
@@ -1,9 +0,0 @@
---- busybox-1.11.1/coreutils/basename.c Wed Jun 25 14:51:23 2008
-+++ busybox-1.11.1-basename/coreutils/basename.c Thu Jul 17 20:04:36 2008
-@@ -48,5 +48,5 @@
-
- /* puts(s) will do, but we can do without stdio this way: */
- s[m++] = '\n';
-- return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;
-+ return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch 2008-09-09 02:06:52 UTC (rev 23360)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch 2008-09-09 08:50:15 UTC (rev 23361)
@@ -1,12 +0,0 @@
---- busybox-1.11.1/modutils/insmod.c Wed Jun 25 14:51:18 2008
-+++ busybox-1.11.1-modutils/modutils/insmod.c Wed Jul 23 00:46:08 2008
-@@ -840,7 +840,8 @@
- ElfW(RelM) *rel, ElfW(Addr) v)
- {
- #if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
-- || defined(__sh__) || defined(__s390__) || defined(__x86_64__)
-+ || defined(__sh__) || defined(__s390__) || defined(__x86_64__) \
-+ || defined(__powerpc__) || defined(__mips__)
- struct arch_file *ifile = (struct arch_file *) f;
- #endif
- enum obj_reloc ret = obj_reloc_ok;
Deleted: trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch 2008-09-09 02:06:52 UTC (rev 23360)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch 2008-09-09 08:50:15 UTC (rev 23361)
@@ -1,55 +0,0 @@
---- busybox-1.11.1/archival/libunarchive/get_header_tar.c Wed Jun 25 14:51:17 2008
-+++ busybox-1.11.1-tar/archival/libunarchive/get_header_tar.c Wed Jul 23 02:16:24 2008
-@@ -261,26 +261,33 @@
- case '0':
- #if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
- if (last_char_is(file_header->name, '/')) {
-- file_header->mode |= S_IFDIR;
-- } else
-+ goto set_dir;
-+ }
- #endif
- file_header->mode |= S_IFREG;
- break;
- case '2':
- file_header->mode |= S_IFLNK;
-+ /* have seen tarballs with size field containing
-+ * the size of the link target's name */
-+ size0:
-+ file_header->size = 0;
- break;
- case '3':
- file_header->mode |= S_IFCHR;
-- break;
-+ goto size0; /* paranoia */
- case '4':
- file_header->mode |= S_IFBLK;
-- break;
-+ goto size0;
- case '5':
-+#if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
-+ set_dir:
-+#endif
- file_header->mode |= S_IFDIR;
-- break;
-+ goto size0;
- case '6':
- file_header->mode |= S_IFIFO;
-- break;
-+ goto size0;
- #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
- case 'L':
- /* free: paranoia: tar with several consecutive longnames */
---- busybox-1.11.1/archival/libunarchive/seek_by_jump.c Wed Jun 25 14:51:17 2008
-+++ busybox-1.11.1-tar/archival/libunarchive/seek_by_jump.c Sun Jul 20 19:11:45 2008
-@@ -8,7 +8,9 @@
-
- void seek_by_jump(const archive_handle_t *archive_handle, unsigned amount)
- {
-- if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {
-+ if (amount
-+ && lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1
-+ ) {
- if (errno == ESPIPE)
- seek_by_read(archive_handle, amount);
- else
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-31 21:45 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-08-31 21:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-31 14:45:03 -0700 (Sun, 31 Aug 2008)
New Revision: 23289
Log:
busybox: additional 1.12.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch
trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-awk.patch 2008-08-31 21:45:03 UTC (rev 23289)
@@ -0,0 +1,53 @@
+--- busybox-1.12.0/editors/awk.c Wed Aug 6 00:56:11 2008
++++ busybox-1.12.0-awk/editors/awk.c Fri Aug 29 01:17:05 2008
+@@ -973,7 +973,12 @@
+
+ } else if (*p == '.' || isdigit(*p)) {
+ /* it's a number */
+- t_double = strtod(p, &p);
++#if ENABLE_DESKTOP
++ if (p[0] == '0' && (p[1] | 0x20) == 'x')
++ t_double = strtoll(p, &p, 0);
++ else
++#endif
++ t_double = strtod(p, &p);
+ if (*p == '.')
+ syntax_error(EMSG_UNEXP_TOKEN);
+ tc = TC_NUMBER;
+@@ -2034,28 +2039,30 @@
+ setvar_p(res, s);
+ break;
+
++ /* Bitwise ops must assume that operands are unsigned. GNU Awk 3.1.5:
++ * awk '{ print or(-1,1) }' gives "4.29497e+09", not "-2.xxxe+09" */
+ case B_an:
+- setvar_i(res, (long)getvar_i(av[0]) & (long)getvar_i(av[1]));
++ setvar_i(res, (unsigned long)getvar_i(av[0]) & (unsigned long)getvar_i(av[1]));
+ break;
+
+ case B_co:
+- setvar_i(res, ~(long)getvar_i(av[0]));
++ setvar_i(res, ~(unsigned long)getvar_i(av[0]));
+ break;
+
+ case B_ls:
+- setvar_i(res, (long)getvar_i(av[0]) << (long)getvar_i(av[1]));
++ setvar_i(res, (unsigned long)getvar_i(av[0]) << (unsigned long)getvar_i(av[1]));
+ break;
+
+ case B_or:
+- setvar_i(res, (long)getvar_i(av[0]) | (long)getvar_i(av[1]));
++ setvar_i(res, (unsigned long)getvar_i(av[0]) | (unsigned long)getvar_i(av[1]));
+ break;
+
+ case B_rs:
+- setvar_i(res, (long)((unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1])));
++ setvar_i(res, (unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1]));
+ break;
+
+ case B_xo:
+- setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1]));
++ setvar_i(res, (unsigned long)getvar_i(av[0]) ^ (unsigned long)getvar_i(av[1]));
+ break;
+
+ case B_lo:
Added: trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-insmod.patch 2008-08-31 21:45:03 UTC (rev 23289)
@@ -0,0 +1,101 @@
+--- busybox-1.12.0/modutils/insmod.c Wed Aug 6 00:56:02 2008
++++ busybox-1.12.0-insmod/modutils/insmod.c Thu Aug 28 23:38:35 2008
+@@ -2212,7 +2212,7 @@
+ sec->name = name;
+ sec->idx = newidx;
+ if (size)
+- sec->contents = xmalloc(size);
++ sec->contents = xzalloc(size);
+
+ obj_insert_section_load_order(f, sec);
+
+@@ -2227,7 +2227,7 @@
+ int newidx = f->header.e_shnum++;
+ struct obj_section *sec;
+
+- f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
++ f->sections = xrealloc_vector(f->sections, 2, newidx);
+ f->sections[newidx] = sec = arch_new_section();
+
+ sec->header.sh_type = SHT_PROGBITS;
+@@ -2237,7 +2237,7 @@
+ sec->name = name;
+ sec->idx = newidx;
+ if (size)
+- sec->contents = xmalloc(size);
++ sec->contents = xzalloc(size);
+
+ sec->load_next = f->load_order;
+ f->load_order = sec;
+@@ -2689,8 +2689,7 @@
+ /* Collect the modules' symbols. */
+
+ if (nmod) {
+- ext_modules = modules = xmalloc(nmod * sizeof(*modules));
+- memset(modules, 0, nmod * sizeof(*modules));
++ ext_modules = modules = xzalloc(nmod * sizeof(*modules));
+ for (i = 0, mn = module_names, m = modules;
+ i < nmod; ++i, ++m, mn += strlen(mn) + 1) {
+ struct new_module_info info;
+@@ -2770,13 +2769,14 @@
+ }
+
+
+-static void new_create_this_module(struct obj_file *f, const char *m_name)
++static void new_create_this_module(struct obj_file *f, const char *m_name)
+ {
+ struct obj_section *sec;
+
+ sec = obj_create_alloced_section_first(f, ".this", tgt_sizeof_long,
+ sizeof(struct new_module));
+- memset(sec->contents, 0, sizeof(struct new_module));
++ /* done by obj_create_alloced_section_first: */
++ /*memset(sec->contents, 0, sizeof(struct new_module));*/
+
+ obj_add_symbol(f, SPFX "__this_module", -1,
+ ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0,
+@@ -3124,12 +3124,9 @@
+ for (i = 0; i < f->header.e_shnum; ++i) {
+ struct obj_section *s = f->sections[i];
+ if (s->header.sh_type == SHT_NOBITS) {
++ s->contents = NULL;
+ if (s->header.sh_size != 0)
+- s->contents = memset(xmalloc(s->header.sh_size),
+- 0, s->header.sh_size);
+- else
+- s->contents = NULL;
+-
++ s->contents = xzalloc(s->header.sh_size),
+ s->header.sh_type = SHT_PROGBITS;
+ }
+ }
+@@ -3354,8 +3351,10 @@
+ }
+
+ shnum = f->header.e_shnum;
+- f->sections = xmalloc(sizeof(struct obj_section *) * shnum);
+- memset(f->sections, 0, sizeof(struct obj_section *) * shnum);
++ /* Growth of ->sections vector will be done by
++ * xrealloc_vector(..., 2, ...), therefore we must allocate
++ * at least 2^2 = 4 extra elements here. */
++ f->sections = xzalloc(sizeof(f->sections[0]) * (shnum + 4));
+
+ section_headers = alloca(sizeof(ElfW(Shdr)) * shnum);
+ fseek(fp, f->header.e_shoff, SEEK_SET);
+@@ -3391,14 +3390,13 @@
+ case SHT_SYMTAB:
+ case SHT_STRTAB:
+ case SHT_RELM:
++ sec->contents = NULL;
+ if (sec->header.sh_size > 0) {
+- sec->contents = xmalloc(sec->header.sh_size);
++ sec->contents = xzalloc(sec->header.sh_size);
+ fseek(fp, sec->header.sh_offset, SEEK_SET);
+ if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
+ bb_perror_msg_and_die("error reading ELF section data");
+ }
+- } else {
+- sec->contents = NULL;
+ }
+ break;
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-28 4:57 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-08-28 4:57 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-27 21:57:27 -0700 (Wed, 27 Aug 2008)
New Revision: 23272
Log:
busybox: udhcpc patch for 1.12.0
Added:
trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.12.0-dhcp.patch 2008-08-28 04:57:27 UTC (rev 23272)
@@ -0,0 +1,15 @@
+--- busybox-1.12.0/networking/udhcp/dhcpc.c Wed Aug 6 00:55:58 2008
++++ busybox-1.12.0-dhcp/networking/udhcp/dhcpc.c Thu Aug 28 00:05:23 2008
+@@ -259,9 +259,10 @@
+ if (opt & OPT_o)
+ client_config.no_default_options = 1;
+ while (list_O) {
+- int n = index_in_strings(dhcp_option_strings, llist_pop(&list_O));
++ char *optstr = llist_pop(&list_O);
++ int n = index_in_strings(dhcp_option_strings, optstr);
+ if (n < 0)
+- bb_error_msg_and_die("unknown option '%s'", list_O->data);
++ bb_error_msg_and_die("unknown option '%s'", optstr);
+ n = dhcp_options[n].code;
+ client_config.opt_mask[n >> 3] |= 1 << (n & 7);
+ }
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-26 1:05 hamish at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: hamish at uclibc.org @ 2008-08-26 1:05 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-08-25 18:05:51 -0700 (Mon, 25 Aug 2008)
New Revision: 23202
Log:
Bump 1.11.x version to 1.11.2 (no patches yet)
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-08-26 00:41:29 UTC (rev 23201)
+++ trunk/buildroot/package/busybox/Config.in 2008-08-26 01:05:51 UTC (rev 23202)
@@ -59,7 +59,7 @@
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
- default "1.11.1" if BR2_BUSYBOX_VERSION_1_11_X
+ default "1.11.2" if BR2_BUSYBOX_VERSION_1_11_X
default "1.12.0" if BR2_BUSYBOX_VERSION_1_12_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-21 5:08 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-08-21 5:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-20 22:08:53 -0700 (Wed, 20 Aug 2008)
New Revision: 23130
Log:
busybox: add 1.12.x and make it default
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-08-20 23:30:42 UTC (rev 23129)
+++ trunk/buildroot/package/busybox/Config.in 2008-08-21 05:08:53 UTC (rev 23130)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends on BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_11_X
+ default BR2_BUSYBOX_VERSION_1_12_X
help
Select the version of BusyBox you wish to use.
@@ -43,6 +43,9 @@
config BR2_BUSYBOX_VERSION_1_11_X
bool "BusyBox 1.11.x"
+ config BR2_BUSYBOX_VERSION_1_12_X
+ bool "BusyBox 1.12.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -57,6 +60,7 @@
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
default "1.11.1" if BR2_BUSYBOX_VERSION_1_11_X
+ default "1.12.0" if BR2_BUSYBOX_VERSION_1_12_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
@@ -82,6 +86,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_9_X
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X
+ default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-06 12:56 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-08-06 12:56 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-06 05:56:31 -0700 (Wed, 06 Aug 2008)
New Revision: 23065
Log:
busybox: fix missing dependencies in unpacked and config rules
Aadds dependency to host-sed and $(PROJECT_BUILD_DIR) when running
make busybox-config and busybox-unpacked.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2008-08-06 10:04:22 UTC (rev 23064)
+++ trunk/buildroot/package/busybox/busybox.mk 2008-08-06 12:56:31 UTC (rev 23065)
@@ -127,9 +127,9 @@
busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)
-busybox-unpacked: $(BUSYBOX_DIR)/.unpacked
+busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
-busybox-config: $(BUSYBOX_DIR)/.configured
+busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.configured
busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-06 6:37 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-08-06 6:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-05 23:37:21 -0700 (Tue, 05 Aug 2008)
New Revision: 23059
Log:
busybox: additional 1.11.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch
Modified:
trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-ash.patch 2008-08-06 06:37:21 UTC (rev 23059)
@@ -0,0 +1,155 @@
+--- busybox-1.11.1/shell/ash.c Wed Jun 25 14:51:23 2008
++++ busybox-1.11.1-ash/shell/ash.c Wed Aug 6 00:47:45 2008
+@@ -1569,14 +1569,14 @@
+ static char *optptr; /* used by nextopt */
+
+ /*
+- * XXX - should get rid of. have all builtins use getopt(3). the
+- * library getopt must have the BSD extension static variable "optreset"
+- * otherwise it can't be used within the shell safely.
++ * XXX - should get rid of. Have all builtins use getopt(3).
++ * The library getopt must have the BSD extension static variable
++ * "optreset", otherwise it can't be used within the shell safely.
+ *
+- * Standard option processing (a la getopt) for builtin routines. The
+- * only argument that is passed to nextopt is the option string; the
+- * other arguments are unnecessary. It return the character, or '\0' on
+- * end of input.
++ * Standard option processing (a la getopt) for builtin routines.
++ * The only argument that is passed to nextopt is the option string;
++ * the other arguments are unnecessary. It returns the character,
++ * or '\0' on end of input.
+ */
+ static int
+ nextopt(const char *optstring)
+@@ -1587,13 +1587,20 @@
+
+ p = optptr;
+ if (p == NULL || *p == '\0') {
++ /* We ate entire "-param", take next one */
+ p = *argptr;
+- if (p == NULL || *p != '-' || *++p == '\0')
++ if (p == NULL)
+ return '\0';
++ if (*p != '-')
++ return '\0';
++ if (*++p == '\0') /* just "-" ? */
++ return '\0';
+ argptr++;
+- if (LONE_DASH(p)) /* check for "--" */
++ if (LONE_DASH(p)) /* "--" ? */
+ return '\0';
++ /* p => next "-param" */
+ }
++ /* p => some option char in the middle of a "-param" */
+ c = *p++;
+ for (q = optstring; *q != c;) {
+ if (*q == '\0')
+@@ -1602,8 +1609,11 @@
+ q++;
+ }
+ if (*++q == ':') {
+- if (*p == '\0' && (p = *argptr++) == NULL)
+- ash_msg_and_raise_error("no arg for -%c option", c);
++ if (*p == '\0') {
++ p = *argptr++;
++ if (p == NULL)
++ ash_msg_and_raise_error("no arg for -%c option", c);
++ }
+ optionarg = p;
+ p = NULL;
+ }
+@@ -7428,8 +7438,10 @@
+ else if (c != 'p')
+ abort();
+ #endif
+- if (verify)
++ /* Mimic bash: just "command -v" doesn't complain, it's a nop */
++ if (verify && (*argptr != NULL)) {
+ return describe_command(*argptr, verify - VERIFY_BRIEF);
++ }
+
+ return 0;
+ }
+@@ -7788,16 +7800,33 @@
+ static void
+ evaltree(union node *n, int flags)
+ {
++
++ struct jmploc *volatile savehandler = exception_handler;
++ struct jmploc jmploc;
+ int checkexit = 0;
+ void (*evalfn)(union node *, int);
+- unsigned isor;
+ int status;
++
+ if (n == NULL) {
+ TRACE(("evaltree(NULL) called\n"));
+- goto out;
++ goto out1;
+ }
+ TRACE(("pid %d, evaltree(%p: %d, %d) called\n",
+ getpid(), n, n->type, flags));
++
++ exception_handler = &jmploc;
++ {
++ int err = setjmp(jmploc.loc);
++ if (err) {
++ /* if it was a signal, check for trap handlers */
++ if (exception == EXSIG)
++ goto out;
++ /* continue on the way out */
++ exception_handler = savehandler;
++ longjmp(exception_handler->loc, err);
++ }
++ }
++
+ switch (n->type) {
+ default:
+ #if DEBUG
+@@ -7843,19 +7872,20 @@
+ goto calleval;
+ case NAND:
+ case NOR:
+- case NSEMI:
++ case NSEMI: {
++
+ #if NAND + 1 != NOR
+ #error NAND + 1 != NOR
+ #endif
+ #if NOR + 1 != NSEMI
+ #error NOR + 1 != NSEMI
+ #endif
+- isor = n->type - NAND;
++ unsigned is_or = n->type - NAND;
+ evaltree(
+ n->nbinary.ch1,
+- (flags | ((isor >> 1) - 1)) & EV_TESTED
++ (flags | ((is_or >> 1) - 1)) & EV_TESTED
+ );
+- if (!exitstatus == isor)
++ if (!exitstatus == is_or)
+ break;
+ if (!evalskip) {
+ n = n->nbinary.ch2;
+@@ -7866,6 +7896,7 @@
+ break;
+ }
+ break;
++ }
+ case NIF:
+ evaltree(n->nif.test, EV_TESTED);
+ if (evalskip)
+@@ -7886,8 +7917,11 @@
+ exitstatus = status;
+ break;
+ }
++
+ out:
+- if ((checkexit & exitstatus))
++ exception_handler = savehandler;
++ out1:
++ if (checkexit & exitstatus)
+ evalskip |= SKIPEVAL;
+ else if (pendingsig && dotrap())
+ goto exexit;
Modified: trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch 2008-08-06 00:51:43 UTC (rev 23058)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch 2008-08-06 06:37:21 UTC (rev 23059)
@@ -1,6 +1,6 @@
--- busybox-1.11.1/archival/libunarchive/get_header_tar.c Wed Jun 25 14:51:17 2008
-+++ busybox-1.11.1-tar/archival/libunarchive/get_header_tar.c Sun Jul 20 19:11:45 2008
-@@ -261,26 +261,31 @@
++++ busybox-1.11.1-tar/archival/libunarchive/get_header_tar.c Wed Jul 23 02:16:24 2008
+@@ -261,26 +261,33 @@
case '0':
#if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
if (last_char_is(file_header->name, '/')) {
@@ -27,7 +27,9 @@
- break;
+ goto size0;
case '5':
++#if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
+ set_dir:
++#endif
file_header->mode |= S_IFDIR;
- break;
+ goto size0;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-08-04 19:06 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:06 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:06:19 -0700 (Mon, 04 Aug 2008)
New Revision: 23015
Log:
busybox: default HIDE_OTHERS to y for all versions
There's no particular reason to only enable BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
by default for the snapshot version.
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-08-04 19:06:10 UTC (rev 23014)
+++ trunk/buildroot/package/busybox/Config.in 2008-08-04 19:06:19 UTC (rev 23015)
@@ -91,7 +91,7 @@
config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
bool "Hide applications that are provided by busybox"
depends on BR2_PACKAGE_BUSYBOX
- default y if BR2_PACKAGE_BUSYBOX_SNAPSHOT
+ default y
help
Do not show packages in menuconfig that are potentially provided
by busybox.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-07-23 6:01 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-07-23 6:01 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-22 23:01:50 -0700 (Tue, 22 Jul 2008)
New Revision: 22925
Log:
busybox: additional 1.11.1 fix
Added:
trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-modutils.patch 2008-07-23 06:01:50 UTC (rev 22925)
@@ -0,0 +1,12 @@
+--- busybox-1.11.1/modutils/insmod.c Wed Jun 25 14:51:18 2008
++++ busybox-1.11.1-modutils/modutils/insmod.c Wed Jul 23 00:46:08 2008
+@@ -840,7 +840,8 @@
+ ElfW(RelM) *rel, ElfW(Addr) v)
+ {
+ #if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
+- || defined(__sh__) || defined(__s390__) || defined(__x86_64__)
++ || defined(__sh__) || defined(__s390__) || defined(__x86_64__) \
++ || defined(__powerpc__) || defined(__mips__)
+ struct arch_file *ifile = (struct arch_file *) f;
+ #endif
+ enum obj_reloc ret = obj_reloc_ok;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-07-22 11:19 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-07-22 11:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-22 04:19:07 -0700 (Tue, 22 Jul 2008)
New Revision: 22911
Log:
busybox: 1.11.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch
trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-basename.patch 2008-07-22 11:19:07 UTC (rev 22911)
@@ -0,0 +1,9 @@
+--- busybox-1.11.1/coreutils/basename.c Wed Jun 25 14:51:23 2008
++++ busybox-1.11.1-basename/coreutils/basename.c Thu Jul 17 20:04:36 2008
+@@ -48,5 +48,5 @@
+
+ /* puts(s) will do, but we can do without stdio this way: */
+ s[m++] = '\n';
+- return full_write(STDOUT_FILENO, s, m) == (ssize_t)m;
++ return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
+ }
Added: trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.1-tar.patch 2008-07-22 11:19:07 UTC (rev 22911)
@@ -0,0 +1,53 @@
+--- busybox-1.11.1/archival/libunarchive/get_header_tar.c Wed Jun 25 14:51:17 2008
++++ busybox-1.11.1-tar/archival/libunarchive/get_header_tar.c Sun Jul 20 19:11:45 2008
+@@ -261,26 +261,31 @@
+ case '0':
+ #if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
+ if (last_char_is(file_header->name, '/')) {
+- file_header->mode |= S_IFDIR;
+- } else
++ goto set_dir;
++ }
+ #endif
+ file_header->mode |= S_IFREG;
+ break;
+ case '2':
+ file_header->mode |= S_IFLNK;
++ /* have seen tarballs with size field containing
++ * the size of the link target's name */
++ size0:
++ file_header->size = 0;
+ break;
+ case '3':
+ file_header->mode |= S_IFCHR;
+- break;
++ goto size0; /* paranoia */
+ case '4':
+ file_header->mode |= S_IFBLK;
+- break;
++ goto size0;
+ case '5':
++ set_dir:
+ file_header->mode |= S_IFDIR;
+- break;
++ goto size0;
+ case '6':
+ file_header->mode |= S_IFIFO;
+- break;
++ goto size0;
+ #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+ case 'L':
+ /* free: paranoia: tar with several consecutive longnames */
+--- busybox-1.11.1/archival/libunarchive/seek_by_jump.c Wed Jun 25 14:51:17 2008
++++ busybox-1.11.1-tar/archival/libunarchive/seek_by_jump.c Sun Jul 20 19:11:45 2008
+@@ -8,7 +8,9 @@
+
+ void seek_by_jump(const archive_handle_t *archive_handle, unsigned amount)
+ {
+- if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {
++ if (amount
++ && lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1
++ ) {
+ if (errno == ESPIPE)
+ seek_by_read(archive_handle, amount);
+ else
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-07-11 22:19 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-07-11 22:19 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-11 15:19:21 -0700 (Fri, 11 Jul 2008)
New Revision: 22803
Log:
busybox: bump 1.11.x version
Removed:
trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch
trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch
trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch
trunk/buildroot/package/busybox/busybox-1.11.0-man.patch
trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch
trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch
trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/Config.in 2008-07-11 22:19:21 UTC (rev 22803)
@@ -56,7 +56,7 @@
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
- default "1.11.0" if BR2_BUSYBOX_VERSION_1_11_X
+ default "1.11.1" if BR2_BUSYBOX_VERSION_1_11_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,88 +0,0 @@
---- busybox-1.11.0/editors/awk.c Wed Jun 25 14:51:37 2008
-+++ busybox-1.11.0-awk/editors/awk.c Tue Jul 1 14:03:37 2008
-@@ -681,11 +681,6 @@
- return (isalnum(c) || c == '_');
- }
-
--static FILE *afopen(const char *path, const char *mode)
--{
-- return (*path == '-' && *(path+1) == '\0') ? stdin : xfopen(path, mode);
--}
--
- /* -------- working with variables (set/get/copy/etc) -------- */
-
- static xhash *iamarray(var *v)
-@@ -2740,7 +2735,7 @@
- ind = getvar_s(incvar(intvar[ARGIND]));
- fname = getvar_s(findvar(iamarray(intvar[ARGV]), ind));
- if (fname && *fname && !is_assignment(fname))
-- F = afopen(fname, "r");
-+ F = xfopen_stdin(fname);
- }
- } while (!F);
-
-@@ -2757,8 +2752,9 @@
- {
- unsigned opt;
- char *opt_F, *opt_W;
-- llist_t *opt_v = NULL;
-- int i, j, flen;
-+ llist_t *list_v = NULL;
-+ llist_t *list_f = NULL;
-+ int i, j;
- var *v;
- var tv;
- char **envp;
-@@ -2816,35 +2812,33 @@
- *s1 = '=';
- }
- }
-- opt_complementary = "v::";
-- opt = getopt32(argv, "F:v:f:W:", &opt_F, &opt_v, &g_progname, &opt_W);
-+ opt_complementary = "v::f::"; /* -v and -f can occur multiple times */
-+ opt = getopt32(argv, "F:v:f:W:", &opt_F, &list_v, &list_f, &opt_W);
- argv += optind;
- argc -= optind;
- if (opt & 0x1)
- setvar_s(intvar[FS], opt_F); // -F
-- while (opt_v) { /* -v */
-- if (!is_assignment(llist_pop(&opt_v)))
-+ while (list_v) { /* -v */
-+ if (!is_assignment(llist_pop(&list_v)))
- bb_show_usage();
- }
-- if (opt & 0x4) { // -f
-- char *s = s; /* die, gcc, die */
-- FILE *from_file = afopen(g_progname, "r");
-- /* one byte is reserved for some trick in next_token */
-- if (fseek(from_file, 0, SEEK_END) == 0) {
-- flen = ftell(from_file);
-- s = xmalloc(flen + 4);
-- fseek(from_file, 0, SEEK_SET);
-- i = 1 + fread(s + 1, 1, flen, from_file);
-- } else {
-+ if (list_f) { /* -f */
-+ do {
-+ char *s = NULL;
-+ FILE *from_file;
-+
-+ g_progname = llist_pop(&list_f);
-+ from_file = xfopen_stdin(g_progname);
-+ /* one byte is reserved for some trick in next_token */
- for (i = j = 1; j > 0; i += j) {
- s = xrealloc(s, i + 4096);
- j = fread(s + i, 1, 4094, from_file);
- }
-- }
-- s[i] = '\0';
-- fclose(from_file);
-- parse_program(s + 1);
-- free(s);
-+ s[i] = '\0';
-+ fclose(from_file);
-+ parse_program(s + 1);
-+ free(s);
-+ } while (list_f);
- } else { // no -f: take program from 1st parameter
- if (!argc)
- bb_show_usage();
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,503 +0,0 @@
---- busybox-1.11.0/archival/libunarchive/decompress_bunzip2.c Wed Jun 25 14:51:26 2008
-+++ busybox-1.11.0-bunzip2/archival/libunarchive/decompress_bunzip2.c Sat Jun 28 20:04:31 2008
-@@ -66,7 +66,6 @@
- * | grep 'bd->' | sed 's/^.*bd->/bd->/' | sort | $PAGER
- * and moved it (inbufBitCount) to offset 0.
- */
--
- struct bunzip_data {
- /* I/O tracking data (file handles, buffers, positions, etc.) */
- unsigned inbufBitCount, inbufBits;
-@@ -102,11 +101,9 @@
-
- /* If we need to get more data from the byte buffer, do so. (Loop getting
- one byte at a time to enforce endianness and avoid unaligned access.) */
--
- while ((int)(bd->inbufBitCount) < bits_wanted) {
-
- /* If we need to read more data from file into byte buffer, do so */
--
- if (bd->inbufPos == bd->inbufCount) {
- /* if "no input fd" case: in_fd == -1, read fails, we jump */
- bd->inbufCount = read(bd->in_fd, bd->inbuf, IOBUF_SIZE);
-@@ -116,7 +113,6 @@
- }
-
- /* Avoid 32-bit overflow (dump bit buffer to top of output) */
--
- if (bd->inbufBitCount >= 24) {
- bits = bd->inbufBits & ((1 << bd->inbufBitCount) - 1);
- bits_wanted -= bd->inbufBitCount;
-@@ -125,13 +121,11 @@
- }
-
- /* Grab next 8 bits of input from buffer. */
--
- bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
- bd->inbufBitCount += 8;
- }
-
- /* Calculate result */
--
- bd->inbufBitCount -= bits_wanted;
- bits |= (bd->inbufBits >> bd->inbufBitCount) & ((1 << bits_wanted) - 1);
-
-@@ -139,7 +133,6 @@
- }
-
- /* Unpacks the next block and sets up for the inverse burrows-wheeler step. */
--
- static int get_next_block(bunzip_data *bd)
- {
- struct group_data *hufGroup;
-@@ -153,13 +146,11 @@
- selectors = bd->selectors;
-
- /* Reset longjmp I/O error handling */
--
- i = setjmp(bd->jmpbuf);
- if (i) return i;
-
- /* Read in header signature and CRC, then validate signature.
- (last block signature means CRC is for whole file, return now) */
--
- i = get_bits(bd, 24);
- j = get_bits(bd, 24);
- bd->headerCRC = get_bits(bd, 32);
-@@ -169,7 +160,6 @@
- /* We can add support for blockRandomised if anybody complains. There was
- some code for this in busybox 1.0.0-pre3, but nobody ever noticed that
- it didn't actually work. */
--
- if (get_bits(bd, 1)) return RETVAL_OBSOLETE_INPUT;
- origPtr = get_bits(bd, 24);
- if ((int)origPtr > dbufSize) return RETVAL_DATA_ERROR;
-@@ -179,7 +169,6 @@
- symbols to deal with, and writes a sparse bitfield indicating which
- values were present. We make a translation table to convert the symbols
- back to the corresponding bytes. */
--
- t = get_bits(bd, 16);
- symTotal = 0;
- for (i = 0; i < 16; i++) {
-@@ -192,7 +181,6 @@
- }
-
- /* How many different Huffman coding groups does this block use? */
--
- groupCount = get_bits(bd, 3);
- if (groupCount < 2 || groupCount > MAX_GROUPS)
- return RETVAL_DATA_ERROR;
-@@ -201,19 +189,16 @@
- group. Read in the group selector list, which is stored as MTF encoded
- bit runs. (MTF=Move To Front, as each value is used it's moved to the
- start of the list.) */
--
- nSelectors = get_bits(bd, 15);
- if (!nSelectors) return RETVAL_DATA_ERROR;
- for (i = 0; i < groupCount; i++) mtfSymbol[i] = i;
- for (i = 0; i < nSelectors; i++) {
-
- /* Get next value */
--
- for (j = 0; get_bits(bd, 1); j++)
- if (j >= groupCount) return RETVAL_DATA_ERROR;
-
- /* Decode MTF to get the next selector */
--
- uc = mtfSymbol[j];
- for (;j;j--) mtfSymbol[j] = mtfSymbol[j-1];
- mtfSymbol[0] = selectors[i] = uc;
-@@ -221,10 +206,11 @@
-
- /* Read the Huffman coding tables for each group, which code for symTotal
- literal symbols, plus two run symbols (RUNA, RUNB) */
--
- symCount = symTotal + 2;
- for (j = 0; j < groupCount; j++) {
-- unsigned char length[MAX_SYMBOLS], temp[MAX_HUFCODE_BITS+1];
-+ unsigned char length[MAX_SYMBOLS];
-+ /* 8 bits is ALMOST enough for temp[], see below */
-+ unsigned temp[MAX_HUFCODE_BITS+1];
- int minLen, maxLen, pp;
-
- /* Read Huffman code lengths for each symbol. They're stored in
-@@ -233,7 +219,6 @@
- (Subtracting 1 before the loop and then adding it back@the end is
- an optimization that makes the test inside the loop simpler: symbol
- length 0 becomes negative, so an unsigned inequality catches it.) */
--
- t = get_bits(bd, 5) - 1;
- for (i = 0; i < symCount; i++) {
- for (;;) {
-@@ -243,7 +228,6 @@
- /* If first bit is 0, stop. Else second bit indicates whether
- to increment or decrement the value. Optimization: grab 2
- bits and unget the second if the first was 0. */
--
- k = get_bits(bd, 2);
- if (k < 2) {
- bd->inbufBitCount++;
-@@ -251,17 +235,14 @@
- }
-
- /* Add one if second bit 1, else subtract 1. Avoids if/else */
--
- t += (((k+1) & 2) - 1);
- }
-
- /* Correct for the initial -1, to get the final symbol length */
--
- length[i] = t + 1;
- }
-
- /* Find largest and smallest lengths in this group */
--
- minLen = maxLen = length[0];
- for (i = 1; i < symCount; i++) {
- if (length[i] > maxLen) maxLen = length[i];
-@@ -278,7 +259,6 @@
- * number of bits can have. This is how the Huffman codes can vary in
- * length: each code with a value>limit[length] needs another bit.
- */
--
- hufGroup = bd->groups + j;
- hufGroup->minLen = minLen;
- hufGroup->maxLen = maxLen;
-@@ -286,12 +266,10 @@
- /* Note that minLen can't be smaller than 1, so we adjust the base
- and limit array pointers so we're not always wasting the first
- entry. We do this again when using them (during symbol decoding).*/
--
- base = hufGroup->base - 1;
- limit = hufGroup->limit - 1;
-
- /* Calculate permute[]. Concurently, initialize temp[] and limit[]. */
--
- pp = 0;
- for (i = minLen; i <= maxLen; i++) {
- temp[i] = limit[i] = 0;
-@@ -301,14 +279,14 @@
- }
-
- /* Count symbols coded for at each bit length */
--
-+ /* NB: in pathological cases, temp[8] can end ip being 256.
-+ * That's why uint8_t is too small for temp[]. */
- for (i = 0; i < symCount; i++) temp[length[i]]++;
-
- /* Calculate limit[] (the largest symbol-coding value at each bit
- * length, which is (previous limit<<1)+symbols at this level), and
- * base[] (number of symbols to ignore@each bit length, which is
- * limit minus the cumulative count of symbols coded for already). */
--
- pp = t = 0;
- for (i = minLen; i < maxLen; i++) {
- pp += temp[i];
-@@ -319,7 +297,6 @@
- each level we're really only interested in the first few bits,
- so here we set all the trailing to-be-ignored bits to 1 so they
- don't affect the value>limit[length] comparison. */
--
- limit[i] = (pp << (maxLen - i)) - 1;
- pp <<= 1;
- t += temp[i];
-@@ -335,7 +312,6 @@
- and run length encoding, saving the result into dbuf[dbufCount++] = uc */
-
- /* Initialize symbol occurrence counters and symbol Move To Front table */
--
- memset(byteCount, 0, sizeof(byteCount)); /* smaller, maybe slower? */
- for (i = 0; i < 256; i++) {
- //byteCount[i] = 0;
-@@ -347,8 +323,7 @@
- runPos = dbufCount = selector = 0;
- for (;;) {
-
-- /* fetch next Huffman coding group from list. */
--
-+ /* Fetch next Huffman coding group from list. */
- symCount = GROUP_SIZE - 1;
- if (selector >= nSelectors) return RETVAL_DATA_ERROR;
- hufGroup = bd->groups + selectors[selector++];
-@@ -367,7 +342,6 @@
- dry). The following (up to got_huff_bits:) is equivalent to
- j = get_bits(bd, hufGroup->maxLen);
- */
--
- while ((int)(bd->inbufBitCount) < hufGroup->maxLen) {
- if (bd->inbufPos == bd->inbufCount) {
- j = get_bits(bd, hufGroup->maxLen);
-@@ -382,13 +356,11 @@
- got_huff_bits:
-
- /* Figure how how many bits are in next symbol and unget extras */
--
- i = hufGroup->minLen;
- while (j > limit[i]) ++i;
- bd->inbufBitCount += (hufGroup->maxLen - i);
-
- /* Huffman decode value to get nextSym (with bounds checking) */
--
- if (i > hufGroup->maxLen)
- return RETVAL_DATA_ERROR;
- j = (j >> (hufGroup->maxLen - i)) - base[i];
-@@ -400,11 +372,9 @@
- byte, or a repeated run of the most recent literal byte. First,
- check if nextSym indicates a repeated run, and if so loop collecting
- how many times to repeat the last literal. */
--
- if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */
-
- /* If this is the start of a new run, zero out counter */
--
- if (!runPos) {
- runPos = 1;
- t = 0;
-@@ -417,7 +387,6 @@
- the basic or 0/1 method (except all bits 0, which would use no
- symbols, but a run of length 0 doesn't mean anything in this
- context). Thus space is saved. */
--
- t += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
- if (runPos < dbufSize) runPos <<= 1;
- goto end_of_huffman_loop;
-@@ -427,7 +396,6 @@
- how many times to repeat the last literal, so append that many
- copies to our buffer of decoded symbols (dbuf) now. (The last
- literal used is the one@the head of the mtfSymbol array.) */
--
- if (runPos) {
- runPos = 0;
- if (dbufCount + t >= dbufSize) return RETVAL_DATA_ERROR;
-@@ -438,7 +406,6 @@
- }
-
- /* Is this the terminating symbol? */
--
- if (nextSym > symTotal) break;
-
- /* At this point, nextSym indicates a new literal character. Subtract
-@@ -448,7 +415,6 @@
- first symbol in the mtf array, position 0, would have been handled
- as part of a run above. Therefore 1 unused mtf position minus
- 2 non-literal nextSym values equals -1.) */
--
- if (dbufCount >= dbufSize) return RETVAL_DATA_ERROR;
- i = nextSym - 1;
- uc = mtfSymbol[i];
-@@ -457,7 +423,6 @@
- * small number of symbols, and are bound by 256 in any case, using
- * memmove here would typically be bigger and slower due to function
- * call overhead and other assorted setup costs. */
--
- do {
- mtfSymbol[i] = mtfSymbol[i-1];
- } while (--i);
-@@ -465,13 +430,11 @@
- uc = symToByte[uc];
-
- /* We have our literal byte. Save it into dbuf. */
--
- byteCount[uc]++;
- dbuf[dbufCount++] = (unsigned)uc;
-
- /* Skip group initialization if we're not done with this group. Done
- * this way to avoid compiler warning. */
--
- end_of_huffman_loop:
- if (symCount--) goto continue_this_group;
- }
-@@ -484,7 +447,6 @@
- */
-
- /* Turn byteCount into cumulative occurrence counts of 0 to n-1. */
--
- j = 0;
- for (i = 0; i < 256; i++) {
- k = j + byteCount[i];
-@@ -493,7 +455,6 @@
- }
-
- /* Figure out what order dbuf would be in if we sorted it. */
--
- for (i = 0; i < dbufCount; i++) {
- uc = (unsigned char)(dbuf[i] & 0xff);
- dbuf[byteCount[uc]] |= (i << 8);
-@@ -503,11 +464,10 @@
- /* Decode first byte by hand to initialize "previous" byte. Note that it
- doesn't get output, and if the first three characters are identical
- it doesn't qualify as a run (hence writeRunCountdown=5). */
--
- if (dbufCount) {
- if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR;
- bd->writePos = dbuf[origPtr];
-- bd->writeCurrent = (unsigned char)(bd->writePos & 0xff);
-+ bd->writeCurrent = (unsigned char)(bd->writePos & 0xff);
- bd->writePos >>= 8;
- bd->writeRunCountdown = 5;
- }
-@@ -522,7 +482,6 @@
- error (all errors are negative numbers). If out_fd!=-1, outbuf and len
- are ignored, data is written to out_fd and return is RETVAL_OK or error.
- */
--
- int read_bunzip(bunzip_data *bd, char *outbuf, int len)
- {
- const unsigned *dbuf;
-@@ -539,19 +498,15 @@
- /* We will always have pending decoded data to write into the output
- buffer unless this is the very first call (in which case we haven't
- Huffman-decoded a block into the intermediate buffer yet). */
--
- if (bd->writeCopies) {
-
- /* Inside the loop, writeCopies means extra copies (beyond 1) */
--
- --bd->writeCopies;
-
- /* Loop outputting bytes */
--
- for (;;) {
-
- /* If the output buffer is full, snapshot state and return */
--
- if (gotcount >= len) {
- bd->writePos = pos;
- bd->writeCurrent = current;
-@@ -560,13 +515,11 @@
- }
-
- /* Write next byte into output buffer, updating CRC */
--
- outbuf[gotcount++] = current;
- bd->writeCRC = (bd->writeCRC << 8)
-- ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current];
-+ ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current];
-
- /* Loop now if we're outputting multiple copies of this byte */
--
- if (bd->writeCopies) {
- --bd->writeCopies;
- continue;
-@@ -582,35 +535,29 @@
- /* After 3 consecutive copies of the same byte, the 4th
- * is a repeat count. We count down from 4 instead
- * of counting up because testing for non-zero is faster */
--
- if (--bd->writeRunCountdown) {
- if (current != previous)
- bd->writeRunCountdown = 4;
- } else {
-
- /* We have a repeated run, this byte indicates the count */
--
- bd->writeCopies = current;
- current = previous;
- bd->writeRunCountdown = 5;
-
- /* Sometimes there are just 3 bytes (run length 0) */
--
- if (!bd->writeCopies) goto decode_next_byte;
-
- /* Subtract the 1 copy we'd output anyway to get extras */
--
- --bd->writeCopies;
- }
- }
-
- /* Decompression of this block completed successfully */
--
- bd->writeCRC = ~bd->writeCRC;
- bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ bd->writeCRC;
-
- /* If this block had a CRC error, force file level CRC error. */
--
- if (bd->writeCRC != bd->headerCRC) {
- bd->totalCRC = bd->headerCRC + 1;
- return RETVAL_LAST_BLOCK;
-@@ -619,7 +566,6 @@
-
- /* Refill the intermediate buffer by Huffman-decoding next block of input */
- /* (previous is just a convenient unused temp variable here) */
--
- previous = get_next_block(bd);
- if (previous) {
- bd->writeCount = previous;
-@@ -631,7 +577,6 @@
- goto decode_next_byte;
- }
-
--
- /* Allocate the structure, read file header. If in_fd==-1, inbuf must contain
- a complete bunzip file (len bytes long). If in_fd!=-1, inbuf and len are
- ignored, and data is read from file handle into temporary buffer. */
-@@ -639,7 +584,6 @@
- /* Because bunzip2 is used for help text unpacking, and because bb_show_usage()
- should work for NOFORK applets too, we must be extremely careful to not leak
- any allocations! */
--
- int start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf,
- int len)
- {
-@@ -650,16 +594,13 @@
- };
-
- /* Figure out how much data to allocate */
--
- i = sizeof(bunzip_data);
- if (in_fd != -1) i += IOBUF_SIZE;
-
- /* Allocate bunzip_data. Most fields initialize to zero. */
--
- bd = *bdp = xzalloc(i);
-
- /* Setup input buffer */
--
- bd->in_fd = in_fd;
- if (-1 == in_fd) {
- /* in this case, bd->inbuf is read-only */
-@@ -669,22 +610,18 @@
- bd->inbuf = (unsigned char *)(bd + 1);
-
- /* Init the CRC32 table (big endian) */
--
- crc32_filltable(bd->crc32Table, 1);
-
- /* Setup for I/O error handling via longjmp */
--
- i = setjmp(bd->jmpbuf);
- if (i) return i;
-
- /* Ensure that file starts with "BZh['1'-'9']." */
--
- i = get_bits(bd, 32);
- if ((unsigned)(i - BZh0 - 1) >= 9) return RETVAL_NOT_BZIP_DATA;
-
-- /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
-+ /* Fourth byte (ascii '1'-'9') indicates block size in units of 100k of
- uncompressed data. Allocate intermediate buffer for block. */
--
- bd->dbufSize = 100000 * (i - BZh0);
-
- /* Cannot use xmalloc - may leak bd in NOFORK case! */
-@@ -704,7 +641,6 @@
-
-
- /* Decompress src_fd to dst_fd. Stops at end of bzip data, not end of file. */
--
- USE_DESKTOP(long long) int
- unpack_bz2_stream(int src_fd, int dst_fd)
- {
-@@ -761,9 +697,9 @@
- char c;
-
- if (i < 0)
-- fprintf(stderr,"%s\n", bunzip_errors[-i]);
-+ fprintf(stderr, "%s\n", bunzip_errors[-i]);
- else if (read(STDIN_FILENO, &c, 1))
-- fprintf(stderr,"Trailing garbage ignored\n");
-+ fprintf(stderr, "Trailing garbage ignored\n");
- return -i;
- }
- #endif
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,12 +0,0 @@
---- busybox-1.11.0/libbb/print_flags.c Wed Jun 25 14:51:32 2008
-+++ busybox-1.11.0-ip/libbb/print_flags.c Fri Jun 27 00:39:16 2008
-@@ -19,8 +19,8 @@
- labels);
- need_separator = separator;
- flags &= ~ *masks;
-- masks++;
- }
-+ masks++;
- labels += strlen(labels) + 1;
- }
- return flags;
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-man.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-man.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-man.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,40 +0,0 @@
---- busybox-1.11.0/miscutils/man.c Wed Jun 25 14:51:35 2008
-+++ busybox-1.11.0-man/miscutils/man.c Fri Jul 4 23:55:56 2008
-@@ -73,7 +73,7 @@
- char *sec_list;
- char *cur_path, *cur_sect;
- char *line, *value;
-- int count_mp, alloc_mp, cur_mp;
-+ int count_mp, cur_mp;
- int opt;
-
- opt_complementary = "-1"; /*@least one argument */
-@@ -81,8 +81,8 @@
- argv += optind;
-
- sec_list = xstrdup("1:2:3:4:5:6:7:8:9");
-- alloc_mp = 10;
-- man_path_list = xmalloc(10 * sizeof(man_path_list[0]));
-+ /* Last valid man_path_list[] is [0x10] */
-+ man_path_list = xzalloc(0x11 * sizeof(man_path_list[0]));
- count_mp = 0;
- man_path_list[0] = xstrdup(getenv("MANPATH"));
- if (man_path_list[0])
-@@ -107,11 +107,13 @@
- if (strcmp("MANPATH", line) == 0) {
- man_path_list[count_mp] = xstrdup(value);
- count_mp++;
-- if (alloc_mp == count_mp) {
-- alloc_mp += 10;
-- man_path_list = xrealloc(man_path_list, alloc_mp * sizeof(man_path_list[0]));
-+ /* man_path_list is NULL terminated */
-+ man_path_list[count_mp] = NULL;
-+ if (!(count_mp & 0xf)) { /* 0x10, 0x20 etc */
-+ /* so that last valid man_path_list[] is [count_mp + 0x10] */
-+ man_path_list = xrealloc(man_path_list,
-+ (count_mp + 0x11) * sizeof(man_path_list[0]));
- }
-- /* thus man_path_list is always NULL terminated */
- }
- if (strcmp("MANSECT", line) == 0) {
- free(sec_list);
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,99 +0,0 @@
---- busybox-1.11.0/debianutils/start_stop_daemon.c Wed Jun 25 14:51:26 2008
-+++ busybox-1.11.0-ssd/debianutils/start_stop_daemon.c Tue Jul 1 14:05:05 2008
-@@ -326,7 +326,9 @@
- char *signame;
- char *startas;
- char *chuid;
-+#ifdef OLDER_VERSION_OF_X
- struct stat execstat;
-+#endif
- #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
- // char *retry_arg = NULL;
- // int retries = -1;
-@@ -361,6 +363,8 @@
-
- if (!(opt & OPT_a))
- startas = execname;
-+ if (!execname) /* in case -a is given and -x is not */
-+ execname = startas;
-
- // USE_FEATURE_START_STOP_DAEMON_FANCY(
- // if (retry_arg)
-@@ -374,7 +378,8 @@
- if (errno)
- user_id = xuname2uid(userspec);
- }
-- do_procinit(); /* Both start and stop needs to know current processes */
-+ /* Both start and stop need to know current processes */
-+ do_procinit();
-
- if (opt & CTX_STOP) {
- int i = do_stop();
-@@ -383,17 +388,21 @@
-
- if (found) {
- if (!QUIET)
-- printf("%s already running\n%d\n", execname, found->pid);
-+ printf("%s is already running\n%u\n", execname, (unsigned)found->pid);
- return !(opt & OPT_OKNODO);
- }
-
-+#ifdef OLDER_VERSION_OF_X
- if (execname)
- xstat(execname, &execstat);
-+#endif
-
- *--argv = startas;
- if (opt & OPT_BACKGROUND) {
- #if BB_MMU
-- bb_daemonize(0);
-+ bb_daemonize(DAEMON_DEVNULL_STDIO + DAEMON_CLOSE_EXTRA_FDS);
-+ /* DAEMON_DEVNULL_STDIO is superfluous -
-+ * it's always done by bb_daemonize() */
- #else
- pid_t pid = vfork();
- if (pid < 0) /* error */
-@@ -404,19 +413,18 @@
- * so "return 0" may do bad things */
- _exit(EXIT_SUCCESS);
- }
-- /* child */
-+ /* Child */
- setsid(); /* detach from controlling tty */
- /* Redirect stdio to /dev/null, close extra FDs.
- * We do not actually daemonize because of DAEMON_ONLY_SANITIZE */
-- bb_daemonize_or_rexec(
-- DAEMON_DEVNULL_STDIO
-+ bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO
- + DAEMON_CLOSE_EXTRA_FDS
- + DAEMON_ONLY_SANITIZE,
- NULL /* argv, unused */ );
- #endif
- }
- if (opt & OPT_MAKEPID) {
-- /* user wants _us_ to make the pidfile */
-+ /* User wants _us_ to make the pidfile */
- write_pidfile(pidfile);
- }
- if (opt & OPT_c) {
-@@ -434,6 +442,6 @@
- }
- }
- #endif
-- execv(startas, argv);
-+ execvp(startas, argv);
- bb_perror_msg_and_die("cannot start %s", startas);
- }
---- busybox-1.11.0/include/usage.h Wed Jun 25 14:51:35 2008
-+++ busybox-1.11.0-ssd/include/usage.h Tue Jul 1 14:03:48 2008
-@@ -3637,9 +3637,7 @@
- "$ cat TODO | split -a 2 -l 2 TODO_\n"
-
- #define start_stop_daemon_trivial_usage \
-- "[OPTIONS] [" \
-- USE_GETOPT_LONG("--start|--stop") SKIP_GETOPT_LONG("-S|-K") \
-- "] ... [-- arguments...]"
-+ "[OPTIONS] [-S|-K] ... [-- arguments...]"
- #define start_stop_daemon_full_usage "\n\n" \
- "Search for matching processes, and then\n" \
- "-S: stop all matching processes.\n" \
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,108 +0,0 @@
---- busybox-1.11.0/applets/individual.c Wed Jun 25 14:51:37 2008
-+++ busybox-1.11.0-uname/applets/individual.c Wed Jul 2 13:32:17 2008
-@@ -14,13 +14,11 @@
- int main(int argc, char **argv)
- {
- applet_name = argv[0];
--
- return APPLET_main(argc,argv);
- }
-
- void bb_show_usage(void)
- {
-- printf(APPLET_full_usage "\n");
--
-+ fputs(APPLET_full_usage "\n", stdout);
- exit(EXIT_FAILURE);
- }
---- busybox-1.11.0/coreutils/uname.c Wed Jun 25 14:51:30 2008
-+++ busybox-1.11.0-uname/coreutils/uname.c Wed Jul 2 13:32:17 2008
-@@ -17,7 +17,7 @@
- -m, --machine sun
- -a, --all SunOS rocky8 4.0 sun
-
-- The default behavior is equivalent to `-s'.
-+ The default behavior is equivalent to '-s'.
-
- David MacKenzie <djm@gnu.ai.mit.edu> */
-
-@@ -39,47 +39,43 @@
- } uname_info_t;
-
- static const char options[] ALIGN1 = "snrvmpa";
--static const unsigned short utsname_offset[] ALIGN2 = {
-- offsetof(uname_info_t,name.sysname),
-- offsetof(uname_info_t,name.nodename),
-- offsetof(uname_info_t,name.release),
-- offsetof(uname_info_t,name.version),
-- offsetof(uname_info_t,name.machine),
-- offsetof(uname_info_t,processor)
-+static const unsigned short utsname_offset[] = {
-+ offsetof(uname_info_t, name.sysname),
-+ offsetof(uname_info_t, name.nodename),
-+ offsetof(uname_info_t, name.release),
-+ offsetof(uname_info_t, name.version),
-+ offsetof(uname_info_t, name.machine),
-+ offsetof(uname_info_t, processor)
- };
-
- int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
--int uname_main(int argc, char **argv)
-+int uname_main(int argc ATTRIBUTE_UNUSED, char **argv)
- {
- uname_info_t uname_info;
- #if defined(__sparc__) && defined(__linux__)
- char *fake_sparc = getenv("FAKE_SPARC");
- #endif
-- const unsigned short int *delta;
-+ const unsigned short *delta;
- char toprint;
-
- toprint = getopt32(argv, options);
-
-- if (argc != optind) {
-+ if (argv[optind]) { /* coreutils-6.9 compat */
- bb_show_usage();
- }
-
-- if (toprint & (1 << 6)) {
-+ if (toprint & (1 << 6)) { /* -a => all opts on */
- toprint = 0x3f;
- }
-
-- if (toprint == 0) {
-- toprint = 1; /* sysname */
-+ if (toprint == 0) { /* no opts => -s (sysname) */
-+ toprint = 1;
- }
-
-- if (uname(&uname_info.name) == -1) {
-- bb_error_msg_and_die("cannot get system name");
-- }
-+ uname(&uname_info.name); /* never fails */
-
- #if defined(__sparc__) && defined(__linux__)
-- if ((fake_sparc != NULL)
-- && ((fake_sparc[0] == 'y')
-- || (fake_sparc[0] == 'Y'))) {
-+ if (fake_sparc && (fake_sparc[0] | 0x20) == 'y') {
- strcpy(uname_info.name.machine, "sparc");
- }
- #endif
-@@ -89,7 +85,8 @@
- delta = utsname_offset;
- do {
- if (toprint & 1) {
-- printf(((char *)(&uname_info)) + *delta);
-+ /* printf would not be safe here */
-+ fputs((char *)(&uname_info) + *delta, stdout);
- if (toprint > 1) {
- bb_putchar(' ');
- }
-@@ -98,5 +95,5 @@
- } while (toprint >>= 1);
- bb_putchar('\n');
-
-- fflush_stdout_and_exit(EXIT_SUCCESS);
-+ fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch 2008-07-11 22:11:50 UTC (rev 22802)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch 2008-07-11 22:19:21 UTC (rev 22803)
@@ -1,11 +0,0 @@
---- busybox-1.11.0/editors/vi.c Wed Jun 25 14:51:37 2008
-+++ busybox-1.11.0-vi/editors/vi.c Fri Jun 27 06:06:54 2008
-@@ -1894,7 +1894,7 @@
- p = new_text + (p - text);
- text = new_text;
- }
-- memmove(p + size, p, end - p);
-+ memmove(p + size, p, end - size - p);
- memset(p, ' ', size); // clear new hole
- file_modified++;
- return p;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-07-06 13:55 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-07-06 13:55 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-06 06:55:55 -0700 (Sun, 06 Jul 2008)
New Revision: 22667
Log:
busybox: more 1.11.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.11.0-man.patch
trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.0-man.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-man.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-man.patch 2008-07-06 13:55:55 UTC (rev 22667)
@@ -0,0 +1,40 @@
+--- busybox-1.11.0/miscutils/man.c Wed Jun 25 14:51:35 2008
++++ busybox-1.11.0-man/miscutils/man.c Fri Jul 4 23:55:56 2008
+@@ -73,7 +73,7 @@
+ char *sec_list;
+ char *cur_path, *cur_sect;
+ char *line, *value;
+- int count_mp, alloc_mp, cur_mp;
++ int count_mp, cur_mp;
+ int opt;
+
+ opt_complementary = "-1"; /* at least one argument */
+@@ -81,8 +81,8 @@
+ argv += optind;
+
+ sec_list = xstrdup("1:2:3:4:5:6:7:8:9");
+- alloc_mp = 10;
+- man_path_list = xmalloc(10 * sizeof(man_path_list[0]));
++ /* Last valid man_path_list[] is [0x10] */
++ man_path_list = xzalloc(0x11 * sizeof(man_path_list[0]));
+ count_mp = 0;
+ man_path_list[0] = xstrdup(getenv("MANPATH"));
+ if (man_path_list[0])
+@@ -107,11 +107,13 @@
+ if (strcmp("MANPATH", line) == 0) {
+ man_path_list[count_mp] = xstrdup(value);
+ count_mp++;
+- if (alloc_mp == count_mp) {
+- alloc_mp += 10;
+- man_path_list = xrealloc(man_path_list, alloc_mp * sizeof(man_path_list[0]));
++ /* man_path_list is NULL terminated */
++ man_path_list[count_mp] = NULL;
++ if (!(count_mp & 0xf)) { /* 0x10, 0x20 etc */
++ /* so that last valid man_path_list[] is [count_mp + 0x10] */
++ man_path_list = xrealloc(man_path_list,
++ (count_mp + 0x11) * sizeof(man_path_list[0]));
+ }
+- /* thus man_path_list is always NULL terminated */
+ }
+ if (strcmp("MANSECT", line) == 0) {
+ free(sec_list);
Added: trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-uname.patch 2008-07-06 13:55:55 UTC (rev 22667)
@@ -0,0 +1,108 @@
+--- busybox-1.11.0/applets/individual.c Wed Jun 25 14:51:37 2008
++++ busybox-1.11.0-uname/applets/individual.c Wed Jul 2 13:32:17 2008
+@@ -14,13 +14,11 @@
+ int main(int argc, char **argv)
+ {
+ applet_name = argv[0];
+-
+ return APPLET_main(argc,argv);
+ }
+
+ void bb_show_usage(void)
+ {
+- printf(APPLET_full_usage "\n");
+-
++ fputs(APPLET_full_usage "\n", stdout);
+ exit(EXIT_FAILURE);
+ }
+--- busybox-1.11.0/coreutils/uname.c Wed Jun 25 14:51:30 2008
++++ busybox-1.11.0-uname/coreutils/uname.c Wed Jul 2 13:32:17 2008
+@@ -17,7 +17,7 @@
+ -m, --machine sun
+ -a, --all SunOS rocky8 4.0 sun
+
+- The default behavior is equivalent to `-s'.
++ The default behavior is equivalent to '-s'.
+
+ David MacKenzie <djm@gnu.ai.mit.edu> */
+
+@@ -39,47 +39,43 @@
+ } uname_info_t;
+
+ static const char options[] ALIGN1 = "snrvmpa";
+-static const unsigned short utsname_offset[] ALIGN2 = {
+- offsetof(uname_info_t,name.sysname),
+- offsetof(uname_info_t,name.nodename),
+- offsetof(uname_info_t,name.release),
+- offsetof(uname_info_t,name.version),
+- offsetof(uname_info_t,name.machine),
+- offsetof(uname_info_t,processor)
++static const unsigned short utsname_offset[] = {
++ offsetof(uname_info_t, name.sysname),
++ offsetof(uname_info_t, name.nodename),
++ offsetof(uname_info_t, name.release),
++ offsetof(uname_info_t, name.version),
++ offsetof(uname_info_t, name.machine),
++ offsetof(uname_info_t, processor)
+ };
+
+ int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+-int uname_main(int argc, char **argv)
++int uname_main(int argc ATTRIBUTE_UNUSED, char **argv)
+ {
+ uname_info_t uname_info;
+ #if defined(__sparc__) && defined(__linux__)
+ char *fake_sparc = getenv("FAKE_SPARC");
+ #endif
+- const unsigned short int *delta;
++ const unsigned short *delta;
+ char toprint;
+
+ toprint = getopt32(argv, options);
+
+- if (argc != optind) {
++ if (argv[optind]) { /* coreutils-6.9 compat */
+ bb_show_usage();
+ }
+
+- if (toprint & (1 << 6)) {
++ if (toprint & (1 << 6)) { /* -a => all opts on */
+ toprint = 0x3f;
+ }
+
+- if (toprint == 0) {
+- toprint = 1; /* sysname */
++ if (toprint == 0) { /* no opts => -s (sysname) */
++ toprint = 1;
+ }
+
+- if (uname(&uname_info.name) == -1) {
+- bb_error_msg_and_die("cannot get system name");
+- }
++ uname(&uname_info.name); /* never fails */
+
+ #if defined(__sparc__) && defined(__linux__)
+- if ((fake_sparc != NULL)
+- && ((fake_sparc[0] == 'y')
+- || (fake_sparc[0] == 'Y'))) {
++ if (fake_sparc && (fake_sparc[0] | 0x20) == 'y') {
+ strcpy(uname_info.name.machine, "sparc");
+ }
+ #endif
+@@ -89,7 +85,8 @@
+ delta = utsname_offset;
+ do {
+ if (toprint & 1) {
+- printf(((char *)(&uname_info)) + *delta);
++ /* printf would not be safe here */
++ fputs((char *)(&uname_info) + *delta, stdout);
+ if (toprint > 1) {
+ bb_putchar(' ');
+ }
+@@ -98,5 +95,5 @@
+ } while (toprint >>= 1);
+ bb_putchar('\n');
+
+- fflush_stdout_and_exit(EXIT_SUCCESS);
++ fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
+ }
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-07-01 14:04 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-07-01 14:04 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-01 07:04:55 -0700 (Tue, 01 Jul 2008)
New Revision: 22593
Log:
busybox: default to 1.11.x
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-07-01 13:58:01 UTC (rev 22592)
+++ trunk/buildroot/package/busybox/Config.in 2008-07-01 14:04:55 UTC (rev 22593)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends on BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_10_X
+ default BR2_BUSYBOX_VERSION_1_11_X
help
Select the version of BusyBox you wish to use.
@@ -34,10 +34,11 @@
config BR2_BUSYBOX_VERSION_1_9_X
bool "BusyBox 1.9.x"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_10_X
bool "BusyBox 1.10.x"
+ depends on BR2_DEPRECATED || BR2_RECENT
config BR2_BUSYBOX_VERSION_1_11_X
bool "BusyBox 1.11.x"
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-07-01 13:37 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-07-01 13:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-01 06:37:12 -0700 (Tue, 01 Jul 2008)
New Revision: 22591
Log:
busybox 1.11.0: additional fixes
Added:
trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch
trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-awk.patch 2008-07-01 13:37:12 UTC (rev 22591)
@@ -0,0 +1,88 @@
+--- busybox-1.11.0/editors/awk.c Wed Jun 25 14:51:37 2008
++++ busybox-1.11.0-awk/editors/awk.c Tue Jul 1 14:03:37 2008
+@@ -681,11 +681,6 @@
+ return (isalnum(c) || c == '_');
+ }
+
+-static FILE *afopen(const char *path, const char *mode)
+-{
+- return (*path == '-' && *(path+1) == '\0') ? stdin : xfopen(path, mode);
+-}
+-
+ /* -------- working with variables (set/get/copy/etc) -------- */
+
+ static xhash *iamarray(var *v)
+@@ -2740,7 +2735,7 @@
+ ind = getvar_s(incvar(intvar[ARGIND]));
+ fname = getvar_s(findvar(iamarray(intvar[ARGV]), ind));
+ if (fname && *fname && !is_assignment(fname))
+- F = afopen(fname, "r");
++ F = xfopen_stdin(fname);
+ }
+ } while (!F);
+
+@@ -2757,8 +2752,9 @@
+ {
+ unsigned opt;
+ char *opt_F, *opt_W;
+- llist_t *opt_v = NULL;
+- int i, j, flen;
++ llist_t *list_v = NULL;
++ llist_t *list_f = NULL;
++ int i, j;
+ var *v;
+ var tv;
+ char **envp;
+@@ -2816,35 +2812,33 @@
+ *s1 = '=';
+ }
+ }
+- opt_complementary = "v::";
+- opt = getopt32(argv, "F:v:f:W:", &opt_F, &opt_v, &g_progname, &opt_W);
++ opt_complementary = "v::f::"; /* -v and -f can occur multiple times */
++ opt = getopt32(argv, "F:v:f:W:", &opt_F, &list_v, &list_f, &opt_W);
+ argv += optind;
+ argc -= optind;
+ if (opt & 0x1)
+ setvar_s(intvar[FS], opt_F); // -F
+- while (opt_v) { /* -v */
+- if (!is_assignment(llist_pop(&opt_v)))
++ while (list_v) { /* -v */
++ if (!is_assignment(llist_pop(&list_v)))
+ bb_show_usage();
+ }
+- if (opt & 0x4) { // -f
+- char *s = s; /* die, gcc, die */
+- FILE *from_file = afopen(g_progname, "r");
+- /* one byte is reserved for some trick in next_token */
+- if (fseek(from_file, 0, SEEK_END) == 0) {
+- flen = ftell(from_file);
+- s = xmalloc(flen + 4);
+- fseek(from_file, 0, SEEK_SET);
+- i = 1 + fread(s + 1, 1, flen, from_file);
+- } else {
++ if (list_f) { /* -f */
++ do {
++ char *s = NULL;
++ FILE *from_file;
++
++ g_progname = llist_pop(&list_f);
++ from_file = xfopen_stdin(g_progname);
++ /* one byte is reserved for some trick in next_token */
+ for (i = j = 1; j > 0; i += j) {
+ s = xrealloc(s, i + 4096);
+ j = fread(s + i, 1, 4094, from_file);
+ }
+- }
+- s[i] = '\0';
+- fclose(from_file);
+- parse_program(s + 1);
+- free(s);
++ s[i] = '\0';
++ fclose(from_file);
++ parse_program(s + 1);
++ free(s);
++ } while (list_f);
+ } else { // no -f: take program from 1st parameter
+ if (!argc)
+ bb_show_usage();
Added: trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-ssd.patch 2008-07-01 13:37:12 UTC (rev 22591)
@@ -0,0 +1,99 @@
+--- busybox-1.11.0/debianutils/start_stop_daemon.c Wed Jun 25 14:51:26 2008
++++ busybox-1.11.0-ssd/debianutils/start_stop_daemon.c Tue Jul 1 14:05:05 2008
+@@ -326,7 +326,9 @@
+ char *signame;
+ char *startas;
+ char *chuid;
++#ifdef OLDER_VERSION_OF_X
+ struct stat execstat;
++#endif
+ #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+ // char *retry_arg = NULL;
+ // int retries = -1;
+@@ -361,6 +363,8 @@
+
+ if (!(opt & OPT_a))
+ startas = execname;
++ if (!execname) /* in case -a is given and -x is not */
++ execname = startas;
+
+ // USE_FEATURE_START_STOP_DAEMON_FANCY(
+ // if (retry_arg)
+@@ -374,7 +378,8 @@
+ if (errno)
+ user_id = xuname2uid(userspec);
+ }
+- do_procinit(); /* Both start and stop needs to know current processes */
++ /* Both start and stop need to know current processes */
++ do_procinit();
+
+ if (opt & CTX_STOP) {
+ int i = do_stop();
+@@ -383,17 +388,21 @@
+
+ if (found) {
+ if (!QUIET)
+- printf("%s already running\n%d\n", execname, found->pid);
++ printf("%s is already running\n%u\n", execname, (unsigned)found->pid);
+ return !(opt & OPT_OKNODO);
+ }
+
++#ifdef OLDER_VERSION_OF_X
+ if (execname)
+ xstat(execname, &execstat);
++#endif
+
+ *--argv = startas;
+ if (opt & OPT_BACKGROUND) {
+ #if BB_MMU
+- bb_daemonize(0);
++ bb_daemonize(DAEMON_DEVNULL_STDIO + DAEMON_CLOSE_EXTRA_FDS);
++ /* DAEMON_DEVNULL_STDIO is superfluous -
++ * it's always done by bb_daemonize() */
+ #else
+ pid_t pid = vfork();
+ if (pid < 0) /* error */
+@@ -404,19 +413,18 @@
+ * so "return 0" may do bad things */
+ _exit(EXIT_SUCCESS);
+ }
+- /* child */
++ /* Child */
+ setsid(); /* detach from controlling tty */
+ /* Redirect stdio to /dev/null, close extra FDs.
+ * We do not actually daemonize because of DAEMON_ONLY_SANITIZE */
+- bb_daemonize_or_rexec(
+- DAEMON_DEVNULL_STDIO
++ bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO
+ + DAEMON_CLOSE_EXTRA_FDS
+ + DAEMON_ONLY_SANITIZE,
+ NULL /* argv, unused */ );
+ #endif
+ }
+ if (opt & OPT_MAKEPID) {
+- /* user wants _us_ to make the pidfile */
++ /* User wants _us_ to make the pidfile */
+ write_pidfile(pidfile);
+ }
+ if (opt & OPT_c) {
+@@ -434,6 +442,6 @@
+ }
+ }
+ #endif
+- execv(startas, argv);
++ execvp(startas, argv);
+ bb_perror_msg_and_die("cannot start %s", startas);
+ }
+--- busybox-1.11.0/include/usage.h Wed Jun 25 14:51:35 2008
++++ busybox-1.11.0-ssd/include/usage.h Tue Jul 1 14:03:48 2008
+@@ -3637,9 +3637,7 @@
+ "$ cat TODO | split -a 2 -l 2 TODO_\n"
+
+ #define start_stop_daemon_trivial_usage \
+- "[OPTIONS] [" \
+- USE_GETOPT_LONG("--start|--stop") SKIP_GETOPT_LONG("-S|-K") \
+- "] ... [-- arguments...]"
++ "[OPTIONS] [-S|-K] ... [-- arguments...]"
+ #define start_stop_daemon_full_usage "\n\n" \
+ "Search for matching processes, and then\n" \
+ "-S: stop all matching processes.\n" \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-28 20:53 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-28 20:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-28 13:53:52 -0700 (Sat, 28 Jun 2008)
New Revision: 22551
Log:
busybox: 1.11.0 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch
trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch
trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-bunzip2.patch 2008-06-28 20:53:52 UTC (rev 22551)
@@ -0,0 +1,503 @@
+--- busybox-1.11.0/archival/libunarchive/decompress_bunzip2.c Wed Jun 25 14:51:26 2008
++++ busybox-1.11.0-bunzip2/archival/libunarchive/decompress_bunzip2.c Sat Jun 28 20:04:31 2008
+@@ -66,7 +66,6 @@
+ * | grep 'bd->' | sed 's/^.*bd->/bd->/' | sort | $PAGER
+ * and moved it (inbufBitCount) to offset 0.
+ */
+-
+ struct bunzip_data {
+ /* I/O tracking data (file handles, buffers, positions, etc.) */
+ unsigned inbufBitCount, inbufBits;
+@@ -102,11 +101,9 @@
+
+ /* If we need to get more data from the byte buffer, do so. (Loop getting
+ one byte at a time to enforce endianness and avoid unaligned access.) */
+-
+ while ((int)(bd->inbufBitCount) < bits_wanted) {
+
+ /* If we need to read more data from file into byte buffer, do so */
+-
+ if (bd->inbufPos == bd->inbufCount) {
+ /* if "no input fd" case: in_fd == -1, read fails, we jump */
+ bd->inbufCount = read(bd->in_fd, bd->inbuf, IOBUF_SIZE);
+@@ -116,7 +113,6 @@
+ }
+
+ /* Avoid 32-bit overflow (dump bit buffer to top of output) */
+-
+ if (bd->inbufBitCount >= 24) {
+ bits = bd->inbufBits & ((1 << bd->inbufBitCount) - 1);
+ bits_wanted -= bd->inbufBitCount;
+@@ -125,13 +121,11 @@
+ }
+
+ /* Grab next 8 bits of input from buffer. */
+-
+ bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
+ bd->inbufBitCount += 8;
+ }
+
+ /* Calculate result */
+-
+ bd->inbufBitCount -= bits_wanted;
+ bits |= (bd->inbufBits >> bd->inbufBitCount) & ((1 << bits_wanted) - 1);
+
+@@ -139,7 +133,6 @@
+ }
+
+ /* Unpacks the next block and sets up for the inverse burrows-wheeler step. */
+-
+ static int get_next_block(bunzip_data *bd)
+ {
+ struct group_data *hufGroup;
+@@ -153,13 +146,11 @@
+ selectors = bd->selectors;
+
+ /* Reset longjmp I/O error handling */
+-
+ i = setjmp(bd->jmpbuf);
+ if (i) return i;
+
+ /* Read in header signature and CRC, then validate signature.
+ (last block signature means CRC is for whole file, return now) */
+-
+ i = get_bits(bd, 24);
+ j = get_bits(bd, 24);
+ bd->headerCRC = get_bits(bd, 32);
+@@ -169,7 +160,6 @@
+ /* We can add support for blockRandomised if anybody complains. There was
+ some code for this in busybox 1.0.0-pre3, but nobody ever noticed that
+ it didn't actually work. */
+-
+ if (get_bits(bd, 1)) return RETVAL_OBSOLETE_INPUT;
+ origPtr = get_bits(bd, 24);
+ if ((int)origPtr > dbufSize) return RETVAL_DATA_ERROR;
+@@ -179,7 +169,6 @@
+ symbols to deal with, and writes a sparse bitfield indicating which
+ values were present. We make a translation table to convert the symbols
+ back to the corresponding bytes. */
+-
+ t = get_bits(bd, 16);
+ symTotal = 0;
+ for (i = 0; i < 16; i++) {
+@@ -192,7 +181,6 @@
+ }
+
+ /* How many different Huffman coding groups does this block use? */
+-
+ groupCount = get_bits(bd, 3);
+ if (groupCount < 2 || groupCount > MAX_GROUPS)
+ return RETVAL_DATA_ERROR;
+@@ -201,19 +189,16 @@
+ group. Read in the group selector list, which is stored as MTF encoded
+ bit runs. (MTF=Move To Front, as each value is used it's moved to the
+ start of the list.) */
+-
+ nSelectors = get_bits(bd, 15);
+ if (!nSelectors) return RETVAL_DATA_ERROR;
+ for (i = 0; i < groupCount; i++) mtfSymbol[i] = i;
+ for (i = 0; i < nSelectors; i++) {
+
+ /* Get next value */
+-
+ for (j = 0; get_bits(bd, 1); j++)
+ if (j >= groupCount) return RETVAL_DATA_ERROR;
+
+ /* Decode MTF to get the next selector */
+-
+ uc = mtfSymbol[j];
+ for (;j;j--) mtfSymbol[j] = mtfSymbol[j-1];
+ mtfSymbol[0] = selectors[i] = uc;
+@@ -221,10 +206,11 @@
+
+ /* Read the Huffman coding tables for each group, which code for symTotal
+ literal symbols, plus two run symbols (RUNA, RUNB) */
+-
+ symCount = symTotal + 2;
+ for (j = 0; j < groupCount; j++) {
+- unsigned char length[MAX_SYMBOLS], temp[MAX_HUFCODE_BITS+1];
++ unsigned char length[MAX_SYMBOLS];
++ /* 8 bits is ALMOST enough for temp[], see below */
++ unsigned temp[MAX_HUFCODE_BITS+1];
+ int minLen, maxLen, pp;
+
+ /* Read Huffman code lengths for each symbol. They're stored in
+@@ -233,7 +219,6 @@
+ (Subtracting 1 before the loop and then adding it back@the end is
+ an optimization that makes the test inside the loop simpler: symbol
+ length 0 becomes negative, so an unsigned inequality catches it.) */
+-
+ t = get_bits(bd, 5) - 1;
+ for (i = 0; i < symCount; i++) {
+ for (;;) {
+@@ -243,7 +228,6 @@
+ /* If first bit is 0, stop. Else second bit indicates whether
+ to increment or decrement the value. Optimization: grab 2
+ bits and unget the second if the first was 0. */
+-
+ k = get_bits(bd, 2);
+ if (k < 2) {
+ bd->inbufBitCount++;
+@@ -251,17 +235,14 @@
+ }
+
+ /* Add one if second bit 1, else subtract 1. Avoids if/else */
+-
+ t += (((k+1) & 2) - 1);
+ }
+
+ /* Correct for the initial -1, to get the final symbol length */
+-
+ length[i] = t + 1;
+ }
+
+ /* Find largest and smallest lengths in this group */
+-
+ minLen = maxLen = length[0];
+ for (i = 1; i < symCount; i++) {
+ if (length[i] > maxLen) maxLen = length[i];
+@@ -278,7 +259,6 @@
+ * number of bits can have. This is how the Huffman codes can vary in
+ * length: each code with a value>limit[length] needs another bit.
+ */
+-
+ hufGroup = bd->groups + j;
+ hufGroup->minLen = minLen;
+ hufGroup->maxLen = maxLen;
+@@ -286,12 +266,10 @@
+ /* Note that minLen can't be smaller than 1, so we adjust the base
+ and limit array pointers so we're not always wasting the first
+ entry. We do this again when using them (during symbol decoding).*/
+-
+ base = hufGroup->base - 1;
+ limit = hufGroup->limit - 1;
+
+ /* Calculate permute[]. Concurently, initialize temp[] and limit[]. */
+-
+ pp = 0;
+ for (i = minLen; i <= maxLen; i++) {
+ temp[i] = limit[i] = 0;
+@@ -301,14 +279,14 @@
+ }
+
+ /* Count symbols coded for at each bit length */
+-
++ /* NB: in pathological cases, temp[8] can end ip being 256.
++ * That's why uint8_t is too small for temp[]. */
+ for (i = 0; i < symCount; i++) temp[length[i]]++;
+
+ /* Calculate limit[] (the largest symbol-coding value at each bit
+ * length, which is (previous limit<<1)+symbols at this level), and
+ * base[] (number of symbols to ignore@each bit length, which is
+ * limit minus the cumulative count of symbols coded for already). */
+-
+ pp = t = 0;
+ for (i = minLen; i < maxLen; i++) {
+ pp += temp[i];
+@@ -319,7 +297,6 @@
+ each level we're really only interested in the first few bits,
+ so here we set all the trailing to-be-ignored bits to 1 so they
+ don't affect the value>limit[length] comparison. */
+-
+ limit[i] = (pp << (maxLen - i)) - 1;
+ pp <<= 1;
+ t += temp[i];
+@@ -335,7 +312,6 @@
+ and run length encoding, saving the result into dbuf[dbufCount++] = uc */
+
+ /* Initialize symbol occurrence counters and symbol Move To Front table */
+-
+ memset(byteCount, 0, sizeof(byteCount)); /* smaller, maybe slower? */
+ for (i = 0; i < 256; i++) {
+ //byteCount[i] = 0;
+@@ -347,8 +323,7 @@
+ runPos = dbufCount = selector = 0;
+ for (;;) {
+
+- /* fetch next Huffman coding group from list. */
+-
++ /* Fetch next Huffman coding group from list. */
+ symCount = GROUP_SIZE - 1;
+ if (selector >= nSelectors) return RETVAL_DATA_ERROR;
+ hufGroup = bd->groups + selectors[selector++];
+@@ -367,7 +342,6 @@
+ dry). The following (up to got_huff_bits:) is equivalent to
+ j = get_bits(bd, hufGroup->maxLen);
+ */
+-
+ while ((int)(bd->inbufBitCount) < hufGroup->maxLen) {
+ if (bd->inbufPos == bd->inbufCount) {
+ j = get_bits(bd, hufGroup->maxLen);
+@@ -382,13 +356,11 @@
+ got_huff_bits:
+
+ /* Figure how how many bits are in next symbol and unget extras */
+-
+ i = hufGroup->minLen;
+ while (j > limit[i]) ++i;
+ bd->inbufBitCount += (hufGroup->maxLen - i);
+
+ /* Huffman decode value to get nextSym (with bounds checking) */
+-
+ if (i > hufGroup->maxLen)
+ return RETVAL_DATA_ERROR;
+ j = (j >> (hufGroup->maxLen - i)) - base[i];
+@@ -400,11 +372,9 @@
+ byte, or a repeated run of the most recent literal byte. First,
+ check if nextSym indicates a repeated run, and if so loop collecting
+ how many times to repeat the last literal. */
+-
+ if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */
+
+ /* If this is the start of a new run, zero out counter */
+-
+ if (!runPos) {
+ runPos = 1;
+ t = 0;
+@@ -417,7 +387,6 @@
+ the basic or 0/1 method (except all bits 0, which would use no
+ symbols, but a run of length 0 doesn't mean anything in this
+ context). Thus space is saved. */
+-
+ t += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
+ if (runPos < dbufSize) runPos <<= 1;
+ goto end_of_huffman_loop;
+@@ -427,7 +396,6 @@
+ how many times to repeat the last literal, so append that many
+ copies to our buffer of decoded symbols (dbuf) now. (The last
+ literal used is the one@the head of the mtfSymbol array.) */
+-
+ if (runPos) {
+ runPos = 0;
+ if (dbufCount + t >= dbufSize) return RETVAL_DATA_ERROR;
+@@ -438,7 +406,6 @@
+ }
+
+ /* Is this the terminating symbol? */
+-
+ if (nextSym > symTotal) break;
+
+ /* At this point, nextSym indicates a new literal character. Subtract
+@@ -448,7 +415,6 @@
+ first symbol in the mtf array, position 0, would have been handled
+ as part of a run above. Therefore 1 unused mtf position minus
+ 2 non-literal nextSym values equals -1.) */
+-
+ if (dbufCount >= dbufSize) return RETVAL_DATA_ERROR;
+ i = nextSym - 1;
+ uc = mtfSymbol[i];
+@@ -457,7 +423,6 @@
+ * small number of symbols, and are bound by 256 in any case, using
+ * memmove here would typically be bigger and slower due to function
+ * call overhead and other assorted setup costs. */
+-
+ do {
+ mtfSymbol[i] = mtfSymbol[i-1];
+ } while (--i);
+@@ -465,13 +430,11 @@
+ uc = symToByte[uc];
+
+ /* We have our literal byte. Save it into dbuf. */
+-
+ byteCount[uc]++;
+ dbuf[dbufCount++] = (unsigned)uc;
+
+ /* Skip group initialization if we're not done with this group. Done
+ * this way to avoid compiler warning. */
+-
+ end_of_huffman_loop:
+ if (symCount--) goto continue_this_group;
+ }
+@@ -484,7 +447,6 @@
+ */
+
+ /* Turn byteCount into cumulative occurrence counts of 0 to n-1. */
+-
+ j = 0;
+ for (i = 0; i < 256; i++) {
+ k = j + byteCount[i];
+@@ -493,7 +455,6 @@
+ }
+
+ /* Figure out what order dbuf would be in if we sorted it. */
+-
+ for (i = 0; i < dbufCount; i++) {
+ uc = (unsigned char)(dbuf[i] & 0xff);
+ dbuf[byteCount[uc]] |= (i << 8);
+@@ -503,11 +464,10 @@
+ /* Decode first byte by hand to initialize "previous" byte. Note that it
+ doesn't get output, and if the first three characters are identical
+ it doesn't qualify as a run (hence writeRunCountdown=5). */
+-
+ if (dbufCount) {
+ if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR;
+ bd->writePos = dbuf[origPtr];
+- bd->writeCurrent = (unsigned char)(bd->writePos & 0xff);
++ bd->writeCurrent = (unsigned char)(bd->writePos & 0xff);
+ bd->writePos >>= 8;
+ bd->writeRunCountdown = 5;
+ }
+@@ -522,7 +482,6 @@
+ error (all errors are negative numbers). If out_fd!=-1, outbuf and len
+ are ignored, data is written to out_fd and return is RETVAL_OK or error.
+ */
+-
+ int read_bunzip(bunzip_data *bd, char *outbuf, int len)
+ {
+ const unsigned *dbuf;
+@@ -539,19 +498,15 @@
+ /* We will always have pending decoded data to write into the output
+ buffer unless this is the very first call (in which case we haven't
+ Huffman-decoded a block into the intermediate buffer yet). */
+-
+ if (bd->writeCopies) {
+
+ /* Inside the loop, writeCopies means extra copies (beyond 1) */
+-
+ --bd->writeCopies;
+
+ /* Loop outputting bytes */
+-
+ for (;;) {
+
+ /* If the output buffer is full, snapshot state and return */
+-
+ if (gotcount >= len) {
+ bd->writePos = pos;
+ bd->writeCurrent = current;
+@@ -560,13 +515,11 @@
+ }
+
+ /* Write next byte into output buffer, updating CRC */
+-
+ outbuf[gotcount++] = current;
+ bd->writeCRC = (bd->writeCRC << 8)
+- ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current];
++ ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current];
+
+ /* Loop now if we're outputting multiple copies of this byte */
+-
+ if (bd->writeCopies) {
+ --bd->writeCopies;
+ continue;
+@@ -582,35 +535,29 @@
+ /* After 3 consecutive copies of the same byte, the 4th
+ * is a repeat count. We count down from 4 instead
+ * of counting up because testing for non-zero is faster */
+-
+ if (--bd->writeRunCountdown) {
+ if (current != previous)
+ bd->writeRunCountdown = 4;
+ } else {
+
+ /* We have a repeated run, this byte indicates the count */
+-
+ bd->writeCopies = current;
+ current = previous;
+ bd->writeRunCountdown = 5;
+
+ /* Sometimes there are just 3 bytes (run length 0) */
+-
+ if (!bd->writeCopies) goto decode_next_byte;
+
+ /* Subtract the 1 copy we'd output anyway to get extras */
+-
+ --bd->writeCopies;
+ }
+ }
+
+ /* Decompression of this block completed successfully */
+-
+ bd->writeCRC = ~bd->writeCRC;
+ bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ bd->writeCRC;
+
+ /* If this block had a CRC error, force file level CRC error. */
+-
+ if (bd->writeCRC != bd->headerCRC) {
+ bd->totalCRC = bd->headerCRC + 1;
+ return RETVAL_LAST_BLOCK;
+@@ -619,7 +566,6 @@
+
+ /* Refill the intermediate buffer by Huffman-decoding next block of input */
+ /* (previous is just a convenient unused temp variable here) */
+-
+ previous = get_next_block(bd);
+ if (previous) {
+ bd->writeCount = previous;
+@@ -631,7 +577,6 @@
+ goto decode_next_byte;
+ }
+
+-
+ /* Allocate the structure, read file header. If in_fd==-1, inbuf must contain
+ a complete bunzip file (len bytes long). If in_fd!=-1, inbuf and len are
+ ignored, and data is read from file handle into temporary buffer. */
+@@ -639,7 +584,6 @@
+ /* Because bunzip2 is used for help text unpacking, and because bb_show_usage()
+ should work for NOFORK applets too, we must be extremely careful to not leak
+ any allocations! */
+-
+ int start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf,
+ int len)
+ {
+@@ -650,16 +594,13 @@
+ };
+
+ /* Figure out how much data to allocate */
+-
+ i = sizeof(bunzip_data);
+ if (in_fd != -1) i += IOBUF_SIZE;
+
+ /* Allocate bunzip_data. Most fields initialize to zero. */
+-
+ bd = *bdp = xzalloc(i);
+
+ /* Setup input buffer */
+-
+ bd->in_fd = in_fd;
+ if (-1 == in_fd) {
+ /* in this case, bd->inbuf is read-only */
+@@ -669,22 +610,18 @@
+ bd->inbuf = (unsigned char *)(bd + 1);
+
+ /* Init the CRC32 table (big endian) */
+-
+ crc32_filltable(bd->crc32Table, 1);
+
+ /* Setup for I/O error handling via longjmp */
+-
+ i = setjmp(bd->jmpbuf);
+ if (i) return i;
+
+ /* Ensure that file starts with "BZh['1'-'9']." */
+-
+ i = get_bits(bd, 32);
+ if ((unsigned)(i - BZh0 - 1) >= 9) return RETVAL_NOT_BZIP_DATA;
+
+- /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
++ /* Fourth byte (ascii '1'-'9') indicates block size in units of 100k of
+ uncompressed data. Allocate intermediate buffer for block. */
+-
+ bd->dbufSize = 100000 * (i - BZh0);
+
+ /* Cannot use xmalloc - may leak bd in NOFORK case! */
+@@ -704,7 +641,6 @@
+
+
+ /* Decompress src_fd to dst_fd. Stops at end of bzip data, not end of file. */
+-
+ USE_DESKTOP(long long) int
+ unpack_bz2_stream(int src_fd, int dst_fd)
+ {
+@@ -761,9 +697,9 @@
+ char c;
+
+ if (i < 0)
+- fprintf(stderr,"%s\n", bunzip_errors[-i]);
++ fprintf(stderr, "%s\n", bunzip_errors[-i]);
+ else if (read(STDIN_FILENO, &c, 1))
+- fprintf(stderr,"Trailing garbage ignored\n");
++ fprintf(stderr, "Trailing garbage ignored\n");
+ return -i;
+ }
+ #endif
Added: trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-ip.patch 2008-06-28 20:53:52 UTC (rev 22551)
@@ -0,0 +1,12 @@
+--- busybox-1.11.0/libbb/print_flags.c Wed Jun 25 14:51:32 2008
++++ busybox-1.11.0-ip/libbb/print_flags.c Fri Jun 27 00:39:16 2008
+@@ -19,8 +19,8 @@
+ labels);
+ need_separator = separator;
+ flags &= ~ *masks;
+- masks++;
+ }
++ masks++;
+ labels += strlen(labels) + 1;
+ }
+ return flags;
Added: trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.0-vi.patch 2008-06-28 20:53:52 UTC (rev 22551)
@@ -0,0 +1,11 @@
+--- busybox-1.11.0/editors/vi.c Wed Jun 25 14:51:37 2008
++++ busybox-1.11.0-vi/editors/vi.c Fri Jun 27 06:06:54 2008
+@@ -1894,7 +1894,7 @@
+ p = new_text + (p - text);
+ text = new_text;
+ }
+- memmove(p + size, p, end - p);
++ memmove(p + size, p, end - size - p);
+ memset(p, ' ', size); // clear new hole
+ file_modified++;
+ return p;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 12:46 ` sjhill at realitydiluted.com
2008-06-27 12:53 ` Bernhard Fischer
@ 2008-06-27 14:07 ` Peter Korsgaard
1 sibling, 0 replies; 161+ messages in thread
From: Peter Korsgaard @ 2008-06-27 14:07 UTC (permalink / raw)
To: buildroot
>>>>> "sjhill" == sjhill <sjhill@realitydiluted.com> writes:
[resent with stripped to: to please mailman
]
Hi,
>> > Daniel> I use buildroot actively in my company and have kept up to
>> > Daniel> date pretty well. However we are still using busybox 1.2.2.1
>>
>> And what's the reason for you doing this? Do you like huge .bss and just
>> don't want to benefit from the improvements that went into busybox
>> during the last years?
>>
sjhill> Because some applets work in 1.2.2.1 that don't in newer
sjhill> versions, like telnetd for example.
Ohh, what's the problem? I don't use it myself, but openwrt afaik uses
it on 1.8.x
>> If there are regressions (something worked with 1.2.2.1 but fails with
>> 1.11.0) no matter if they are behavioural or size-regressions, then you
>> would be better off to report those to the busybox list.
>>
sjhill> Some of us live in the real world where once we ship a
sjhill> product and start providing updates, it becomes cost
sjhill> prohibitive to requalify all the software on a platform to
sjhill> make sure everything still plays together.
So I guess you freeze your buildroot snapshot as well?
A missing 1.2.2.1 should only be a problem for people starting new
development and wanting to use 1.2.2.1 (which they shouldn't) - right?
>> >So you are still doing active development (E.G. buildroot stuff) on a
>> >project where you cannot change the busybox version?
>> >
>> > Daniel> So I vote for not removing just deprecating :-)
>> >
>> >Ok, anyone still using 1.6 .. 1.8?
>>
sjhill> I vote for deprecating.
Ok, noted.
But this is bigger than just busybox ofcause - It also goes for all
other packages.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 12:49 ` Daniel Laird
@ 2008-06-27 13:19 ` Peter Korsgaard
0 siblings, 0 replies; 161+ messages in thread
From: Peter Korsgaard @ 2008-06-27 13:19 UTC (permalink / raw)
To: buildroot
>>>>> "Daniel" == Daniel Laird <daniel.j.laird@nxp.com> writes:
Hi,
Daniel> I did not raise the issue on mailing lists as I am trying to
Daniel> move compilers and thus make the problem go away. However
Daniel> that takes time and I would rather that buildroot marked
Daniel> things as deprecated for now instead of removing support.
Ok, noted - Nothing keeps you from continuing to use your old (stable)
buildroot snapshot no matter what we do to trunk ofcause.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 12:46 ` sjhill at realitydiluted.com
@ 2008-06-27 12:53 ` Bernhard Fischer
2008-06-27 14:07 ` Peter Korsgaard
1 sibling, 0 replies; 161+ messages in thread
From: Bernhard Fischer @ 2008-06-27 12:53 UTC (permalink / raw)
To: buildroot
On Fri, Jun 27, 2008 at 07:46:53AM -0500, sjhill at realitydiluted.com wrote:
>> >
>> > Daniel> I use buildroot actively in my company and have kept up to
>> > Daniel> date pretty well. However we are still using busybox 1.2.2.1
>>
>> And what's the reason for you doing this? Do you like huge .bss and just
>> don't want to benefit from the improvements that went into busybox
>> during the last years?
>>
>Because some applets work in 1.2.2.1 that don't in newer versions, like
>telnetd for example.
>
>> If there are regressions (something worked with 1.2.2.1 but fails with
>> 1.11.0) no matter if they are behavioural or size-regressions, then you
>> would be better off to report those to the busybox list.
>>
>Some of us live in the real world where once we ship a product and start
Come on, Steven. "Real" world doesn't mean you are prohibited to report
bugs if you encounter them.
>providing updates, it becomes cost prohibitive to requalify all the
>software on a platform to make sure everything still plays together.
Of course. But if you know that something broke then it would be nice to
report this brokenness so that it can be fixed.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 12:00 ` Bernhard Fischer
2008-06-27 12:46 ` sjhill at realitydiluted.com
@ 2008-06-27 12:49 ` Daniel Laird
2008-06-27 13:19 ` Peter Korsgaard
1 sibling, 1 reply; 161+ messages in thread
From: Daniel Laird @ 2008-06-27 12:49 UTC (permalink / raw)
To: buildroot
The main reason I do this is that I use ELDK-4.0 for part of the system.
Changing the compiler for that part of the system is not possible(easy) due
to prebuilt binaries.
However ELDK-4.0 creates a problem with busybox 1.9.X (I will try again with
1.10.X and 1.11.X). It incorrectly strips some symbol (xstroll if I
remember) The end result being that busybox will not start as there is an
undefined symbol. (init fails)
The problem does not exist in 1.2.2.1 and does not exist if I use GCC4.2.1
based compilers. However I cannot easily replace compiler so for now have
stuck with 1.2.2.1.
I did not raise the issue on mailing lists as I am trying to move compilers
and thus make the problem go away. However that takes time and I would
rather that buildroot marked things as deprecated for now instead of
removing support.
Cheers
Dan
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-busybox-tp18127574p18154265.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 12:00 ` Bernhard Fischer
@ 2008-06-27 12:46 ` sjhill at realitydiluted.com
2008-06-27 12:53 ` Bernhard Fischer
2008-06-27 14:07 ` Peter Korsgaard
2008-06-27 12:49 ` Daniel Laird
1 sibling, 2 replies; 161+ messages in thread
From: sjhill at realitydiluted.com @ 2008-06-27 12:46 UTC (permalink / raw)
To: buildroot
> >
> > Daniel> I use buildroot actively in my company and have kept up to
> > Daniel> date pretty well. However we are still using busybox 1.2.2.1
>
> And what's the reason for you doing this? Do you like huge .bss and just
> don't want to benefit from the improvements that went into busybox
> during the last years?
>
Because some applets work in 1.2.2.1 that don't in newer versions, like
telnetd for example.
> If there are regressions (something worked with 1.2.2.1 but fails with
> 1.11.0) no matter if they are behavioural or size-regressions, then you
> would be better off to report those to the busybox list.
>
Some of us live in the real world where once we ship a product and start
providing updates, it becomes cost prohibitive to requalify all the
software on a platform to make sure everything still plays together.
> >So you are still doing active development (E.G. buildroot stuff) on a
> >project where you cannot change the busybox version?
> >
> > Daniel> So I vote for not removing just deprecating :-)
> >
> >Ok, anyone still using 1.6 .. 1.8?
>
I vote for deprecating.
-Steve
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 9:20 ` Peter Korsgaard
@ 2008-06-27 12:00 ` Bernhard Fischer
2008-06-27 12:46 ` sjhill at realitydiluted.com
2008-06-27 12:49 ` Daniel Laird
0 siblings, 2 replies; 161+ messages in thread
From: Bernhard Fischer @ 2008-06-27 12:00 UTC (permalink / raw)
To: buildroot
On Fri, Jun 27, 2008 at 11:20:33AM +0200, Peter Korsgaard wrote:
>>>>>> "Daniel" == Daniel Laird <daniel.j.laird@nxp.com> writes:
>
>Hi,
>
> Daniel> I use buildroot actively in my company and have kept up to
> Daniel> date pretty well. However we are still using busybox 1.2.2.1
And what's the reason for you doing this? Do you like huge .bss and just
don't want to benefit from the improvements that went into busybox
during the last years?
If there are regressions (something worked with 1.2.2.1 but fails with
1.11.0) no matter if they are behavioural or size-regressions, then you
would be better off to report those to the busybox list.
> Daniel> in some cases. Marking as deprecated is fine, removing
> Daniel> completely would mean me having to hold local patches to keep
> Daniel> the ability to upgrade buildroot yet not change busybox
> Daniel> versions.
>
>So you are still doing active development (E.G. buildroot stuff) on a
>project where you cannot change the busybox version?
>
> Daniel> So I vote for not removing just deprecating :-)
>
>Ok, anyone still using 1.6 .. 1.8?
There is only one valid reason to keep the last version of a given x.y
series: so that people can easily report regressions.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-27 9:05 ` Daniel Laird
@ 2008-06-27 9:20 ` Peter Korsgaard
2008-06-27 12:00 ` Bernhard Fischer
0 siblings, 1 reply; 161+ messages in thread
From: Peter Korsgaard @ 2008-06-27 9:20 UTC (permalink / raw)
To: buildroot
>>>>> "Daniel" == Daniel Laird <daniel.j.laird@nxp.com> writes:
Hi,
Daniel> I use buildroot actively in my company and have kept up to
Daniel> date pretty well. However we are still using busybox 1.2.2.1
Daniel> in some cases. Marking as deprecated is fine, removing
Daniel> completely would mean me having to hold local patches to keep
Daniel> the ability to upgrade buildroot yet not change busybox
Daniel> versions.
So you are still doing active development (E.G. buildroot stuff) on a
project where you cannot change the busybox version?
Daniel> So I vote for not removing just deprecating :-)
Ok, anyone still using 1.6 .. 1.8?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-26 6:58 ` Peter Korsgaard
@ 2008-06-27 9:05 ` Daniel Laird
2008-06-27 9:20 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: Daniel Laird @ 2008-06-27 9:05 UTC (permalink / raw)
To: buildroot
jacmet wrote:
>
>>>>>> "jacmet" == jacmet <jacmet@uclibc.org> writes:
>
> jacmet> Author: jacmet
> jacmet> Date: 2008-06-25 23:51:11 -0700 (Wed, 25 Jun 2008)
> jacmet> New Revision: 22514
>
> jacmet> Log:
> jacmet> busybox: mark old versions as deprecated
>
> I would like to get rid of the ancient 1.2.1 .. 1.8 versions - Any
> objections to me removing them completely?
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
>
I use buildroot actively in my company and have kept up to date pretty well.
However we are still using busybox 1.2.2.1 in some cases. Marking as
deprecated is fine, removing completely would mean me having to hold local
patches to keep the ability to upgrade buildroot yet not change busybox
versions.
So I vote for not removing just deprecating :-)
Cheers
Dan
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-busybox-tp18127574p18151015.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-06-26 6:51 jacmet at uclibc.org
@ 2008-06-26 6:58 ` Peter Korsgaard
2008-06-27 9:05 ` Daniel Laird
0 siblings, 1 reply; 161+ messages in thread
From: Peter Korsgaard @ 2008-06-26 6:58 UTC (permalink / raw)
To: buildroot
>>>>> "jacmet" == jacmet <jacmet@uclibc.org> writes:
jacmet> Author: jacmet
jacmet> Date: 2008-06-25 23:51:11 -0700 (Wed, 25 Jun 2008)
jacmet> New Revision: 22514
jacmet> Log:
jacmet> busybox: mark old versions as deprecated
I would like to get rid of the ancient 1.2.1 .. 1.8 versions - Any
objections to me removing them completely?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-26 6:51 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-26 6:51 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-25 23:51:16 -0700 (Wed, 25 Jun 2008)
New Revision: 22515
Log:
busybox: add 1.11.x
Added:
trunk/buildroot/package/busybox/busybox-1.11.x.config
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-06-26 06:51:11 UTC (rev 22514)
+++ trunk/buildroot/package/busybox/Config.in 2008-06-26 06:51:16 UTC (rev 22515)
@@ -39,6 +39,9 @@
config BR2_BUSYBOX_VERSION_1_10_X
bool "BusyBox 1.10.x"
+ config BR2_BUSYBOX_VERSION_1_11_X
+ bool "BusyBox 1.11.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -52,8 +55,8 @@
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
+ default "1.11.0" if BR2_BUSYBOX_VERSION_1_11_X
-
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
depends on BR2_PACKAGE_BUSYBOX
@@ -77,6 +80,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_8_X
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_9_X
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X
+ default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.11.x.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.11.x.config (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.11.x.config 2008-06-26 06:51:16 UTC (rev 22515)
@@ -0,0 +1,851 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.11.0
+# Thu Jun 26 08:43:59 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_HAVE_RPC is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_LZMA=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=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=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=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=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_DEPMOD is not set
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+# CONFIG_FEATURE_DEPMOD_ALIAS is not set
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+CONFIG_FEATURE_INSMOD_LOAD_MAP=y
+CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+# CONFIG_FDISK is not set
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+CONFIG_FEATURE_MDEV_EXEC=y
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+CONFIG_DEBUG_CROND_OPTION=y
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TTYSIZE is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_DHCPRELAY=y
+CONFIG_APP_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-26 6:51 jacmet at uclibc.org
2008-06-26 6:58 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-26 6:51 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-25 23:51:11 -0700 (Wed, 25 Jun 2008)
New Revision: 22514
Log:
busybox: mark old versions as deprecated
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-06-26 06:50:59 UTC (rev 22513)
+++ trunk/buildroot/package/busybox/Config.in 2008-06-26 06:51:11 UTC (rev 22514)
@@ -26,14 +26,15 @@
config BR2_BUSYBOX_VERSION_1_7_X
bool "BusyBox 1.7.x"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_8_X
bool "BusyBox 1.8.x"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_9_X
bool "BusyBox 1.9.x"
+ depends on BR2_DEPRECATED || BR2_RECENT
config BR2_BUSYBOX_VERSION_1_10_X
bool "BusyBox 1.10.x"
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-26 6:51 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-26 6:51 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-25 23:50:59 -0700 (Wed, 25 Jun 2008)
New Revision: 22513
Log:
buxybox: bump 1.10.x version
Removed:
trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch
trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-06-26 06:50:44 UTC (rev 22512)
+++ trunk/buildroot/package/busybox/Config.in 2008-06-26 06:50:59 UTC (rev 22513)
@@ -50,7 +50,7 @@
default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
- default "1.10.3" if BR2_BUSYBOX_VERSION_1_10_X
+ default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
Deleted: trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch 2008-06-26 06:50:44 UTC (rev 22512)
+++ trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch 2008-06-26 06:50:59 UTC (rev 22513)
@@ -1,10 +0,0 @@
---- busybox-1.10.3/networking/tcpudp.c Sat Apr 19 06:03:13 2008
-+++ busybox-1.10.3-tcpudp/networking/tcpudp.c Fri Jun 13 11:38:54 2008
-@@ -31,6 +31,7 @@
-
- #include "libbb.h"
- /* Wants <limits.h> etc, thus included after libbb.h: */
-+#include <linux/types.h> /* for __be32 etc */
- #include <linux/netfilter_ipv4.h>
-
- // TODO: move into this file:
Deleted: trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch 2008-06-26 06:50:44 UTC (rev 22512)
+++ trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch 2008-06-26 06:50:59 UTC (rev 22513)
@@ -1,11 +0,0 @@
---- busybox-1.10.3/networking/udhcp/clientsocket.c Sat Apr 19 06:03:13 2008
-+++ busybox-1.10.3-udhcpc/networking/udhcp/clientsocket.c Fri Jun 20 16:48:32 2008
-@@ -76,7 +76,7 @@
- BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0),
- BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, SERVER_AND_CLIENT_PORTS, 0, 1), /* L3, L4 */
- /* returns */
-- BPF_STMT(BPF_RET|BPF_K, (~(uint32_t)0) ), /* L3: pass */
-+ BPF_STMT(BPF_RET|BPF_K, 0x0fffffff), /* L3: pass */
- BPF_STMT(BPF_RET|BPF_K, 0), /* L4: reject */
- };
- static const struct sock_fprog filter_prog = {
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-20 18:38 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-20 18:38 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-20 11:38:44 -0700 (Fri, 20 Jun 2008)
New Revision: 22459
Log:
budybox: 1.10.3 udhcpc fix
Added:
trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.3-udhcpc.patch 2008-06-20 18:38:44 UTC (rev 22459)
@@ -0,0 +1,11 @@
+--- busybox-1.10.3/networking/udhcp/clientsocket.c Sat Apr 19 06:03:13 2008
++++ busybox-1.10.3-udhcpc/networking/udhcp/clientsocket.c Fri Jun 20 16:48:32 2008
+@@ -76,7 +76,7 @@
+ BPF_STMT(BPF_LD|BPF_W|BPF_IND, 0),
+ BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, SERVER_AND_CLIENT_PORTS, 0, 1), /* L3, L4 */
+ /* returns */
+- BPF_STMT(BPF_RET|BPF_K, (~(uint32_t)0) ), /* L3: pass */
++ BPF_STMT(BPF_RET|BPF_K, 0x0fffffff), /* L3: pass */
+ BPF_STMT(BPF_RET|BPF_K, 0), /* L4: reject */
+ };
+ static const struct sock_fprog filter_prog = {
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-13 20:49 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-13 20:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-13 13:49:35 -0700 (Fri, 13 Jun 2008)
New Revision: 22330
Log:
busybox 1.10.3 patch
Added:
trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.3-tcpudp.patch 2008-06-13 20:49:35 UTC (rev 22330)
@@ -0,0 +1,10 @@
+--- busybox-1.10.3/networking/tcpudp.c Sat Apr 19 06:03:13 2008
++++ busybox-1.10.3-tcpudp/networking/tcpudp.c Fri Jun 13 11:38:54 2008
+@@ -31,6 +31,7 @@
+
+ #include "libbb.h"
+ /* Wants <limits.h> etc, thus included after libbb.h: */
++#include <linux/types.h> /* for __be32 etc */
+ #include <linux/netfilter_ipv4.h>
+
+ // TODO: move into this file:
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-06-07 7:46 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-06-07 7:46 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-07 00:46:01 -0700 (Sat, 07 Jun 2008)
New Revision: 22254
Log:
busybox 1.10.x: bump version
Removed:
trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch
trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch
trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch
trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch
trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch
trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch
trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/Config.in 2008-06-07 07:46:01 UTC (rev 22254)
@@ -50,7 +50,7 @@
default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
- default "1.10.2" if BR2_BUSYBOX_VERSION_1_10_X
+ default "1.10.3" if BR2_BUSYBOX_VERSION_1_10_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,87 +0,0 @@
---- busybox-1.10.2/libbb/udp_io.c Sat Apr 19 05:50:33 2008
-+++ busybox-1.10.2-dnsd/libbb/udp_io.c Thu May 22 19:40:32 2008
-@@ -36,11 +36,12 @@
- #else
- struct iovec iov[1];
- struct msghdr msg;
-- char cbuf[sizeof(struct in_pktinfo)
-+ union {
-+ char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
- #if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
-- | sizeof(struct in6_pktinfo) /* (a|b) is poor man's max(a,b) */
-+ char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
- #endif
-- ];
-+ } u;
- struct cmsghdr* cmsgptr;
-
- if (from->sa_family != AF_INET
-@@ -57,15 +58,15 @@
- iov[0].iov_base = buf;
- iov[0].iov_len = len;
-
-- memset(cbuf, 0, sizeof(cbuf));
-+ memset(&u, 0, sizeof(u));
-
- memset(&msg, 0, sizeof(msg));
- msg.msg_name = (void *)(struct sockaddr *)to; /* or compiler will annoy us */
- msg.msg_namelen = tolen;
- msg.msg_iov = iov;
- msg.msg_iovlen = 1;
-- msg.msg_control = cbuf;
-- msg.msg_controllen = sizeof(cbuf);
-+ msg.msg_control = &u;
-+ msg.msg_controllen = sizeof(u);
- msg.msg_flags = flags;
-
- cmsgptr = CMSG_FIRSTHDR(&msg);
-@@ -89,6 +90,8 @@
- pktptr->ipi6_addr = ((struct sockaddr_in6*)from)->sin6_addr;
- }
- #endif
-+ msg.msg_controllen = cmsgptr->cmsg_len;
-+
- return sendmsg(fd, &msg, flags);
- #endif
- }
-@@ -109,7 +112,9 @@
- struct iovec iov[1];
- union {
- char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
-+#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
- char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-+#endif
- } u;
- struct cmsghdr *cmsgptr;
- struct msghdr msg;
---- busybox-1.10.2/networking/dnsd.c Sat Apr 19 05:50:27 2008
-+++ busybox-1.10.2-dnsd/networking/dnsd.c Thu May 22 19:40:32 2008
-@@ -194,7 +194,8 @@
- for (i = 1; i <= (int)(d->name[0]); i++)
- if (tolower(qs[i]) != d->name[i])
- break;
-- if (i > (int)(d->name[0])) {
-+ if (i > (int)(d->name[0]) ||
-+ (d->name[0] == 1 && d->name[1] == '*')) {
- strcpy((char *)as, d->ip);
- #if DEBUG
- fprintf(stderr, " OK as:%s\n", as);
-@@ -202,7 +203,8 @@
- return 0;
- }
- } else if (type == REQ_PTR) { /* search by IP-address */
-- if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
-+ if ((d->name[0] != 1 || d->name[1] != '*') &&
-+ !strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
- strcpy((char *)as, d->name);
- return 0;
- }
-@@ -401,7 +403,7 @@
- r = process_packet(buf);
- if (r <= 0)
- continue;
-- send_to_from(udps, buf, r, 0, &to->u.sa, &from->u.sa, lsa->len);
-+ send_to_from(udps, buf, r, 0, &from->u.sa, &to->u.sa, lsa->len);
- }
- return 0;
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,29 +0,0 @@
---- busybox-1.10.2/procps/fuser.c Sat Apr 19 06:03:13 2008
-+++ busybox-1.10.2-fuser/procps/fuser.c Wed May 28 16:53:35 2008
-@@ -208,6 +208,7 @@
- return plist;
- }
-
-+/* NB: does chdir internally */
- static pid_list *scan_proc_pids(inode_list *ilist)
- {
- DIR *d;
-@@ -215,7 +216,8 @@
- pid_t pid;
- pid_list *plist;
-
-- d = opendir(".");
-+ xchdir("/proc");
-+ d = opendir("/proc");
- if (!d)
- return NULL;
-
-@@ -329,7 +331,7 @@
- pp++;
- }
-
-- plist = scan_proc_pids(ilist);
-+ plist = scan_proc_pids(ilist); /* changes dir to "/proc" */
-
- if (!plist)
- return EXIT_FAILURE;
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,57 +0,0 @@
---- busybox-1.10.2/shell/hush.c Sat Apr 19 05:50:31 2008
-+++ busybox-1.10.2-hush/shell/hush.c Mon May 26 00:32:40 2008
-@@ -699,9 +699,18 @@
- BLTIN(NULL, NULL, NULL)
- };
-
-+/* Signals are grouped, we handle them in batches */
-+static void set_misc_sighandler(void (*handler)(int))
-+{
-+ bb_signals(0
-+ + (1 << SIGINT)
-+ + (1 << SIGQUIT)
-+ + (1 << SIGTERM)
-+ , handler);
-+}
-+
- #if ENABLE_HUSH_JOB
-
--/* Signals are grouped, we handle them in batches */
- static void set_fatal_sighandler(void (*handler)(int))
- {
- bb_signals(0
-@@ -725,14 +734,6 @@
- + (1 << SIGTTOU)
- , handler);
- }
--static void set_misc_sighandler(void (*handler)(int))
--{
-- bb_signals(0
-- + (1 << SIGINT)
-- + (1 << SIGQUIT)
-- + (1 << SIGTERM)
-- , handler);
--}
- /* SIGCHLD is special and handled separately */
-
- static void set_every_sighandler(void (*handler)(int))
-@@ -815,7 +816,6 @@
-
- #define set_fatal_sighandler(handler) ((void)0)
- #define set_jobctrl_sighandler(handler) ((void)0)
--#define set_misc_sighandler(handler) ((void)0)
- #define hush_exit(e) exit(e)
-
- #endif /* JOB */
-@@ -3907,8 +3907,10 @@
- /* give up */
- interactive_fd = 0;
- }
-- if (interactive_fd)
-+ if (interactive_fd) {
- fcntl(interactive_fd, F_SETFD, FD_CLOEXEC);
-+ set_misc_sighandler(SIG_IGN);
-+ }
- }
- #endif
-
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,11 +0,0 @@
---- busybox-1.10.2/networking/libiproute/ip_parse_common_args.c Sat Apr 19 05:50:26 2008
-+++ busybox-1.10.2-ip/networking/libiproute/ip_parse_common_args.c Sat May 31 09:32:09 2008
-@@ -54,7 +54,7 @@
- break;
- }
- }
-- arg = index_in_strings(ip_common_commands, opt);
-+ arg = index_in_substrings(ip_common_commands, opt);
- if (arg < 0)
- bb_show_usage();
- if (arg == ARG_oneline) {
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,31 +0,0 @@
---- busybox-1.10.2/util-linux/mdev.c Thu May 8 17:22:48 2008
-+++ busybox-1.10.2-mdev/util-linux/mdev.c Sat May 24 18:43:40 2008
-@@ -72,8 +72,14 @@
- /* Determine device name, type, major and minor */
- device_name = bb_basename(path);
- /* http://kernel.org/doc/pending/hotplug.txt says that only
-- * "/sys/block/..." is for block devices. "sys/bus" etc is not! */
-- type = (strncmp(&path[5], "block/", 6) == 0 ? S_IFBLK : S_IFCHR);
-+ * "/sys/block/..." is for block devices. "/sys/bus" etc is not!
-+ * Since kernel 2.6.25 block devices are also in /sys/class/block. */
-+ /* TODO: would it be acceptable to just use strstr(path, "/block/")? */
-+ if (strncmp(&path[5], "class/block/"+6, 6) != 0
-+ && strncmp(&path[5], "class/block/", 12) != 0)
-+ type = S_IFCHR;
-+ else
-+ type = S_IFBLK;
-
- if (ENABLE_FEATURE_MDEV_CONF) {
- FILE *fp;
-@@ -172,8 +178,9 @@
- /* substitute %1..9 with off[1..9], if any */
- n = 0;
- s = val;
-- while (*s && *s++ == '%')
-- n++;
-+ while (*s)
-+ if (*s++ == '%')
-+ n++;
-
- p = alias = xzalloc(strlen(val) + n * strlen(device_name));
- s = val + 1;
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,22 +0,0 @@
---- busybox-1.10.2/networking/interface.c Sat Apr 19 05:50:27 2008
-+++ busybox-1.10.2-semicolon/networking/interface.c Thu May 15 21:40:04 2008
-@@ -223,7 +223,7 @@
- char *pos;
- unsigned int i;
-
-- if (!buff);
-+ if (!buff)
- buff = xmalloc(sizeof(struct sockaddr) * 3 + 1);
- pos = buff;
- for (i = 0; i < sizeof(struct sockaddr); i++) {
---- busybox-1.10.2/networking/isrv_identd.c Sat Apr 19 05:50:27 2008
-+++ busybox-1.10.2-semicolon/networking/isrv_identd.c Thu May 15 21:40:04 2008
-@@ -113,7 +113,7 @@
- strncpy(bogouser, argv[optind], sizeof(bogouser));
-
- /* Daemonize if no -f and no -i and no -w */
-- if (!(opt & OPT_fiw));
-+ if (!(opt & OPT_fiw))
- bb_daemonize_or_rexec(0, argv);
-
- /* Where to log in inetd modes? "Classic" inetd
Deleted: trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch 2008-06-07 05:19:31 UTC (rev 22253)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch 2008-06-07 07:46:01 UTC (rev 22254)
@@ -1,16 +0,0 @@
---- busybox-1.10.2/sysklogd/syslogd.c Sat Apr 19 05:50:29 2008
-+++ busybox-1.10.2-syslogd/sysklogd/syslogd.c Sat May 24 23:02:56 2008
-@@ -347,10 +347,11 @@
- sprintf(newFile, "%s.%d", G.logFilePath, i);
- if (i == 0) break;
- sprintf(oldFile, "%s.%d", G.logFilePath, --i);
-- xrename(oldFile, newFile);
-+ /* ignore errors - file might be missing */
-+ rename(oldFile, newFile);
- }
- /* newFile == "f.0" now */
-- xrename(G.logFilePath, newFile);
-+ rename(G.logFilePath, newFile);
- fl.l_type = F_UNLCK;
- fcntl(G.logFD, F_SETLKW, &fl);
- close(G.logFD);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-05-31 7:39 ` Cristian Ionescu-Idbohrn
@ 2008-05-31 12:59 ` Peter Korsgaard
0 siblings, 0 replies; 161+ messages in thread
From: Peter Korsgaard @ 2008-05-31 12:59 UTC (permalink / raw)
To: buildroot
>>>>> "Cristian" == Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> writes:
Hi,
Cristian> You missed one: fuser.
That one wasn't there on the 25th. It's added now together with the ip
patch.
Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-05-31 12:58 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-05-31 12:58 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-05-31 05:58:22 -0700 (Sat, 31 May 2008)
New Revision: 22148
Log:
busybox: additional 1.10.2 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch
trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-fuser.patch 2008-05-31 12:58:22 UTC (rev 22148)
@@ -0,0 +1,29 @@
+--- busybox-1.10.2/procps/fuser.c Sat Apr 19 06:03:13 2008
++++ busybox-1.10.2-fuser/procps/fuser.c Wed May 28 16:53:35 2008
+@@ -208,6 +208,7 @@
+ return plist;
+ }
+
++/* NB: does chdir internally */
+ static pid_list *scan_proc_pids(inode_list *ilist)
+ {
+ DIR *d;
+@@ -215,7 +216,8 @@
+ pid_t pid;
+ pid_list *plist;
+
+- d = opendir(".");
++ xchdir("/proc");
++ d = opendir("/proc");
+ if (!d)
+ return NULL;
+
+@@ -329,7 +331,7 @@
+ pp++;
+ }
+
+- plist = scan_proc_pids(ilist);
++ plist = scan_proc_pids(ilist); /* changes dir to "/proc" */
+
+ if (!plist)
+ return EXIT_FAILURE;
Added: trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-ip.patch 2008-05-31 12:58:22 UTC (rev 22148)
@@ -0,0 +1,11 @@
+--- busybox-1.10.2/networking/libiproute/ip_parse_common_args.c Sat Apr 19 05:50:26 2008
++++ busybox-1.10.2-ip/networking/libiproute/ip_parse_common_args.c Sat May 31 09:32:09 2008
+@@ -54,7 +54,7 @@
+ break;
+ }
+ }
+- arg = index_in_strings(ip_common_commands, opt);
++ arg = index_in_substrings(ip_common_commands, opt);
+ if (arg < 0)
+ bb_show_usage();
+ if (arg == ARG_oneline) {
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
2008-05-31 7:28 jacmet at uclibc.org
@ 2008-05-31 7:39 ` Cristian Ionescu-Idbohrn
2008-05-31 12:59 ` Peter Korsgaard
0 siblings, 1 reply; 161+ messages in thread
From: Cristian Ionescu-Idbohrn @ 2008-05-31 7:39 UTC (permalink / raw)
To: buildroot
On Sat, 31 May 2008, jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2008-05-31 00:28:04 -0700 (Sat, 31 May 2008)
> New Revision: 22137
>
> Log:
> busybox: 1.10.2 patches
>
>
> Added:
> trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch
> trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch
> trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch
> trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch
> trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch
You missed one: fuser.
Cheers,
--
Cristian
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-05-31 7:28 jacmet at uclibc.org
2008-05-31 7:39 ` Cristian Ionescu-Idbohrn
0 siblings, 1 reply; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-05-31 7:28 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-05-31 00:28:04 -0700 (Sat, 31 May 2008)
New Revision: 22137
Log:
busybox: 1.10.2 patches
Added:
trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch
trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch
trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch
trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch
trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-dnsd.patch 2008-05-31 07:28:04 UTC (rev 22137)
@@ -0,0 +1,87 @@
+--- busybox-1.10.2/libbb/udp_io.c Sat Apr 19 05:50:33 2008
++++ busybox-1.10.2-dnsd/libbb/udp_io.c Thu May 22 19:40:32 2008
+@@ -36,11 +36,12 @@
+ #else
+ struct iovec iov[1];
+ struct msghdr msg;
+- char cbuf[sizeof(struct in_pktinfo)
++ union {
++ char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
+ #if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
+- | sizeof(struct in6_pktinfo) /* (a|b) is poor man's max(a,b) */
++ char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+ #endif
+- ];
++ } u;
+ struct cmsghdr* cmsgptr;
+
+ if (from->sa_family != AF_INET
+@@ -57,15 +58,15 @@
+ iov[0].iov_base = buf;
+ iov[0].iov_len = len;
+
+- memset(cbuf, 0, sizeof(cbuf));
++ memset(&u, 0, sizeof(u));
+
+ memset(&msg, 0, sizeof(msg));
+ msg.msg_name = (void *)(struct sockaddr *)to; /* or compiler will annoy us */
+ msg.msg_namelen = tolen;
+ msg.msg_iov = iov;
+ msg.msg_iovlen = 1;
+- msg.msg_control = cbuf;
+- msg.msg_controllen = sizeof(cbuf);
++ msg.msg_control = &u;
++ msg.msg_controllen = sizeof(u);
+ msg.msg_flags = flags;
+
+ cmsgptr = CMSG_FIRSTHDR(&msg);
+@@ -89,6 +90,8 @@
+ pktptr->ipi6_addr = ((struct sockaddr_in6*)from)->sin6_addr;
+ }
+ #endif
++ msg.msg_controllen = cmsgptr->cmsg_len;
++
+ return sendmsg(fd, &msg, flags);
+ #endif
+ }
+@@ -109,7 +112,9 @@
+ struct iovec iov[1];
+ union {
+ char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
++#if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
+ char cmsg6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
++#endif
+ } u;
+ struct cmsghdr *cmsgptr;
+ struct msghdr msg;
+--- busybox-1.10.2/networking/dnsd.c Sat Apr 19 05:50:27 2008
++++ busybox-1.10.2-dnsd/networking/dnsd.c Thu May 22 19:40:32 2008
+@@ -194,7 +194,8 @@
+ for (i = 1; i <= (int)(d->name[0]); i++)
+ if (tolower(qs[i]) != d->name[i])
+ break;
+- if (i > (int)(d->name[0])) {
++ if (i > (int)(d->name[0]) ||
++ (d->name[0] == 1 && d->name[1] == '*')) {
+ strcpy((char *)as, d->ip);
+ #if DEBUG
+ fprintf(stderr, " OK as:%s\n", as);
+@@ -202,7 +203,8 @@
+ return 0;
+ }
+ } else if (type == REQ_PTR) { /* search by IP-address */
+- if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
++ if ((d->name[0] != 1 || d->name[1] != '*') &&
++ !strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
+ strcpy((char *)as, d->name);
+ return 0;
+ }
+@@ -401,7 +403,7 @@
+ r = process_packet(buf);
+ if (r <= 0)
+ continue;
+- send_to_from(udps, buf, r, 0, &to->u.sa, &from->u.sa, lsa->len);
++ send_to_from(udps, buf, r, 0, &from->u.sa, &to->u.sa, lsa->len);
+ }
+ return 0;
+ }
Added: trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-hush.patch 2008-05-31 07:28:04 UTC (rev 22137)
@@ -0,0 +1,57 @@
+--- busybox-1.10.2/shell/hush.c Sat Apr 19 05:50:31 2008
++++ busybox-1.10.2-hush/shell/hush.c Mon May 26 00:32:40 2008
+@@ -699,9 +699,18 @@
+ BLTIN(NULL, NULL, NULL)
+ };
+
++/* Signals are grouped, we handle them in batches */
++static void set_misc_sighandler(void (*handler)(int))
++{
++ bb_signals(0
++ + (1 << SIGINT)
++ + (1 << SIGQUIT)
++ + (1 << SIGTERM)
++ , handler);
++}
++
+ #if ENABLE_HUSH_JOB
+
+-/* Signals are grouped, we handle them in batches */
+ static void set_fatal_sighandler(void (*handler)(int))
+ {
+ bb_signals(0
+@@ -725,14 +734,6 @@
+ + (1 << SIGTTOU)
+ , handler);
+ }
+-static void set_misc_sighandler(void (*handler)(int))
+-{
+- bb_signals(0
+- + (1 << SIGINT)
+- + (1 << SIGQUIT)
+- + (1 << SIGTERM)
+- , handler);
+-}
+ /* SIGCHLD is special and handled separately */
+
+ static void set_every_sighandler(void (*handler)(int))
+@@ -815,7 +816,6 @@
+
+ #define set_fatal_sighandler(handler) ((void)0)
+ #define set_jobctrl_sighandler(handler) ((void)0)
+-#define set_misc_sighandler(handler) ((void)0)
+ #define hush_exit(e) exit(e)
+
+ #endif /* JOB */
+@@ -3907,8 +3907,10 @@
+ /* give up */
+ interactive_fd = 0;
+ }
+- if (interactive_fd)
++ if (interactive_fd) {
+ fcntl(interactive_fd, F_SETFD, FD_CLOEXEC);
++ set_misc_sighandler(SIG_IGN);
++ }
+ }
+ #endif
+
Added: trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-mdev.patch 2008-05-31 07:28:04 UTC (rev 22137)
@@ -0,0 +1,31 @@
+--- busybox-1.10.2/util-linux/mdev.c Thu May 8 17:22:48 2008
++++ busybox-1.10.2-mdev/util-linux/mdev.c Sat May 24 18:43:40 2008
+@@ -72,8 +72,14 @@
+ /* Determine device name, type, major and minor */
+ device_name = bb_basename(path);
+ /* http://kernel.org/doc/pending/hotplug.txt says that only
+- * "/sys/block/..." is for block devices. "sys/bus" etc is not! */
+- type = (strncmp(&path[5], "block/", 6) == 0 ? S_IFBLK : S_IFCHR);
++ * "/sys/block/..." is for block devices. "/sys/bus" etc is not!
++ * Since kernel 2.6.25 block devices are also in /sys/class/block. */
++ /* TODO: would it be acceptable to just use strstr(path, "/block/")? */
++ if (strncmp(&path[5], "class/block/"+6, 6) != 0
++ && strncmp(&path[5], "class/block/", 12) != 0)
++ type = S_IFCHR;
++ else
++ type = S_IFBLK;
+
+ if (ENABLE_FEATURE_MDEV_CONF) {
+ FILE *fp;
+@@ -172,8 +178,9 @@
+ /* substitute %1..9 with off[1..9], if any */
+ n = 0;
+ s = val;
+- while (*s && *s++ == '%')
+- n++;
++ while (*s)
++ if (*s++ == '%')
++ n++;
+
+ p = alias = xzalloc(strlen(val) + n * strlen(device_name));
+ s = val + 1;
Added: trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-semicolon.patch 2008-05-31 07:28:04 UTC (rev 22137)
@@ -0,0 +1,22 @@
+--- busybox-1.10.2/networking/interface.c Sat Apr 19 05:50:27 2008
++++ busybox-1.10.2-semicolon/networking/interface.c Thu May 15 21:40:04 2008
+@@ -223,7 +223,7 @@
+ char *pos;
+ unsigned int i;
+
+- if (!buff);
++ if (!buff)
+ buff = xmalloc(sizeof(struct sockaddr) * 3 + 1);
+ pos = buff;
+ for (i = 0; i < sizeof(struct sockaddr); i++) {
+--- busybox-1.10.2/networking/isrv_identd.c Sat Apr 19 05:50:27 2008
++++ busybox-1.10.2-semicolon/networking/isrv_identd.c Thu May 15 21:40:04 2008
+@@ -113,7 +113,7 @@
+ strncpy(bogouser, argv[optind], sizeof(bogouser));
+
+ /* Daemonize if no -f and no -i and no -w */
+- if (!(opt & OPT_fiw));
++ if (!(opt & OPT_fiw))
+ bb_daemonize_or_rexec(0, argv);
+
+ /* Where to log in inetd modes? "Classic" inetd
Added: trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.2-syslogd.patch 2008-05-31 07:28:04 UTC (rev 22137)
@@ -0,0 +1,16 @@
+--- busybox-1.10.2/sysklogd/syslogd.c Sat Apr 19 05:50:29 2008
++++ busybox-1.10.2-syslogd/sysklogd/syslogd.c Sat May 24 23:02:56 2008
+@@ -347,10 +347,11 @@
+ sprintf(newFile, "%s.%d", G.logFilePath, i);
+ if (i == 0) break;
+ sprintf(oldFile, "%s.%d", G.logFilePath, --i);
+- xrename(oldFile, newFile);
++ /* ignore errors - file might be missing */
++ rename(oldFile, newFile);
+ }
+ /* newFile == "f.0" now */
+- xrename(G.logFilePath, newFile);
++ rename(G.logFilePath, newFile);
+ fl.l_type = F_UNLCK;
+ fcntl(G.logFD, F_SETLKW, &fl);
+ close(G.logFD);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-05-09 10:01 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-05-09 10:01 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-05-09 03:00:59 -0700 (Fri, 09 May 2008)
New Revision: 21956
Log:
busybox: bump version
Removed:
trunk/buildroot/package/busybox/busybox-1.10.1-completion.patch
trunk/buildroot/package/busybox/busybox-1.10.1-echo.patch
trunk/buildroot/package/busybox/busybox-1.10.1-hppa.patch
trunk/buildroot/package/busybox/busybox-1.10.1-ioctl.patch
trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch
trunk/buildroot/package/busybox/busybox-1.10.1-pidof.patch
trunk/buildroot/package/busybox/busybox-1.10.1-ssd.patch
trunk/buildroot/package/busybox/busybox-1.10.1-tar.patch
trunk/buildroot/package/busybox/busybox-1.10.1-taskset.patch
trunk/buildroot/package/busybox/busybox-1.10.1-trylink.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Sorry, the patch is too large to include (1043 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=21956
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-05-05 17:17 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-05-05 17:17 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-05-05 10:17:00 -0700 (Mon, 05 May 2008)
New Revision: 21934
Log:
busybox: additional 1.10.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.10.1-echo.patch
trunk/buildroot/package/busybox/busybox-1.10.1-hppa.patch
trunk/buildroot/package/busybox/busybox-1.10.1-tar.patch
trunk/buildroot/package/busybox/busybox-1.10.1-trylink.patch
Modified:
trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.1-echo.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-echo.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-echo.patch 2008-05-05 17:17:00 UTC (rev 21934)
@@ -0,0 +1,38 @@
+--- busybox-1.10.1/coreutils/echo.c Sat Apr 19 05:50:32 2008
++++ busybox-1.10.1-echo/coreutils/echo.c Wed Apr 30 02:37:08 2008
+@@ -27,10 +27,8 @@
+
+ /* This is a NOFORK applet. Be very careful! */
+
+-/* argc is unused, but removing it precludes compiler from
+- * using call -> jump optimization */
++/* NB: can be used by shell even if not enabled as applet */
+
+-int echo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int echo_main(int argc ATTRIBUTE_UNUSED, char **argv)
+ {
+ const char *arg;
+@@ -110,15 +108,19 @@
+ }
+ #if !ENABLE_FEATURE_FANCY_ECHO
+ /* SUSv3 specifies that octal escapes must begin with '0'. */
+- if ( (((unsigned char)*arg) - '1') >= 7)
++ if ( ((int)(unsigned char)(*arg) - '0') >= 8) /* '8' or bigger */
+ #endif
+ {
+ /* Since SUSv3 mandates a first digit of 0, 4-digit octals
+ * of the form \0### are accepted. */
+- if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) {
+- arg++;
++ if (*arg == '0') {
++ /* NB: don't turn "...\0" into "...\" */
++ if (arg[1] && ((unsigned char)(arg[1]) - '0') < 8) {
++ arg++;
++ }
+ }
+- /* bb_process_escape_sequence can handle nul correctly */
++ /* bb_process_escape_sequence handles NUL correctly
++ * ("...\" case). */
+ c = bb_process_escape_sequence(&arg);
+ }
+ }
Added: trunk/buildroot/package/busybox/busybox-1.10.1-hppa.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-hppa.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-hppa.patch 2008-05-05 17:17:00 UTC (rev 21934)
@@ -0,0 +1,37 @@
+--- busybox-1.10.1/include/libbb.h Sat Apr 19 05:50:36 2008
++++ busybox-1.10.1-hppa/include/libbb.h Mon Apr 28 10:34:36 2008
+@@ -288,20 +288,20 @@
+ * SIGSYS Bad argument to routine
+ * SIGTRAP Trace/breakpoint trap
+ */
+- BB_FATAL_SIGS = 0
+- + (1 << SIGHUP)
+- + (1 << SIGINT)
+- + (1 << SIGTERM)
+- + (1 << SIGPIPE) // Write to pipe with no readers
+- + (1 << SIGQUIT) // Quit from keyboard
+- + (1 << SIGABRT) // Abort signal from abort(3)
+- + (1 << SIGALRM) // Timer signal from alarm(2)
+- + (1 << SIGVTALRM) // Virtual alarm clock
+- + (1 << SIGXCPU) // CPU time limit exceeded
+- + (1 << SIGXFSZ) // File size limit exceeded
+- + (1 << SIGUSR1) // Yes kids, these are also fatal!
+- + (1 << SIGUSR2)
+- + 0,
++ BB_FATAL_SIGS = (int)(0
++ + (1LL << SIGHUP)
++ + (1LL << SIGINT)
++ + (1LL << SIGTERM)
++ + (1LL << SIGPIPE) // Write to pipe with no readers
++ + (1LL << SIGQUIT) // Quit from keyboard
++ + (1LL << SIGABRT) // Abort signal from abort(3)
++ + (1LL << SIGALRM) // Timer signal from alarm(2)
++ + (1LL << SIGVTALRM) // Virtual alarm clock
++ + (1LL << SIGXCPU) // CPU time limit exceeded
++ + (1LL << SIGXFSZ) // File size limit exceeded
++ + (1LL << SIGUSR1) // Yes kids, these are also fatal!
++ + (1LL << SIGUSR2)
++ + 0),
+ };
+ void bb_signals(int sigs, void (*f)(int));
+ /* Unlike signal() and bb_signals, sets handler with sigaction()
Modified: trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch 2008-05-05 14:48:13 UTC (rev 21933)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch 2008-05-05 17:17:00 UTC (rev 21934)
@@ -1,5 +1,5 @@
--- busybox-1.10.1/util-linux/mdev.c Sat Apr 19 05:50:39 2008
-+++ busybox-1.10.1-mdev/util-linux/mdev.c Sat Apr 26 17:15:54 2008
++++ busybox-1.10.1-mdev/util-linux/mdev.c Fri May 2 14:48:06 2008
@@ -12,6 +12,8 @@
#include "libbb.h"
#include "xregex.h"
@@ -40,7 +40,7 @@
char *command = NULL;
char *alias = NULL;
-@@ -42,156 +58,177 @@
+@@ -42,156 +58,178 @@
* also depend on path having writeable space after it.
*/
if (!delete) {
@@ -204,13 +204,19 @@
+ if (ENABLE_FEATURE_MDEV_RENAME) {
+ if (!next)
+ break;
-+ val = next;
-+ next = next_field(val);
-+ if (*val == '>') {
++ if (*next == '>') {
+#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
-+ /* substitute %1..9 with off[1..9], if any */
+ char *s, *p;
+ unsigned i, n;
++#endif
++ val = next;
++ next = next_field(val);
++#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
++ /* substitute %1..9 with off[1..9], if any */
++ n = 0;
++ s = val;
++ while (*s && *s++ == '%')
++ n++;
- /* parse GID */
- grp = getgrnam(str_gid);
@@ -218,11 +224,7 @@
- gid = grp->gr_gid;
- else
- gid = strtoul(str_gid, NULL, 10);
-+ n = 0;
-+ s = val;
-+ while (*s && *s++ == '%')
-+ n++;
-
+-
- } else if (field == 2) {
-
- /* Mode device permissions */
@@ -327,7 +329,7 @@
if (ENABLE_FEATURE_MDEV_RENAME)
unlink(device_name);
-@@ -208,39 +245,44 @@
+@@ -208,39 +246,44 @@
if (ENABLE_FEATURE_MDEV_RENAME && alias) {
char *dest;
@@ -389,7 +391,7 @@
}
/* File callback for /sys/ traversal */
-@@ -249,14 +291,15 @@
+@@ -249,14 +292,15 @@
void *userData,
int depth ATTRIBUTE_UNUSED)
{
@@ -408,7 +410,7 @@
make_device(scratch, 0);
return TRUE;
-@@ -287,12 +330,6 @@
+@@ -287,12 +331,6 @@
int cnt;
int firmware_fd, loading_fd, data_fd;
@@ -421,7 +423,7 @@
/* check for /lib/firmware/$FIRMWARE */
xchdir("/lib/firmware");
firmware_fd = xopen(firmware, O_RDONLY);
-@@ -304,16 +341,15 @@
+@@ -304,16 +342,15 @@
xchdir(sysfs_path);
for (cnt = 0; cnt < 30; ++cnt) {
loading_fd = open("loading", O_WRONLY);
@@ -444,7 +446,7 @@
goto out;
/* load firmware by `cat /lib/firmware/$FIRMWARE > /sys/$DEVPATH/data */
-@@ -324,9 +360,9 @@
+@@ -324,9 +361,9 @@
/* tell kernel result by `echo [0|-1] > /sys/$DEVPATH/loading` */
if (cnt > 0)
@@ -456,7 +458,7 @@
out:
if (ENABLE_FEATURE_CLEAN_UP) {
-@@ -341,16 +377,14 @@
+@@ -341,16 +378,14 @@
{
char *action;
char *env_path;
@@ -475,7 +477,7 @@
struct stat st;
xstat("/", &st);
-@@ -366,26 +400,27 @@
+@@ -366,26 +401,27 @@
fileAction, dirAction, temp, 0);
} else {
Added: trunk/buildroot/package/busybox/busybox-1.10.1-tar.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-tar.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-tar.patch 2008-05-05 17:17:00 UTC (rev 21934)
@@ -0,0 +1,24 @@
+--- busybox-1.10.1/archival/libunarchive/get_header_tar.c Sat Apr 19 05:50:29 2008
++++ busybox-1.10.1-tar/archival/libunarchive/get_header_tar.c Tue Apr 29 06:12:29 2008
+@@ -112,7 +112,7 @@
+ archive_handle->offset += 512;
+
+ /* If there is no filename its an empty header */
+- if (tar.name[0] == 0) {
++ if (tar.name[0] == 0 && tar.prefix[0] == 0) {
+ if (end) {
+ /* This is the second consecutive empty header! End of archive!
+ * Read until the end to empty the pipe from gz or bz2
+@@ -211,9 +211,12 @@
+ /* getOctal trashes subsequent field, therefore we call it
+ * on fields in reverse order */
+ if (tar.devmajor[0]) {
++ char t = tar.prefix[0];
++ /* we trash prefix[0] here, but we DO need it later! */
+ unsigned minor = GET_OCTAL(tar.devminor);
+ unsigned major = GET_OCTAL(tar.devmajor);
+ file_header->device = makedev(major, minor);
++ tar.prefix[0] = t;
+ }
+ file_header->link_target = NULL;
+ if (!linkname && parse_names && tar.linkname[0]) {
Added: trunk/buildroot/package/busybox/busybox-1.10.1-trylink.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-trylink.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-trylink.patch 2008-05-05 17:17:00 UTC (rev 21934)
@@ -0,0 +1,11 @@
+--- busybox-1.10.1/scripts/trylink Sat Apr 19 05:50:27 2008
++++ busybox-1.10.1-trylink/scripts/trylink Wed Apr 30 02:10:19 2008
+@@ -66,7 +66,7 @@
+ #if defined(__GLIBC__) && !defined(__UCLIBC__)
+ syntax error here
+ #endif
+- " >"$tempname"
++ " >"$tempname".c
+ if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
+ echo "$2";
+ else
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-04-29 6:53 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-04-29 6:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-04-28 23:53:55 -0700 (Mon, 28 Apr 2008)
New Revision: 21892
Log:
busybox: 1.10.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.10.1-completion.patch
trunk/buildroot/package/busybox/busybox-1.10.1-ioctl.patch
trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch
trunk/buildroot/package/busybox/busybox-1.10.1-pidof.patch
trunk/buildroot/package/busybox/busybox-1.10.1-ssd.patch
trunk/buildroot/package/busybox/busybox-1.10.1-taskset.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.1-completion.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-completion.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-completion.patch 2008-04-29 06:53:55 UTC (rev 21892)
@@ -0,0 +1,57 @@
+--- busybox-1.10.1/libbb/lineedit.c Sat Apr 19 05:50:33 2008
++++ busybox-1.10.1-completion/libbb/lineedit.c Thu Apr 24 06:45:39 2008
+@@ -518,8 +518,8 @@
+
+ for (i = 0; i < npaths; i++) {
+ dir = opendir(paths[i]);
+- if (!dir) /* Don't print an error */
+- continue;
++ if (!dir)
++ continue; /* don't print an error */
+
+ while ((next = readdir(dir)) != NULL) {
+ int len1;
+@@ -529,18 +529,21 @@
+ if (strncmp(str_found, pfind, strlen(pfind)))
+ continue;
+ /* not see .name without .match */
+- if (*str_found == '.' && *pfind == 0) {
++ if (*str_found == '.' && *pfind == '\0') {
+ if (NOT_LONE_CHAR(paths[i], '/') || str_found[1])
+ continue;
+ str_found = ""; /* only "/" */
+ }
+ found = concat_path_file(paths[i], str_found);
+- /* hmm, remover in progress? */
+- if (lstat(found, &st) < 0)
++ /* hmm, remove in progress? */
++ /* NB: stat() first so that we see is it a directory;
++ * but if that fails, use lstat() so that
++ * we still match dangling links */
++ if (stat(found, &st) && lstat(found, &st))
+ goto cont;
+ /* find with dirs? */
+ if (paths[i] != dirbuf)
+- strcpy(found, next->d_name); /* only name */
++ strcpy(found, next->d_name); /* only name */
+
+ len1 = strlen(found);
+ found = xrealloc(found, len1 + 2);
+@@ -548,7 +551,7 @@
+ found[len1+1] = '\0';
+
+ if (S_ISDIR(st.st_mode)) {
+- /* name is directory */
++ /* name is a directory */
+ if (found[len1-1] != '/') {
+ found[len1] = '/';
+ }
+@@ -566,7 +569,7 @@
+ closedir(dir);
+ }
+ if (paths != path1) {
+- free(paths[0]); /* allocated memory only in first member */
++ free(paths[0]); /* allocated memory is only in first member */
+ free(paths);
+ }
+ #undef dirbuf
Added: trunk/buildroot/package/busybox/busybox-1.10.1-ioctl.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-ioctl.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-ioctl.patch 2008-04-29 06:53:55 UTC (rev 21892)
@@ -0,0 +1,79 @@
+--- busybox-1.10.1/include/libbb.h Sat Apr 19 05:50:36 2008
++++ busybox-1.10.1-ioctl/include/libbb.h Thu Apr 24 06:45:03 2008
+@@ -995,16 +995,16 @@
+ /* NB: typically you want to pass fd 0, not 1. Think 'applet | grep something' */
+ int get_terminal_width_height(int fd, int *width, int *height);
+
+-int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...) __attribute__ ((format (printf, 4, 5)));
+-void ioctl_or_perror_and_die(int fd, int request, void *argp, const char *fmt,...) __attribute__ ((format (printf, 4, 5)));
++int ioctl_or_perror(int fd, unsigned request, void *argp, const char *fmt,...) __attribute__ ((format (printf, 4, 5)));
++void ioctl_or_perror_and_die(int fd, unsigned request, void *argp, const char *fmt,...) __attribute__ ((format (printf, 4, 5)));
+ #if ENABLE_IOCTL_HEX2STR_ERROR
+-int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name);
+-void bb_xioctl(int fd, int request, void *argp, const char *ioctl_name);
++int bb_ioctl_or_warn(int fd, unsigned request, void *argp, const char *ioctl_name);
++void bb_xioctl(int fd, unsigned request, void *argp, const char *ioctl_name);
+ #define ioctl_or_warn(fd,request,argp) bb_ioctl_or_warn(fd,request,argp,#request)
+ #define xioctl(fd,request,argp) bb_xioctl(fd,request,argp,#request)
+ #else
+-int bb_ioctl_or_warn(int fd, int request, void *argp);
+-void bb_xioctl(int fd, int request, void *argp);
++int bb_ioctl_or_warn(int fd, unsigned request, void *argp);
++void bb_xioctl(int fd, unsigned request, void *argp);
+ #define ioctl_or_warn(fd,request,argp) bb_ioctl_or_warn(fd,request,argp)
+ #define xioctl(fd,request,argp) bb_xioctl(fd,request,argp)
+ #endif
+--- busybox-1.10.1/libbb/xfuncs.c Sat Apr 19 05:50:33 2008
++++ busybox-1.10.1-ioctl/libbb/xfuncs.c Thu Apr 24 06:45:14 2008
+@@ -704,7 +704,7 @@
+ return ret;
+ }
+
+-void ioctl_or_perror_and_die(int fd, int request, void *argp, const char *fmt,...)
++void ioctl_or_perror_and_die(int fd, unsigned request, void *argp, const char *fmt,...)
+ {
+ va_list p;
+
+@@ -717,7 +717,7 @@
+ }
+ }
+
+-int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...)
++int ioctl_or_perror(int fd, unsigned request, void *argp, const char *fmt,...)
+ {
+ va_list p;
+ int ret = ioctl(fd, request, argp);
+@@ -731,7 +731,7 @@
+ }
+
+ #if ENABLE_IOCTL_HEX2STR_ERROR
+-int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name)
++int bb_ioctl_or_warn(int fd, unsigned request, void *argp, const char *ioctl_name)
+ {
+ int ret;
+
+@@ -740,13 +740,13 @@
+ bb_simple_perror_msg(ioctl_name);
+ return ret;
+ }
+-void bb_xioctl(int fd, int request, void *argp, const char *ioctl_name)
++void bb_xioctl(int fd, unsigned request, void *argp, const char *ioctl_name)
+ {
+ if (ioctl(fd, request, argp) < 0)
+ bb_simple_perror_msg_and_die(ioctl_name);
+ }
+ #else
+-int bb_ioctl_or_warn(int fd, int request, void *argp)
++int bb_ioctl_or_warn(int fd, unsigned request, void *argp)
+ {
+ int ret;
+
+@@ -755,7 +755,7 @@
+ bb_perror_msg("ioctl %#x failed", request);
+ return ret;
+ }
+-void bb_xioctl(int fd, int request, void *argp)
++void bb_xioctl(int fd, unsigned request, void *argp)
+ {
+ if (ioctl(fd, request, argp) < 0)
+ bb_perror_msg_and_die("ioctl %#x failed", request);
Added: trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-mdev.patch 2008-04-29 06:53:55 UTC (rev 21892)
@@ -0,0 +1,510 @@
+--- busybox-1.10.1/util-linux/mdev.c Sat Apr 19 05:50:39 2008
++++ busybox-1.10.1-mdev/util-linux/mdev.c Sat Apr 26 17:15:54 2008
+@@ -12,6 +12,8 @@
+ #include "libbb.h"
+ #include "xregex.h"
+
++#define ENABLE_FEATURE_MDEV_RENAME_REGEXP 1
++
+ struct globals {
+ int root_major, root_minor;
+ };
+@@ -21,7 +23,21 @@
+
+ #define MAX_SYSFS_DEPTH 3 /* prevent infinite loops in /sys symlinks */
+
++/* We use additional 64+ bytes in make_device() */
++#define SCRATCH_SIZE 80
++
++static char *next_field(char *s)
++{
++ char *end = skip_non_whitespace(s);
++ s = skip_whitespace(end);
++ *end = '\0';
++ if (*s == '\0')
++ s = NULL;
++ return s;
++}
++
+ /* mknod in /dev based on a path like "/sys/block/hda/hda1" */
++/* NB: "mdev -s" may call us many times, do not leak memory/fds! */
+ static void make_device(char *path, int delete)
+ {
+ const char *device_name;
+@@ -29,7 +45,7 @@
+ int mode = 0660;
+ uid_t uid = 0;
+ gid_t gid = 0;
+- char *temp = path + strlen(path);
++ char *dev_maj_min = path + strlen(path);
+ char *command = NULL;
+ char *alias = NULL;
+
+@@ -42,156 +58,177 @@
+ * also depend on path having writeable space after it.
+ */
+ if (!delete) {
+- strcat(path, "/dev");
+- len = open_read_close(path, temp + 1, 64);
+- *temp++ = 0;
++ strcpy(dev_maj_min, "/dev");
++ len = open_read_close(path, dev_maj_min + 1, 64);
++ *dev_maj_min++ = '\0';
+ if (len < 1) {
+- if (ENABLE_FEATURE_MDEV_EXEC)
+- /* no "dev" file, so just try to run script */
+- *temp = 0;
+- else
++ if (!ENABLE_FEATURE_MDEV_EXEC)
+ return;
++ /* no "dev" file, so just try to run script */
++ *dev_maj_min = '\0';
+ }
+ }
+
+ /* Determine device name, type, major and minor */
+ device_name = bb_basename(path);
+- type = (path[5] == 'c' ? S_IFCHR : S_IFBLK);
++ /* http://kernel.org/doc/pending/hotplug.txt says that only
++ * "/sys/block/..." is for block devices. "sys/bus" etc is not! */
++ type = (strncmp(&path[5], "block/", 6) == 0 ? S_IFBLK : S_IFCHR);
+
+ if (ENABLE_FEATURE_MDEV_CONF) {
+ FILE *fp;
+- char *line, *vline;
++ char *line, *val, *next;
+ unsigned lineno = 0;
+
+- /* If we have a config file, look up the user settings */
++ /* If we have config file, look up user settings */
+ fp = fopen_or_warn("/etc/mdev.conf", "r");
+ if (!fp)
+ goto end_parse;
+
+- while ((vline = line = xmalloc_getline(fp)) != NULL) {
+- int field;
++ while ((line = xmalloc_getline(fp)) != NULL) {
++ regmatch_t off[1+9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
+
+- /* A pristine copy for command execution. */
+- char *orig_line;
+- if (ENABLE_FEATURE_MDEV_EXEC)
+- orig_line = xstrdup(line);
+-
+ ++lineno;
++ trim(line);
++ if (!line[0])
++ goto next_line;
+
+- /* Three fields: regex, uid:gid, mode */
+- for (field = 0; field < (3 + ENABLE_FEATURE_MDEV_RENAME + ENABLE_FEATURE_MDEV_EXEC); ++field) {
++ /* Fields: regex uid:gid mode [alias] [cmd] */
+
+- /* Find a non-empty field */
+- char *val;
+- do {
+- val = strtok(vline, " \t");
+- vline = NULL;
+- } while (val && !*val);
+- if (!val) {
+- if (field)
+- break;
+- else
+- goto next_line;
+- }
++ /* 1st field: regex to match this device */
++ next = next_field(line);
++ {
++ regex_t match;
++ int result;
+
+- if (field == 0) {
++ /* Is this it? */
++ xregcomp(&match, line, REG_EXTENDED);
++ result = regexec(&match, device_name, ARRAY_SIZE(off), off, 0);
++ regfree(&match);
+
+- /* Regex to match this device */
+- regex_t match;
+- regmatch_t off;
+- int result;
++ //bb_error_msg("matches:");
++ //for (int i = 0; i < ARRAY_SIZE(off); i++) {
++ // if (off[i].rm_so < 0) continue;
++ // bb_error_msg("match %d: '%.*s'\n", i,
++ // (int)(off[i].rm_eo - off[i].rm_so),
++ // device_name + off[i].rm_so);
++ //}
+
+- /* Is this it? */
+- xregcomp(&match, val, REG_EXTENDED);
+- result = regexec(&match, device_name, 1, &off, 0);
+- regfree(&match);
++ /* If not this device, skip rest of line */
++ /* (regexec returns whole pattern as "range" 0) */
++ if (result || off[0].rm_so || off[0].rm_eo != strlen(device_name))
++ goto next_line;
++ }
+
+- /* If not this device, skip rest of line */
+- if (result || off.rm_so || off.rm_eo != strlen(device_name))
+- goto next_line;
++ /* This line matches: stop parsing the file
++ * after parsing the rest of fields */
+
+- } else if (field == 1) {
++ /* 2nd field: uid:gid - device ownership */
++ if (!next) /* field must exist */
++ bb_error_msg_and_die("bad line %u", lineno);
++ val = next;
++ next = next_field(val);
++ {
++ struct passwd *pass;
++ struct group *grp;
++ char *str_uid = val;
++ char *str_gid = strchrnul(val, ':');
+
+- /* uid:gid device ownership */
+- struct passwd *pass;
+- struct group *grp;
++ if (*str_gid)
++ *str_gid++ = '\0';
++ /* Parse UID */
++ pass = getpwnam(str_uid);
++ if (pass)
++ uid = pass->pw_uid;
++ else
++ uid = strtoul(str_uid, NULL, 10);
++ /* Parse GID */
++ grp = getgrnam(str_gid);
++ if (grp)
++ gid = grp->gr_gid;
++ else
++ gid = strtoul(str_gid, NULL, 10);
++ }
+
+- char *str_uid = val;
+- char *str_gid = strchr(val, ':');
+- if (str_gid)
+- *str_gid = '\0', ++str_gid;
++ /* 3rd field: mode - device permissions */
++ if (!next) /* field must exist */
++ bb_error_msg_and_die("bad line %u", lineno);
++ val = next;
++ next = next_field(val);
++ mode = strtoul(val, NULL, 8);
+
+- /* Parse UID */
+- pass = getpwnam(str_uid);
+- if (pass)
+- uid = pass->pw_uid;
+- else
+- uid = strtoul(str_uid, NULL, 10);
++ /* 4th field (opt): >alias */
++ if (ENABLE_FEATURE_MDEV_RENAME) {
++ if (!next)
++ break;
++ val = next;
++ next = next_field(val);
++ if (*val == '>') {
++#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
++ /* substitute %1..9 with off[1..9], if any */
++ char *s, *p;
++ unsigned i, n;
+
+- /* parse GID */
+- grp = getgrnam(str_gid);
+- if (grp)
+- gid = grp->gr_gid;
+- else
+- gid = strtoul(str_gid, NULL, 10);
++ n = 0;
++ s = val;
++ while (*s && *s++ == '%')
++ n++;
+
+- } else if (field == 2) {
+-
+- /* Mode device permissions */
+- mode = strtoul(val, NULL, 8);
+-
+- } else if (ENABLE_FEATURE_MDEV_RENAME && field == 3) {
+-
+- if (*val != '>')
+- ++field;
+- else
+- alias = xstrdup(val + 1);
+-
++ p = alias = xzalloc(strlen(val) + n * strlen(device_name));
++ s = val + 1;
++ while (*s) {
++ *p = *s;
++ if ('%' == *s) {
++ i = (s[1] - '0');
++ if (i <= 9 && off[i].rm_so >= 0) {
++ n = off[i].rm_eo - off[i].rm_so;
++ strncpy(p, device_name + off[i].rm_so, n);
++ p += n - 1;
++ s++;
++ }
++ }
++ p++;
++ s++;
++ }
++#else
++ alias = xstrdup(val + 1);
++#endif
+ }
++ }
+
+- if (ENABLE_FEATURE_MDEV_EXEC && field == 3 + ENABLE_FEATURE_MDEV_RENAME) {
++ /* The rest (opt): command to run */
++ if (!next)
++ break;
++ val = next;
++ if (ENABLE_FEATURE_MDEV_EXEC) {
++ const char *s = "@$*";
++ const char *s2 = strchr(s, *val);
+
+- /* Optional command to run */
+- const char *s = "@$*";
+- const char *s2 = strchr(s, *val);
++ if (!s2)
++ bb_error_msg_and_die("bad line %u", lineno);
+
+- if (!s2) {
+- /* Force error */
+- field = 1;
+- break;
+- }
+-
+- /* Correlate the position in the "@$*" with the delete
+- * step so that we get the proper behavior.
+- */
+- if ((s2 - s + 1) & (1 << delete))
+- command = xstrdup(orig_line + (val + 1 - line));
++ /* Correlate the position in the "@$*" with the delete
++ * step so that we get the proper behavior:
++ * @cmd: run on create
++ * $cmd: run on delete
++ * *cmd: run on both
++ */
++ if ((s2 - s + 1) /*1/2/3*/ & /*1/2*/ (1 + delete)) {
++ command = xstrdup(val + 1);
+ }
+ }
+-
+- /* Did everything parse happily? */
+- if (field <= 2)
+- bb_error_msg_and_die("bad line %u", lineno);
+-
++ /* end of field parsing */
++ break; /* we found matching line, stop */
+ next_line:
+ free(line);
+- if (ENABLE_FEATURE_MDEV_EXEC)
+- free(orig_line);
+- }
++ } /* end of "while line is read from /etc/mdev.conf" */
+
+- if (ENABLE_FEATURE_CLEAN_UP)
+- fclose(fp);
+-
+- end_parse: /* nothing */ ;
++ free(line); /* in case we used "break" to get here */
++ fclose(fp);
+ }
++ end_parse:
+
+- if (!delete) {
+- if (sscanf(temp, "%d:%d", &major, &minor) != 2) {
+- if (ENABLE_FEATURE_MDEV_EXEC)
+- goto skip_creation;
+- else
+- return;
+- }
++ if (!delete && sscanf(dev_maj_min, "%u:%u", &major, &minor) == 2) {
+
+ if (ENABLE_FEATURE_MDEV_RENAME)
+ unlink(device_name);
+@@ -208,39 +245,44 @@
+ if (ENABLE_FEATURE_MDEV_RENAME && alias) {
+ char *dest;
+
+- temp = strrchr(alias, '/');
+- if (temp) {
+- if (temp[1] != '\0')
+- /* given a file name, so rename it */
+- *temp = '\0';
++ /* ">bar/": rename to bar/device_name */
++ /* ">bar[/]baz": rename to bar[/]baz */
++ dest = strrchr(alias, '/');
++ if (dest) { /* ">bar/[baz]" ? */
++ *dest = '\0'; /* mkdir bar */
+ bb_make_directory(alias, 0755, FILEUTILS_RECUR);
+- dest = concat_path_file(alias, device_name);
+- } else
+- dest = alias;
++ *dest = '/';
++ if (dest[1] == '\0') { /* ">bar/" => ">bar/device_name" */
++ dest = alias;
++ alias = concat_path_file(alias, device_name);
++ free(dest);
++ }
++ }
+
+- rename(device_name, dest); // TODO: xrename?
+- symlink(dest, device_name);
++ /* recreate device_name as a symlink to moved device node */
++ if (rename(device_name, alias) == 0) {
++ symlink(alias, device_name);
++ }
+
+- if (alias != dest)
+- free(alias);
+- free(dest);
++ free(alias);
+ }
+ }
+- skip_creation: /* nothing */ ;
+ }
++
+ if (ENABLE_FEATURE_MDEV_EXEC && command) {
+- /* setenv will leak memory, so use putenv */
++ /* setenv will leak memory, use putenv/unsetenv/free */
+ char *s = xasprintf("MDEV=%s", device_name);
+ putenv(s);
+ if (system(command) == -1)
+- bb_perror_msg_and_die("cannot run %s", command);
++ bb_perror_msg_and_die("can't run '%s'", command);
+ s[4] = '\0';
+ unsetenv(s);
+ free(s);
+ free(command);
+ }
++
+ if (delete)
+- remove_file(device_name, FILEUTILS_FORCE);
++ unlink(device_name);
+ }
+
+ /* File callback for /sys/ traversal */
+@@ -249,14 +291,15 @@
+ void *userData,
+ int depth ATTRIBUTE_UNUSED)
+ {
+- size_t len = strlen(fileName) - 4;
++ size_t len = strlen(fileName) - 4; /* can't underflow */
+ char *scratch = userData;
+
+- if (strcmp(fileName + len, "/dev"))
++ /* len check is for paranoid reasons */
++ if (strcmp(fileName + len, "/dev") || len >= PATH_MAX)
+ return FALSE;
+
+ strcpy(scratch, fileName);
+- scratch[len] = 0;
++ scratch[len] = '\0';
+ make_device(scratch, 0);
+
+ return TRUE;
+@@ -287,12 +330,6 @@
+ int cnt;
+ int firmware_fd, loading_fd, data_fd;
+
+- /* check for $FIRMWARE from kernel */
+- /* XXX: dont bother: open(NULL) works same as open("no-such-file")
+- * if (!firmware)
+- * return;
+- */
+-
+ /* check for /lib/firmware/$FIRMWARE */
+ xchdir("/lib/firmware");
+ firmware_fd = xopen(firmware, O_RDONLY);
+@@ -304,16 +341,15 @@
+ xchdir(sysfs_path);
+ for (cnt = 0; cnt < 30; ++cnt) {
+ loading_fd = open("loading", O_WRONLY);
+- if (loading_fd == -1)
+- sleep(1);
+- else
+- break;
++ if (loading_fd != -1)
++ goto loading;
++ sleep(1);
+ }
+- if (loading_fd == -1)
+- goto out;
++ goto out;
+
++ loading:
+ /* tell kernel we're loading by `echo 1 > /sys/$DEVPATH/loading` */
+- if (write(loading_fd, "1", 1) != 1)
++ if (full_write(loading_fd, "1", 1) != 1)
+ goto out;
+
+ /* load firmware by `cat /lib/firmware/$FIRMWARE > /sys/$DEVPATH/data */
+@@ -324,9 +360,9 @@
+
+ /* tell kernel result by `echo [0|-1] > /sys/$DEVPATH/loading` */
+ if (cnt > 0)
+- write(loading_fd, "0", 1);
++ full_write(loading_fd, "0", 1);
+ else
+- write(loading_fd, "-1", 2);
++ full_write(loading_fd, "-1", 2);
+
+ out:
+ if (ENABLE_FEATURE_CLEAN_UP) {
+@@ -341,16 +377,14 @@
+ {
+ char *action;
+ char *env_path;
+- RESERVE_CONFIG_BUFFER(temp,PATH_MAX);
++ RESERVE_CONFIG_BUFFER(temp, PATH_MAX + SCRATCH_SIZE);
+
+ xchdir("/dev");
+
+- if (argc == 2 && !strcmp(argv[1],"-s")) {
+-
++ if (argc == 2 && !strcmp(argv[1], "-s")) {
+ /* Scan:
+ * mdev -s
+ */
+-
+ struct stat st;
+
+ xstat("/", &st);
+@@ -366,26 +400,27 @@
+ fileAction, dirAction, temp, 0);
+
+ } else {
+-
+ /* Hotplug:
+ * env ACTION=... DEVPATH=... mdev
+ * ACTION can be "add" or "remove"
+ * DEVPATH is like "/block/sda" or "/class/input/mice"
+ */
+-
+ action = getenv("ACTION");
+ env_path = getenv("DEVPATH");
+ if (!action || !env_path)
+ bb_show_usage();
+
+- sprintf(temp, "/sys%s", env_path);
++ snprintf(temp, PATH_MAX, "/sys%s", env_path);
+ if (!strcmp(action, "remove"))
+ make_device(temp, 1);
+ else if (!strcmp(action, "add")) {
+ make_device(temp, 0);
+
+- if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE)
+- load_firmware(getenv("FIRMWARE"), temp);
++ if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
++ char *fw = getenv("FIRMWARE");
++ if (fw)
++ load_firmware(fw, temp);
++ }
+ }
+ }
+
Added: trunk/buildroot/package/busybox/busybox-1.10.1-pidof.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-pidof.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-pidof.patch 2008-04-29 06:53:55 UTC (rev 21892)
@@ -0,0 +1,11 @@
+--- busybox-1.10.1/libbb/procps.c Sat Apr 19 05:50:33 2008
++++ busybox-1.10.1-pidof/libbb/procps.c Sat Apr 26 01:18:32 2008
+@@ -258,7 +258,7 @@
+ &sp->start_time,
+ &vsz,
+ &rss);
+- if (n != 10)
++ if (n != 11)
+ break;
+ /* vsz is in bytes and we want kb */
+ sp->vsz = vsz >> 10;
Added: trunk/buildroot/package/busybox/busybox-1.10.1-ssd.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-ssd.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-ssd.patch 2008-04-29 06:53:55 UTC (rev 21892)
@@ -0,0 +1,187 @@
+--- busybox-1.10.1/debianutils/start_stop_daemon.c Sat Apr 19 05:50:30 2008
++++ busybox-1.10.1-ssd/debianutils/start_stop_daemon.c Tue Apr 22 03:13:13 2008
+@@ -11,7 +11,6 @@
+ /* NB: we have a problem here with /proc/NN/exe usage, similar to
+ * one fixed in killall/pidof */
+
+-#include <getopt.h>
+ #include <sys/resource.h>
+
+ /* Override ENABLE_FEATURE_PIDFILE */
+@@ -33,6 +32,7 @@
+ int user_id;
+ smallint quiet;
+ smallint signal_nr;
++ struct stat execstat;
+ };
+ #define G (*(struct globals*)&bb_common_bufsiz1)
+ #define found (G.found )
+@@ -43,6 +43,7 @@
+ #define user_id (G.user_id )
+ #define quiet (G.quiet )
+ #define signal_nr (G.signal_nr )
++#define execstat (G.execstat )
+ #define INIT_G() \
+ do { \
+ user_id = -1; \
+@@ -50,25 +51,21 @@
+ } while (0)
+
+
+-static int pid_is_exec(pid_t pid, const char *name)
++static int pid_is_exec(pid_t pid)
+ {
++ struct stat st;
+ char buf[sizeof("/proc//exe") + sizeof(int)*3];
+- char *execbuf;
+- int n;
+
+ sprintf(buf, "/proc/%u/exe", pid);
+- n = strlen(name) + 1;
+- execbuf = xzalloc(n + 1);
+- readlink(buf, execbuf, n);
+- /* if readlink fails because link target is longer than strlen(name),
+- * execbuf still contains "", and strcmp will return !0. */
+- n = strcmp(execbuf, name);
+- if (ENABLE_FEATURE_CLEAN_UP)
+- free(execbuf);
+- return !n; /* nonzero (true) if execbuf == name */
++ if (stat(buf, &st) < 0)
++ return 0;
++ if (st.st_dev == execstat.st_dev
++ && st.st_ino == execstat.st_ino)
++ return 1;
++ return 0;
+ }
+
+-static int pid_is_user(int pid, int uid)
++static int pid_is_user(int pid)
+ {
+ struct stat sb;
+ char buf[sizeof("/proc/") + sizeof(int)*3];
+@@ -76,42 +73,39 @@
+ sprintf(buf, "/proc/%u", pid);
+ if (stat(buf, &sb) != 0)
+ return 0;
+- return (sb.st_uid == uid);
++ return (sb.st_uid == user_id);
+ }
+
+-static int pid_is_cmd(pid_t pid, const char *name)
++static int pid_is_cmd(pid_t pid)
+ {
+- char fname[sizeof("/proc//stat") + sizeof(int)*3];
+- char *buf;
+- int r = 0;
++ char buf[256]; /* is it big enough? */
++ char *p, *pe;
+
+- sprintf(fname, "/proc/%u/stat", pid);
+- buf = xmalloc_open_read_close(fname, NULL);
+- if (buf) {
+- char *p = strchr(buf, '(');
+- if (p) {
+- char *pe = strrchr(++p, ')');
+- if (pe) {
+- *pe = '\0';
+- r = !strcmp(p, name);
+- }
+- }
+- free(buf);
+- }
+- return r;
++ sprintf(buf, "/proc/%u/stat", pid);
++ if (open_read_close(buf, buf, sizeof(buf) - 1) < 0)
++ return 0;
++ buf[sizeof(buf) - 1] = '\0'; /* paranoia */
++ p = strchr(buf, '(');
++ if (!p)
++ return 0;
++ pe = strrchr(++p, ')');
++ if (!pe)
++ return 0;
++ *pe = '\0';
++ return !strcmp(p, cmdname);
+ }
+
+ static void check(int pid)
+ {
+ struct pid_list *p;
+
+- if (execname && !pid_is_exec(pid, execname)) {
++ if (execname && !pid_is_exec(pid)) {
+ return;
+ }
+- if (userspec && !pid_is_user(pid, user_id)) {
++ if (userspec && !pid_is_user(pid)) {
+ return;
+ }
+- if (cmdname && !pid_is_cmd(pid, cmdname)) {
++ if (cmdname && !pid_is_cmd(pid)) {
+ return;
+ }
+ p = xmalloc(sizeof(*p));
+@@ -148,9 +142,16 @@
+ procdir = xopendir("/proc");
+
+ pid = 0;
+- while ((entry = readdir(procdir)) != NULL) {
++ while(1) {
++ errno = 0; /* clear any previous error */
++ entry = readdir(procdir);
++// TODO: check for exact errno(s) which mean that we got stale entry
++ if (errno) /* Stale entry, process has died after opendir */
++ continue;
++ if (!entry) /* EOF, no more entries */
++ break;
+ pid = bb_strtou(entry->d_name, NULL, 10);
+- if (errno)
++ if (errno) /* NaN */
+ continue;
+ check(pid);
+ }
+@@ -165,8 +166,6 @@
+ struct pid_list *p;
+ int killed = 0;
+
+- do_procinit();
+-
+ if (cmdname) {
+ if (ENABLE_FEATURE_CLEAN_UP) what = xstrdup(cmdname);
+ if (!ENABLE_FEATURE_CLEAN_UP) what = cmdname;
+@@ -251,7 +250,7 @@
+ };
+
+ int start_stop_daemon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+-int start_stop_daemon_main(int argc, char **argv)
++int start_stop_daemon_main(int argc ATTRIBUTE_UNUSED, char **argv)
+ {
+ unsigned opt;
+ char *signame;
+@@ -293,7 +292,7 @@
+ // if (retry_arg)
+ // retries = xatoi_u(retry_arg);
+ // )
+- argc -= optind;
++ //argc -= optind;
+ argv += optind;
+
+ if (userspec) {
+@@ -301,13 +300,15 @@
+ if (errno)
+ user_id = xuname2uid(userspec);
+ }
++ if (execname)
++ xstat(execname, &execstat);
+
++ do_procinit(); /* Both start and stop needs to know current processes */
++
+ if (opt & CTX_STOP) {
+ int i = do_stop();
+ return (opt & OPT_OKNODO) ? 0 : (i <= 0);
+ }
+-
+- do_procinit();
+
+ if (found) {
+ if (!quiet)
Added: trunk/buildroot/package/busybox/busybox-1.10.1-taskset.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.1-taskset.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.1-taskset.patch 2008-04-29 06:53:55 UTC (rev 21892)
@@ -0,0 +1,14 @@
+--- busybox-1.10.1/miscutils/taskset.c Sat Apr 19 06:03:13 2008
++++ busybox-1.10.1-taskset/miscutils/taskset.c Fri Apr 25 18:58:53 2008
+@@ -94,8 +94,10 @@
+ unsigned i;
+ /* Do not allow zero mask: */
+ unsigned long long m = xstrtoull_range(aff, 0, 1, ULLONG_MAX);
++ enum { CNT_BIT = CPU_SETSIZE < sizeof(m)*8 ? CPU_SETSIZE : sizeof(m)*8 };
++
+ CPU_ZERO(&mask);
+- for (i = 0; i < CPU_SETSIZE; i++) {
++ for (i = 0; i < CNT_BIT; i++) {
+ unsigned long long bit = (1ULL << i);
+ if (bit & m)
+ CPU_SET(i, &mask);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-04-22 9:37 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-04-22 9:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-04-22 02:37:22 -0700 (Tue, 22 Apr 2008)
New Revision: 21795
Log:
busybox: bump version
Removed:
trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch
trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch
trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch
trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch
trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-04-22 00:16:29 UTC (rev 21794)
+++ trunk/buildroot/package/busybox/Config.in 2008-04-22 09:37:22 UTC (rev 21795)
@@ -50,7 +50,7 @@
default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
- default "1.10.0" if BR2_BUSYBOX_VERSION_1_10_X
+ default "1.10.1" if BR2_BUSYBOX_VERSION_1_10_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
Deleted: trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch 2008-04-22 00:16:29 UTC (rev 21794)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch 2008-04-22 09:37:22 UTC (rev 21795)
@@ -1,43 +0,0 @@
---- busybox-1.10.0/procps/fuser.c Thu Mar 20 12:47:05 2008
-+++ busybox-1.10.0-fuser/procps/fuser.c Sat Mar 29 18:55:23 2008
-@@ -57,11 +57,11 @@
-
- static char *parse_net_arg(const char *arg, unsigned *port)
- {
-- char path[12], tproto[5];
-+ char path[20], tproto[5];
-
- if (sscanf(arg, "%u/%4s", port, tproto) != 2)
- return NULL;
-- sprintf(path, "net/%s", tproto);
-+ sprintf(path, "/proc/net/%s", tproto);
- if (access(path, R_OK) != 0)
- return NULL;
- return xstrdup(tproto);
-@@ -99,7 +99,7 @@
- static inode_list *scan_proc_net(const char *proto,
- unsigned port, inode_list *ilist)
- {
-- char path[12], line[MAX_LINE + 1];
-+ char path[20], line[MAX_LINE + 1];
- char addr[128];
- ino_t tmp_inode;
- dev_t tmp_dev;
-@@ -109,7 +109,7 @@
-
- tmp_dev = find_socket_dev();
-
-- sprintf(path, "net/%s", proto);
-+ sprintf(path, "/proc/net/%s", proto);
- f = fopen(path, "r");
- if (!f)
- return ilist;
-@@ -313,8 +313,6 @@
-
- opt = getopt32(argv, OPTION_STRING);
- argv += optind;
--
-- xchdir("/proc");
-
- ilist = NULL;
- pp = argv;
Deleted: trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch 2008-04-22 00:16:29 UTC (rev 21794)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch 2008-04-22 09:37:22 UTC (rev 21795)
@@ -1,62 +0,0 @@
---- busybox-1.10.0/coreutils/tail.c Thu Mar 20 12:46:51 2008
-+++ busybox-1.10.0-tail/coreutils/tail.c Sun Mar 23 04:25:12 2008
-@@ -163,8 +163,6 @@
- fmt = header_fmt + 1; /* Skip header leading newline on first output. */
- i = 0;
- do {
-- off_t current;
--
- if (nfiles > header_threshhold) {
- tail_xprint_header(fmt, argv[i]);
- fmt = header_fmt;
-@@ -173,19 +171,17 @@
- /* Optimizing count-bytes case if the file is seekable.
- * Beware of backing up too far.
- * Also we exclude files with size 0 (because of /proc/xxx) */
-- current = lseek(fds[i], 0, SEEK_END);
-- if (current > 0) {
-- if (!from_top) {
-+ if (COUNT_BYTES && !from_top) {
-+ off_t current = lseek(fds[i], 0, SEEK_END);
-+ if (current > 0) {
- if (count == 0)
- continue; /* showing zero lines is easy :) */
-- if (COUNT_BYTES) {
-- current -= count;
-- if (current < 0)
-- current = 0;
-- xlseek(fds[i], current, SEEK_SET);
-- bb_copyfd_size(fds[i], STDOUT_FILENO, count);
-- continue;
-- }
-+ current -= count;
-+ if (current < 0)
-+ current = 0;
-+ xlseek(fds[i], current, SEEK_SET);
-+ bb_copyfd_size(fds[i], STDOUT_FILENO, count);
-+ continue;
- }
- }
-
---- busybox-1.10.0/testsuite/tail/tail-n-works Thu Mar 20 12:46:57 2008
-+++ busybox-1.10.0-tail/testsuite/tail/tail-n-works Sun Mar 23 04:25:12 2008
-@@ -1,4 +1,4 @@
--[ -n "$d" ] || d=..
--tail -n 2 "$d/README" > logfile.gnu
--busybox tail -n 2 "$d/README" > logfile.bb
--cmp logfile.gnu logfile.bb
-+echo -ne "abc\ndef\n123\n" >input
-+echo -ne "def\n123\n" >logfile.ok
-+busybox tail -n 2 input > logfile.bb
-+cmp logfile.ok logfile.bb
---- busybox-1.10.0/testsuite/tail/tail-works Thu Mar 20 12:46:57 2008
-+++ busybox-1.10.0-tail/testsuite/tail/tail-works Sun Mar 23 04:25:12 2008
-@@ -1,4 +1,4 @@
--[ -n "$d" ] || d=..
--tail -n 2 "$d/README" > logfile.gnu
--busybox tail -n 2 "$d/README" > logfile.bb
--cmp logfile.gnu logfile.bb
-+echo -ne "abc\ndef\n123\n" >input
-+echo -ne "def\n123\n" >logfile.ok
-+busybox tail -2 input > logfile.bb
-+cmp logfile.ok logfile.bb
Deleted: trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch 2008-04-22 00:16:29 UTC (rev 21794)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch 2008-04-22 09:37:22 UTC (rev 21795)
@@ -1,27 +0,0 @@
---- busybox-1.10.0/miscutils/taskset.c Thu Mar 20 12:46:55 2008
-+++ busybox-1.10.0-taskset/miscutils/taskset.c Sat Mar 22 18:46:21 2008
-@@ -50,6 +50,11 @@
- char *pid_str;
- char *aff = aff; /* for compiler */
-
-+ /* NB: we mimic util-linux's taskset: -p does not take
-+ * an argument, i.e., "-pN" is NOT valid, only "-p N"!
-+ * Indeed, util-linux-2.13-pre7 uses:
-+ * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
-+
- opt_complementary = "-1"; /* at least 1 arg */
- opt_p = getopt32(argv, "+p");
- argv += optind;
---- busybox-1.10.0/testsuite/taskset.tests Thu Mar 20 12:47:04 2008
-+++ busybox-1.10.0-taskset/testsuite/taskset.tests Sat Mar 22 18:46:21 2008
-@@ -7,8 +7,8 @@
- a="taskset"
-
- # testing "test name" "opts" "expected result" "file inp" "stdin"
--testing "taskset (get from pid 1)" "$a -p1 >/dev/null;echo \$?" "0\n" "" ""
--testing "taskset (invalid pid)" "$a -p0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
-+testing "taskset (get from pid 1)" "$a -p 1 >/dev/null;echo \$?" "0\n" "" ""
-+testing "taskset (invalid pid)" "$a -p 0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
- testing "taskset (set_aff, needs CAP_SYS_NICE)" \
- "$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \
- "0\n" "" ""
Deleted: trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch 2008-04-22 00:16:29 UTC (rev 21794)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch 2008-04-22 09:37:22 UTC (rev 21795)
@@ -1,16 +0,0 @@
---- busybox-1.10.0/networking/tcpudp.c Thu Mar 20 12:46:42 2008
-+++ busybox-1.10.0-tcpudp/networking/tcpudp.c Mon Mar 31 21:27:38 2008
-@@ -29,10 +29,10 @@
- * - don't know how to retrieve ORIGDST for udp.
- */
-
--#include <limits.h>
--#include <linux/netfilter_ipv4.h> /* wants <limits.h> */
--
- #include "libbb.h"
-+/* Wants <limits.h> etc, thus included after libbb.h: */
-+#include <linux/netfilter_ipv4.h>
-+
- // TODO: move into this file:
- #include "tcpudp_perhost.h"
-
Deleted: trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch 2008-04-22 00:16:29 UTC (rev 21794)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch 2008-04-22 09:37:22 UTC (rev 21795)
@@ -1,15 +0,0 @@
---- busybox-1.10.0/networking/udhcp/clientsocket.c Thu Mar 20 12:46:42 2008
-+++ busybox-1.10.0-udhcp/networking/udhcp/clientsocket.c Tue Mar 25 07:04:32 2008
-@@ -22,11 +22,11 @@
- */
-
- #include <features.h>
-+#include <asm/types.h>
- #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
- #include <netpacket/packet.h>
- #include <net/ethernet.h>
- #else
--#include <asm/types.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #endif
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-04-04 7:17 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-04-04 7:17 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-04-04 00:17:34 -0700 (Fri, 04 Apr 2008)
New Revision: 21632
Log:
busybox-1.6.0.config: disable TASKSET.
Disable CONFIG_TASKSET as it only compiles if
sched_{g,s}etaffinity support is available.
Modified:
trunk/buildroot/package/busybox/busybox-1.6.0.config
Changeset:
Modified: trunk/buildroot/package/busybox/busybox-1.6.0.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.6.0.config 2008-04-04 07:12:42 UTC (rev 21631)
+++ trunk/buildroot/package/busybox/busybox-1.6.0.config 2008-04-04 07:17:34 UTC (rev 21632)
@@ -495,7 +495,7 @@
# CONFIG_RX is not set
CONFIG_STRINGS=y
CONFIG_SETSID=y
-CONFIG_TASKSET=y
+# CONFIG_TASKSET is not set
CONFIG_FEATURE_TASKSET_FANCY=y
CONFIG_TIME=y
CONFIG_WATCHDOG=y
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-04-01 10:00 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-04-01 10:00 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-04-01 03:00:00 -0700 (Tue, 01 Apr 2008)
New Revision: 21607
Log:
busybox: additional 1.10.0 fix
Added:
trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-tcpudp.patch 2008-04-01 10:00:00 UTC (rev 21607)
@@ -0,0 +1,16 @@
+--- busybox-1.10.0/networking/tcpudp.c Thu Mar 20 12:46:42 2008
++++ busybox-1.10.0-tcpudp/networking/tcpudp.c Mon Mar 31 21:27:38 2008
+@@ -29,10 +29,10 @@
+ * - don't know how to retrieve ORIGDST for udp.
+ */
+
+-#include <limits.h>
+-#include <linux/netfilter_ipv4.h> /* wants <limits.h> */
+-
+ #include "libbb.h"
++/* Wants <limits.h> etc, thus included after libbb.h: */
++#include <linux/netfilter_ipv4.h>
++
+ // TODO: move into this file:
+ #include "tcpudp_perhost.h"
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-30 14:37 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-30 14:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-30 07:37:06 -0700 (Sun, 30 Mar 2008)
New Revision: 21579
Log:
busybox: additional 1.10.0 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-fuser.patch 2008-03-30 14:37:06 UTC (rev 21579)
@@ -0,0 +1,43 @@
+--- busybox-1.10.0/procps/fuser.c Thu Mar 20 12:47:05 2008
++++ busybox-1.10.0-fuser/procps/fuser.c Sat Mar 29 18:55:23 2008
+@@ -57,11 +57,11 @@
+
+ static char *parse_net_arg(const char *arg, unsigned *port)
+ {
+- char path[12], tproto[5];
++ char path[20], tproto[5];
+
+ if (sscanf(arg, "%u/%4s", port, tproto) != 2)
+ return NULL;
+- sprintf(path, "net/%s", tproto);
++ sprintf(path, "/proc/net/%s", tproto);
+ if (access(path, R_OK) != 0)
+ return NULL;
+ return xstrdup(tproto);
+@@ -99,7 +99,7 @@
+ static inode_list *scan_proc_net(const char *proto,
+ unsigned port, inode_list *ilist)
+ {
+- char path[12], line[MAX_LINE + 1];
++ char path[20], line[MAX_LINE + 1];
+ char addr[128];
+ ino_t tmp_inode;
+ dev_t tmp_dev;
+@@ -109,7 +109,7 @@
+
+ tmp_dev = find_socket_dev();
+
+- sprintf(path, "net/%s", proto);
++ sprintf(path, "/proc/net/%s", proto);
+ f = fopen(path, "r");
+ if (!f)
+ return ilist;
+@@ -313,8 +313,6 @@
+
+ opt = getopt32(argv, OPTION_STRING);
+ argv += optind;
+-
+- xchdir("/proc");
+
+ ilist = NULL;
+ pp = argv;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-26 21:53 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-26 21:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-26 14:53:15 -0700 (Wed, 26 Mar 2008)
New Revision: 21511
Log:
busybox: remove unused configs/patches
Removed:
trunk/buildroot/package/busybox/busybox-1.0.1.config
trunk/buildroot/package/busybox/busybox-1.1.3.config
trunk/buildroot/package/busybox/busybox-1.4.0-conf.patch
trunk/buildroot/package/busybox/busybox-1.4.0-libnetlink.patch
trunk/buildroot/package/busybox/busybox-1.4.0-max_host_len_40.patch
trunk/buildroot/package/busybox/busybox-1.4.0-parse_config_file.patch
trunk/buildroot/package/busybox/busybox-1.4.0-syslogd-n.patch
trunk/buildroot/package/busybox/busybox-1.4.0-tar.patch
trunk/buildroot/package/busybox/busybox-1.4.0.config
trunk/buildroot/package/busybox/busybox-1.4.1-binhex.patch
trunk/buildroot/package/busybox/busybox-1.4.1-iproute.patch
trunk/buildroot/package/busybox/busybox-1.4.1-tar_t.patch
trunk/buildroot/package/busybox/busybox-1.4.1-tftp.patch
trunk/buildroot/package/busybox/busybox-1.4.1-wgetSEGV.patch
trunk/buildroot/package/busybox/busybox-1.4.1.config
trunk/buildroot/package/busybox/busybox-1.5.0-hdparm.patch
trunk/buildroot/package/busybox/busybox-1.5.0-max_host_len_40.patch
trunk/buildroot/package/busybox/busybox-1.5.0-ps.patch
trunk/buildroot/package/busybox/busybox-1.5.0-sed.patch
trunk/buildroot/package/busybox/busybox-1.5.0.config
trunk/buildroot/package/busybox/busybox-1.6.0-echo.patch
trunk/buildroot/package/busybox/busybox-1.6.0-hushdep.patch
trunk/buildroot/package/busybox/busybox-1.6.0-test.patch
Changeset:
Sorry, the patch is too large to include (3948 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=21511
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-26 21:49 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-26 21:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-26 14:49:58 -0700 (Wed, 26 Mar 2008)
New Revision: 21510
Log:
busybox: bump 1.7.x and 1.8.x versions
Removed:
trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch
trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch
trunk/buildroot/package/busybox/busybox-1.8.2-static.patch
trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-03-26 20:06:24 UTC (rev 21509)
+++ trunk/buildroot/package/busybox/Config.in 2008-03-26 21:49:58 UTC (rev 21510)
@@ -47,8 +47,8 @@
string
default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
- default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X
- default "1.8.2" if BR2_BUSYBOX_VERSION_1_8_X
+ default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
+ default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.0" if BR2_BUSYBOX_VERSION_1_10_X
Deleted: trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch 2008-03-26 20:06:24 UTC (rev 21509)
+++ trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch 2008-03-26 21:49:58 UTC (rev 21510)
@@ -1,38 +0,0 @@
-diff -urN busybox-1.7.4/findutils/grep.c busybox-1.7.4-grep/findutils/grep.c
---- busybox-1.7.4/findutils/grep.c 2007-09-03 04:48:54.000000000 -0700
-+++ busybox-1.7.4-grep/findutils/grep.c 2007-12-08 19:02:33.000000000 -0800
-@@ -154,14 +154,14 @@
-
- while ((line = xmalloc_getline(file)) != NULL) {
- llist_t *pattern_ptr = pattern_head;
-- grep_list_data_t * gl;
-+ grep_list_data_t *gl = gl; /* for gcc */
-
- linenum++;
- ret = 0;
- while (pattern_ptr) {
- gl = (grep_list_data_t *)pattern_ptr->data;
- if (FGREP_FLAG) {
-- ret = strstr(line, gl->pattern) != NULL;
-+ ret |= (strstr(line, gl->pattern) != NULL);
- } else {
- /*
- * test for a postitive-assertion match (regexec returns success (0)
-@@ -255,8 +255,15 @@
- print_n_lines_after = lines_after;
- #endif
- if (option_mask32 & OPT_o) {
-- line[regmatch.rm_eo] = '\0';
-- print_line(line + regmatch.rm_so, linenum, ':');
-+ if (FGREP_FLAG) {
-+ /* -Fo just prints the pattern
-+ * (unless -v: -Fov doesnt print anything at all) */
-+ if (ret)
-+ print_line(gl->pattern, linenum, ':');
-+ } else {
-+ line[regmatch.rm_eo] = '\0';
-+ print_line(line + regmatch.rm_so, linenum, ':');
-+ }
- } else {
- print_line(line, linenum, ':');
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch 2008-03-26 20:06:24 UTC (rev 21509)
+++ trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch 2008-03-26 21:49:58 UTC (rev 21510)
@@ -1,13 +0,0 @@
-diff -urN busybox-1.8.2/networking/arping.c busybox-1.8.2-arping/networking/arping.c
---- busybox-1.8.2/networking/arping.c 2007-11-10 01:40:47.000000000 +0000
-+++ busybox-1.8.2-arping/networking/arping.c 2007-12-18 10:31:55.000000000 +0000
-@@ -207,7 +207,8 @@
- }
-
- if (last) {
-- printf(" %u.%03ums\n", last / 1000, last % 1000);
-+ unsigned diff = MONOTONIC_US() - last;
-+ printf(" %u.%03ums\n", diff / 1000, diff % 1000);
- } else {
- printf(" UNSOLICITED?\n");
- }
Deleted: trunk/buildroot/package/busybox/busybox-1.8.2-static.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.8.2-static.patch 2008-03-26 20:06:24 UTC (rev 21509)
+++ trunk/buildroot/package/busybox/busybox-1.8.2-static.patch 2008-03-26 21:49:58 UTC (rev 21510)
@@ -1,12 +0,0 @@
-diff -urN busybox-1.8.2/applets/applets.c busybox-1.8.2-static/applets/applets.c
---- busybox-1.8.2/applets/applets.c 2007-11-10 01:40:53.000000000 +0000
-+++ busybox-1.8.2-static/applets/applets.c 2007-12-09 03:46:04.000000000 +0000
-@@ -17,7 +17,7 @@
- #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
- #warning Note that glibc is unsuitable for static linking anyway.
- #warning If you still want to do it, remove -Wl,--gc-sections
--#warning from top-level Makefile and remove this warning.
-+#warning from file scripts/trylink and remove this warning.
- #error Aborting compilation.
- #endif
-
Deleted: trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch 2008-03-26 20:06:24 UTC (rev 21509)
+++ trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch 2008-03-26 21:49:58 UTC (rev 21510)
@@ -1,40 +0,0 @@
-diff -urN busybox-1.8.2/editors/vi.c busybox-1.8.2-vi/editors/vi.c
---- busybox-1.8.2/editors/vi.c 2007-11-10 01:40:54.000000000 +0000
-+++ busybox-1.8.2-vi/editors/vi.c 2007-12-10 16:26:01.000000000 +0000
-@@ -184,6 +184,7 @@
- #if ENABLE_FEATURE_VI_COLON
- char *initial_cmds[3]; // currently 2 entries, NULL terminated
- #endif
-+ char readbuffer[MAX_LINELEN];
- };
- #define G (*ptr_to_globals)
- #define text (G.text )
-@@ -200,6 +201,10 @@
- #define term_orig (G.term_orig )
- #define term_vi (G.term_vi )
- #define initial_cmds (G.initial_cmds )
-+#define readbuffer (G.readbuffer )
-+#define INIT_G() do { \
-+ PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
-+} while (0)
-
- static int init_text_buffer(char *); // init from file or create new
- static void edit_file(char *); // edit one file
-@@ -321,7 +326,7 @@
- my_pid = getpid();
- #endif
-
-- PTR_TO_GLOBALS = xzalloc(sizeof(G));
-+ INIT_G();
-
- #if ENABLE_FEATURE_VI_CRASHME
- srand((long) my_pid);
-@@ -2142,8 +2147,6 @@
- return safe_poll(pfd, 1, hund*10) > 0;
- }
-
--#define readbuffer bb_common_bufsiz1
--
- static int readed_for_parse;
-
- //----- IO Routines --------------------------------------------
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-25 14:38 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-25 14:38 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-25 07:38:45 -0700 (Tue, 25 Mar 2008)
New Revision: 21492
Log:
busybox: add 1.10.0 release
Added:
trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch
trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch
trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-03-25 14:15:39 UTC (rev 21491)
+++ trunk/buildroot/package/busybox/Config.in 2008-03-25 14:38:45 UTC (rev 21492)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_9_X
+ default BR2_BUSYBOX_VERSION_1_10_X
help
Select the version of BusyBox you wish to use.
@@ -35,6 +35,9 @@
config BR2_BUSYBOX_VERSION_1_9_X
bool "BusyBox 1.9.x"
+ config BR2_BUSYBOX_VERSION_1_10_X
+ bool "BusyBox 1.10.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -47,6 +50,7 @@
default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.2" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
+ default "1.10.0" if BR2_BUSYBOX_VERSION_1_10_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
@@ -71,6 +75,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_X
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_8_X
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_9_X
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-tail.patch 2008-03-25 14:38:45 UTC (rev 21492)
@@ -0,0 +1,62 @@
+--- busybox-1.10.0/coreutils/tail.c Thu Mar 20 12:46:51 2008
++++ busybox-1.10.0-tail/coreutils/tail.c Sun Mar 23 04:25:12 2008
+@@ -163,8 +163,6 @@
+ fmt = header_fmt + 1; /* Skip header leading newline on first output. */
+ i = 0;
+ do {
+- off_t current;
+-
+ if (nfiles > header_threshhold) {
+ tail_xprint_header(fmt, argv[i]);
+ fmt = header_fmt;
+@@ -173,19 +171,17 @@
+ /* Optimizing count-bytes case if the file is seekable.
+ * Beware of backing up too far.
+ * Also we exclude files with size 0 (because of /proc/xxx) */
+- current = lseek(fds[i], 0, SEEK_END);
+- if (current > 0) {
+- if (!from_top) {
++ if (COUNT_BYTES && !from_top) {
++ off_t current = lseek(fds[i], 0, SEEK_END);
++ if (current > 0) {
+ if (count == 0)
+ continue; /* showing zero lines is easy :) */
+- if (COUNT_BYTES) {
+- current -= count;
+- if (current < 0)
+- current = 0;
+- xlseek(fds[i], current, SEEK_SET);
+- bb_copyfd_size(fds[i], STDOUT_FILENO, count);
+- continue;
+- }
++ current -= count;
++ if (current < 0)
++ current = 0;
++ xlseek(fds[i], current, SEEK_SET);
++ bb_copyfd_size(fds[i], STDOUT_FILENO, count);
++ continue;
+ }
+ }
+
+--- busybox-1.10.0/testsuite/tail/tail-n-works Thu Mar 20 12:46:57 2008
++++ busybox-1.10.0-tail/testsuite/tail/tail-n-works Sun Mar 23 04:25:12 2008
+@@ -1,4 +1,4 @@
+-[ -n "$d" ] || d=..
+-tail -n 2 "$d/README" > logfile.gnu
+-busybox tail -n 2 "$d/README" > logfile.bb
+-cmp logfile.gnu logfile.bb
++echo -ne "abc\ndef\n123\n" >input
++echo -ne "def\n123\n" >logfile.ok
++busybox tail -n 2 input > logfile.bb
++cmp logfile.ok logfile.bb
+--- busybox-1.10.0/testsuite/tail/tail-works Thu Mar 20 12:46:57 2008
++++ busybox-1.10.0-tail/testsuite/tail/tail-works Sun Mar 23 04:25:12 2008
+@@ -1,4 +1,4 @@
+-[ -n "$d" ] || d=..
+-tail -n 2 "$d/README" > logfile.gnu
+-busybox tail -n 2 "$d/README" > logfile.bb
+-cmp logfile.gnu logfile.bb
++echo -ne "abc\ndef\n123\n" >input
++echo -ne "def\n123\n" >logfile.ok
++busybox tail -2 input > logfile.bb
++cmp logfile.ok logfile.bb
Added: trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-taskset.patch 2008-03-25 14:38:45 UTC (rev 21492)
@@ -0,0 +1,27 @@
+--- busybox-1.10.0/miscutils/taskset.c Thu Mar 20 12:46:55 2008
++++ busybox-1.10.0-taskset/miscutils/taskset.c Sat Mar 22 18:46:21 2008
+@@ -50,6 +50,11 @@
+ char *pid_str;
+ char *aff = aff; /* for compiler */
+
++ /* NB: we mimic util-linux's taskset: -p does not take
++ * an argument, i.e., "-pN" is NOT valid, only "-p N"!
++ * Indeed, util-linux-2.13-pre7 uses:
++ * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
++
+ opt_complementary = "-1"; /* at least 1 arg */
+ opt_p = getopt32(argv, "+p");
+ argv += optind;
+--- busybox-1.10.0/testsuite/taskset.tests Thu Mar 20 12:47:04 2008
++++ busybox-1.10.0-taskset/testsuite/taskset.tests Sat Mar 22 18:46:21 2008
+@@ -7,8 +7,8 @@
+ a="taskset"
+
+ # testing "test name" "opts" "expected result" "file inp" "stdin"
+-testing "taskset (get from pid 1)" "$a -p1 >/dev/null;echo \$?" "0\n" "" ""
+-testing "taskset (invalid pid)" "$a -p0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
++testing "taskset (get from pid 1)" "$a -p 1 >/dev/null;echo \$?" "0\n" "" ""
++testing "taskset (invalid pid)" "$a -p 0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
+ testing "taskset (set_aff, needs CAP_SYS_NICE)" \
+ "$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \
+ "0\n" "" ""
Added: trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.10.0-udhcp.patch 2008-03-25 14:38:45 UTC (rev 21492)
@@ -0,0 +1,15 @@
+--- busybox-1.10.0/networking/udhcp/clientsocket.c Thu Mar 20 12:46:42 2008
++++ busybox-1.10.0-udhcp/networking/udhcp/clientsocket.c Tue Mar 25 07:04:32 2008
+@@ -22,11 +22,11 @@
+ */
+
+ #include <features.h>
++#include <asm/types.h>
+ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
+ #include <netpacket/packet.h>
+ #include <net/ethernet.h>
+ #else
+-#include <asm/types.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_ether.h>
+ #endif
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-21 17:56 ninevoltz at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-21 17:56 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-21 10:56:00 -0700 (Fri, 21 Mar 2008)
New Revision: 21440
Log:
confusing busybox config option description patch, busybox can be built as shared libs, hardlinks ... etc. rename to full install. Patch from Nigel Kukard
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-03-21 11:21:02 UTC (rev 21439)
+++ trunk/buildroot/package/busybox/Config.in 2008-03-21 17:56:00 UTC (rev 21440)
@@ -49,13 +49,13 @@
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
-config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
- bool "Install symlinks for BusyBox applets"
+config BR2_PACKAGE_BUSYBOX_FULLINSTALL
+ bool "Run BusyBox's own full installation"
depends BR2_PACKAGE_BUSYBOX
default y
help
- If you want to automatically install symlinks for all the
- supported applets to the busybox binary, then answer Y.
+ If you want to run BusyBox's own full install for the
+ configured applets, then answer Y.
This may overwrite files from other packages if your
busybox includes replacement applets for the package.
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2008-03-21 11:21:02 UTC (rev 21439)
+++ trunk/buildroot/package/busybox/busybox.mk 2008-03-21 17:56:00 UTC (rev 21440)
@@ -112,7 +112,7 @@
endif
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
-ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
+ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
ARCH=$(KERNEL_ARCH) \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-21 10:14 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-21 10:14 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-21 03:14:15 -0700 (Fri, 21 Mar 2008)
New Revision: 21438
Log:
busybox: bump version (1.9.2)
Removed:
trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch
trunk/buildroot/package/busybox/busybox-1.9.1-init.patch
trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-03-21 09:56:19 UTC (rev 21437)
+++ trunk/buildroot/package/busybox/Config.in 2008-03-21 10:14:15 UTC (rev 21438)
@@ -46,7 +46,7 @@
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.2" if BR2_BUSYBOX_VERSION_1_8_X
- default "1.9.1" if BR2_BUSYBOX_VERSION_1_9_X
+ default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
Deleted: trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch 2008-03-21 09:56:19 UTC (rev 21437)
+++ trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch 2008-03-21 10:14:15 UTC (rev 21438)
@@ -1,11 +0,0 @@
---- busybox-1.9.1/networking/httpd.c Tue Feb 12 17:03:01 2008
-+++ busybox-1.9.1-httpd-POST/networking/httpd.c Mon Mar 17 13:58:09 2008
-@@ -1950,7 +1950,7 @@
- if ((STRNCASECMP(iobuf, "Content-length:") == 0)) {
- /* extra read only for POST */
- if (prequest != request_GET) {
-- tptr = iobuf + sizeof("Content-length:") - 1;
-+ tptr = tptr = skip_whitespace(iobuf + sizeof("Content-length:") - 1);
- if (!tptr[0])
- send_headers_and_exit(HTTP_BAD_REQUEST);
- errno = 0;
Deleted: trunk/buildroot/package/busybox/busybox-1.9.1-init.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.1-init.patch 2008-03-21 09:56:19 UTC (rev 21437)
+++ trunk/buildroot/package/busybox/busybox-1.9.1-init.patch 2008-03-21 10:14:15 UTC (rev 21438)
@@ -1,27 +0,0 @@
---- busybox-1.9.1/init/init.c Tue Feb 12 17:03:12 2008
-+++ busybox-1.9.1-init/init/init.c Mon Mar 17 14:19:41 2008
-@@ -225,8 +225,22 @@
- }
- messageD(L_LOG, "console='%s'", s);
- } else {
-- /* Make sure fd 0,1,2 are not closed */
-- bb_sanitize_stdio();
-+ /* Make sure fd 0,1,2 are not closed
-+ * (so that they won't be used by future opens) */
-+
-+ /* bb_sanitize_stdio(); - WRONG.
-+ * Fail if "/dev/null" doesnt exist, and for init
-+ * this is a real possibility! Open code it instead. */
-+
-+ int fd = open(bb_dev_null, O_RDWR);
-+ if (fd < 0) {
-+ /* Give me _ANY_ open descriptor! */
-+ fd = xopen("/", O_RDONLY); /* we don't believe this can fail */
-+ }
-+ while ((unsigned)fd < 2)
-+ fd = dup(fd);
-+ if (fd > 2)
-+ close (fd);
- }
-
- s = getenv("TERM");
Deleted: trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch 2008-03-21 09:56:19 UTC (rev 21437)
+++ trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch 2008-03-21 10:14:15 UTC (rev 21438)
@@ -1,19 +0,0 @@
---- busybox-1.9.1/libbb/lineedit.c Tue Feb 12 17:10:25 2008
-+++ busybox-1.9.1-lineedit/libbb/lineedit.c Mon Feb 18 23:26:54 2008
-@@ -246,7 +246,15 @@
- if (cmdedit_x >= num) {
- cmdedit_x -= num;
- if (num <= 4) {
-- printf("\b\b\b\b" + (4-num));
-+ /* This is longer by 5 bytes on x86.
-+ * Also gets mysteriously
-+ * miscompiled for some ARM users.
-+ * printf(("\b\b\b\b" + 4) - num);
-+ * return;
-+ */
-+ do {
-+ bb_putchar('\b');
-+ } while (--num);
- return;
- }
- printf("\033[%uD", num);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-17 19:44 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-17 19:44 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-17 12:44:43 -0700 (Mon, 17 Mar 2008)
New Revision: 21370
Log:
busybox: additional 1.9.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch
trunk/buildroot/package/busybox/busybox-1.9.1-init.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.1-httpd-POST.patch 2008-03-17 19:44:43 UTC (rev 21370)
@@ -0,0 +1,11 @@
+--- busybox-1.9.1/networking/httpd.c Tue Feb 12 17:03:01 2008
++++ busybox-1.9.1-httpd-POST/networking/httpd.c Mon Mar 17 13:58:09 2008
+@@ -1950,7 +1950,7 @@
+ if ((STRNCASECMP(iobuf, "Content-length:") == 0)) {
+ /* extra read only for POST */
+ if (prequest != request_GET) {
+- tptr = iobuf + sizeof("Content-length:") - 1;
++ tptr = tptr = skip_whitespace(iobuf + sizeof("Content-length:") - 1);
+ if (!tptr[0])
+ send_headers_and_exit(HTTP_BAD_REQUEST);
+ errno = 0;
Added: trunk/buildroot/package/busybox/busybox-1.9.1-init.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.1-init.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.1-init.patch 2008-03-17 19:44:43 UTC (rev 21370)
@@ -0,0 +1,27 @@
+--- busybox-1.9.1/init/init.c Tue Feb 12 17:03:12 2008
++++ busybox-1.9.1-init/init/init.c Mon Mar 17 14:19:41 2008
+@@ -225,8 +225,22 @@
+ }
+ messageD(L_LOG, "console='%s'", s);
+ } else {
+- /* Make sure fd 0,1,2 are not closed */
+- bb_sanitize_stdio();
++ /* Make sure fd 0,1,2 are not closed
++ * (so that they won't be used by future opens) */
++
++ /* bb_sanitize_stdio(); - WRONG.
++ * Fail if "/dev/null" doesnt exist, and for init
++ * this is a real possibility! Open code it instead. */
++
++ int fd = open(bb_dev_null, O_RDWR);
++ if (fd < 0) {
++ /* Give me _ANY_ open descriptor! */
++ fd = xopen("/", O_RDONLY); /* we don't believe this can fail */
++ }
++ while ((unsigned)fd < 2)
++ fd = dup(fd);
++ if (fd > 2)
++ close (fd);
+ }
+
+ s = getenv("TERM");
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-03-11 8:17 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-03-11 8:17 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-11 01:17:03 -0700 (Tue, 11 Mar 2008)
New Revision: 21285
Log:
busybox: remove config dependency on busybox-source
busybox-source target doesn't need to depend on the config file.
Patch by Simon Pasch.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2008-03-10 16:34:19 UTC (rev 21284)
+++ trunk/buildroot/package/busybox/busybox.mk 2008-03-11 08:17:03 UTC (rev 21285)
@@ -125,7 +125,7 @@
busybox: uclibc $(TARGET_DIR)/bin/busybox
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)
busybox-unpacked: $(BUSYBOX_DIR)/.unpacked
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-02-28 14:38 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-02-28 14:38 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-02-28 06:38:06 -0800 (Thu, 28 Feb 2008)
New Revision: 21138
Log:
busybox 1.9.1 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.1-lineedit.patch 2008-02-28 14:38:06 UTC (rev 21138)
@@ -0,0 +1,19 @@
+--- busybox-1.9.1/libbb/lineedit.c Tue Feb 12 17:10:25 2008
++++ busybox-1.9.1-lineedit/libbb/lineedit.c Mon Feb 18 23:26:54 2008
+@@ -246,7 +246,15 @@
+ if (cmdedit_x >= num) {
+ cmdedit_x -= num;
+ if (num <= 4) {
+- printf("\b\b\b\b" + (4-num));
++ /* This is longer by 5 bytes on x86.
++ * Also gets mysteriously
++ * miscompiled for some ARM users.
++ * printf(("\b\b\b\b" + 4) - num);
++ * return;
++ */
++ do {
++ bb_putchar('\b');
++ } while (--num);
+ return;
+ }
+ printf("\033[%uD", num);
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-02-14 15:49 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-02-14 15:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-02-14 07:49:48 -0800 (Thu, 14 Feb 2008)
New Revision: 21019
Log:
busybox: bump version to 1.9.1
Removed:
trunk/buildroot/package/busybox/busybox-1.9.0-allno.patch
trunk/buildroot/package/busybox/busybox-1.9.0-fsck.patch
trunk/buildroot/package/busybox/busybox-1.9.0-hush_nommu_tick.patch
trunk/buildroot/package/busybox/busybox-1.9.0-iproute.patch
trunk/buildroot/package/busybox/busybox-1.9.0-mdev.patch
trunk/buildroot/package/busybox/busybox-1.9.0-mkswap.patch
trunk/buildroot/package/busybox/busybox-1.9.0-msh.patch
trunk/buildroot/package/busybox/busybox-1.9.0-nameif.patch
trunk/buildroot/package/busybox/busybox-1.9.0-stty.patch
trunk/buildroot/package/busybox/busybox-1.9.0-test.patch
trunk/buildroot/package/busybox/busybox-1.9.0-zcip.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Sorry, the patch is too large to include (1061 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=21019
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-02-14 14:45 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-02-14 14:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-02-14 06:45:23 -0800 (Thu, 14 Feb 2008)
New Revision: 21017
Log:
busybox: additional 1.9.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.9.0-hush_nommu_tick.patch
trunk/buildroot/package/busybox/busybox-1.9.0-mdev.patch
trunk/buildroot/package/busybox/busybox-1.9.0-test.patch
trunk/buildroot/package/busybox/busybox-1.9.0-zcip.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.9.0-hush_nommu_tick.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-hush_nommu_tick.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-hush_nommu_tick.patch 2008-02-14 14:45:23 UTC (rev 21017)
@@ -0,0 +1,581 @@
+--- busybox-1.9.0/include/libbb.h Fri Dec 21 23:00:31 2007
++++ busybox-1.9.0-hush_nommu_tick/include/libbb.h Sun Feb 10 13:16:38 2008
+@@ -641,6 +641,9 @@
+ void re_exec(char **argv) ATTRIBUTE_NORETURN;
+ void forkexit_or_rexec(char **argv);
+ extern bool re_execed;
++ int BUG_fork_is_unavailable_on_nommu(void);
++ int BUG_daemon_is_unavailable_on_nommu(void);
++ void BUG_bb_daemonize_is_unavailable_on_nommu(void);
+ # define fork() BUG_fork_is_unavailable_on_nommu()
+ # define daemon(a,b) BUG_daemon_is_unavailable_on_nommu()
+ # define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu()
+--- busybox-1.9.0/shell/hush.c Mon Dec 24 15:26:23 2007
++++ busybox-1.9.0-hush_nommu_tick/shell/hush.c Mon Feb 11 09:34:27 2008
+@@ -80,18 +80,28 @@
+ #include <glob.h> /* glob, of course */
+ #include <getopt.h> /* should be pretty obvious */
+ /* #include <dmalloc.h> */
++extern char **environ;
++#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
+
+-extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
+
+-#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
++#if !BB_MMU && ENABLE_HUSH_TICK
++//#undef ENABLE_HUSH_TICK
++//#define ENABLE_HUSH_TICK 0
++#warning On NOMMU, hush command substitution is dangerous.
++#warning Dont use it for commands which produce lots of output.
++#warning For more info see shell/hush.c, generate_stream_from_list().
++#endif
+
++#if !BB_MMU && ENABLE_HUSH_JOB
++#undef ENABLE_HUSH_JOB
++#define ENABLE_HUSH_JOB 0
++#endif
+
+-#if !BB_MMU
+-/* A bit drastic. Can allow some simpler commands
+- * by analysing command in generate_stream_from_list()
+- */
+-#undef ENABLE_HUSH_TICK
+-#define ENABLE_HUSH_TICK 0
++#if !ENABLE_HUSH_INTERACTIVE
++#undef ENABLE_FEATURE_EDITING
++#define ENABLE_FEATURE_EDITING 0
++#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT
++#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0
+ #endif
+
+
+@@ -178,13 +188,6 @@
+ #endif
+
+
+-#if !ENABLE_HUSH_INTERACTIVE
+-#undef ENABLE_FEATURE_EDITING
+-#define ENABLE_FEATURE_EDITING 0
+-#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT
+-#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0
+-#endif
+-
+ #define SPECIAL_VAR_SYMBOL 3
+
+ #define PARSEFLAG_EXIT_FROM_LOOP 1
+@@ -510,10 +513,10 @@
+ static int free_pipe(struct pipe *pi, int indent);
+ /* really run the final data structures: */
+ static int setup_redirects(struct child_prog *prog, int squirrel[]);
+-static int run_list_real(struct pipe *pi);
++static int run_list(struct pipe *pi);
+ static void pseudo_exec_argv(char **argv) ATTRIBUTE_NORETURN;
+ static void pseudo_exec(struct child_prog *child) ATTRIBUTE_NORETURN;
+-static int run_pipe_real(struct pipe *pi);
++static int run_pipe(struct pipe *pi);
+ /* extended glob support: */
+ static char **globhack(const char *src, char **strings);
+ static int glob_needed(const char *s);
+@@ -1418,7 +1421,7 @@
+ }
+ }
+
+-/* Called after [v]fork() in run_pipe_real(), or from builtin_exec().
++/* Called after [v]fork() in run_pipe(), or from builtin_exec().
+ * Never returns.
+ * XXX no exit() here. If you don't exec, use _exit instead.
+ * The at_exit handlers apparently confuse the calling process,
+@@ -1440,9 +1443,8 @@
+ /* If a variable is assigned in a forest, and nobody listens,
+ * was it ever really set?
+ */
+- if (argv[0] == NULL) {
++ if (!argv[0])
+ _exit(EXIT_SUCCESS);
+- }
+
+ argv = expand_strvec_to_strvec(argv);
+
+@@ -1486,15 +1488,15 @@
+ _exit(1);
+ }
+
+-/* Called after [v]fork() in run_pipe_real()
++/* Called after [v]fork() in run_pipe()
+ */
+ static void pseudo_exec(struct child_prog *child)
+ {
+ // FIXME: buggy wrt NOMMU! Must not modify any global data
+-// until it does exec/_exit, but currently it does.
+- if (child->argv) {
++// until it does exec/_exit, but currently it does
++// (puts malloc'ed stuff into environment)
++ if (child->argv)
+ pseudo_exec_argv(child->argv);
+- }
+
+ if (child->group) {
+ #if !BB_MMU
+@@ -1503,11 +1505,12 @@
+ int rcode;
+
+ #if ENABLE_HUSH_INTERACTIVE
+- debug_printf_exec("pseudo_exec: setting interactive_fd=0\n");
+- interactive_fd = 0; /* crucial!!!! */
++// run_list_level now takes care of it?
++// debug_printf_exec("pseudo_exec: setting interactive_fd=0\n");
++// interactive_fd = 0; /* crucial!!!! */
+ #endif
+- debug_printf_exec("pseudo_exec: run_list_real\n");
+- rcode = run_list_real(child->group);
++ debug_printf_exec("pseudo_exec: run_list\n");
++ rcode = run_list(child->group);
+ /* OK to leak memory by not calling free_pipe_list,
+ * since this process is about to exit */
+ _exit(rcode);
+@@ -1649,6 +1652,7 @@
+ // + killall -STOP cat
+
+ wait_more:
++// TODO: safe_waitpid?
+ while ((childpid = waitpid(-1, &status, attributes)) > 0) {
+ const int dead = WIFEXITED(status) || WIFSIGNALED(status);
+
+@@ -1673,7 +1677,7 @@
+ if (dead) {
+ fg_pipe->progs[i].pid = 0;
+ fg_pipe->running_progs--;
+- if (i == fg_pipe->num_progs-1)
++ if (i == fg_pipe->num_progs - 1)
+ /* last process gives overall exitstatus */
+ rcode = WEXITSTATUS(status);
+ } else {
+@@ -1754,13 +1758,13 @@
+ }
+ #endif
+
+-/* run_pipe_real() starts all the jobs, but doesn't wait for anything
++/* run_pipe() starts all the jobs, but doesn't wait for anything
+ * to finish. See checkjobs().
+ *
+ * return code is normally -1, when the caller has to wait for children
+ * to finish to determine the exit status of the pipe. If the pipe
+ * is a simple builtin command, however, the action is done by the
+- * time run_pipe_real returns, and the exit code is provided as the
++ * time run_pipe returns, and the exit code is provided as the
+ * return value.
+ *
+ * The input of the pipe is always stdin, the output is always
+@@ -1773,11 +1777,11 @@
+ * Returns -1 only if started some children. IOW: we have to
+ * mask out retvals of builtins etc with 0xff!
+ */
+-static int run_pipe_real(struct pipe *pi)
++static int run_pipe(struct pipe *pi)
+ {
+ int i;
+- int nextin, nextout;
+- int pipefds[2]; /* pipefds[0] is for reading */
++ int nextin;
++ int pipefds[2]; /* pipefds[0] is for reading */
+ struct child_prog *child;
+ const struct built_in_command *x;
+ char *p;
+@@ -1786,9 +1790,8 @@
+ int rcode;
+ const int single_fg = (pi->num_progs == 1 && pi->followup != PIPE_BG);
+
+- debug_printf_exec("run_pipe_real start: single_fg=%d\n", single_fg);
++ debug_printf_exec("run_pipe start: single_fg=%d\n", single_fg);
+
+- nextin = 0;
+ #if ENABLE_HUSH_JOB
+ pi->pgrp = -1;
+ #endif
+@@ -1803,11 +1806,11 @@
+ if (single_fg && child->group && child->subshell == 0) {
+ debug_printf("non-subshell grouping\n");
+ setup_redirects(child, squirrel);
+- debug_printf_exec(": run_list_real\n");
+- rcode = run_list_real(child->group);
++ debug_printf_exec(": run_list\n");
++ rcode = run_list(child->group) & 0xff;
+ restore_redirects(squirrel);
+- debug_printf_exec("run_pipe_real return %d\n", rcode);
+- return rcode; // do we need to add '... & 0xff' ?
++ debug_printf_exec("run_pipe return %d\n", rcode);
++ return rcode;
+ }
+
+ if (single_fg && child->argv != NULL) {
+@@ -1849,7 +1852,7 @@
+ rcode = x->function(argv_expanded) & 0xff;
+ free(argv_expanded);
+ restore_redirects(squirrel);
+- debug_printf_exec("run_pipe_real return %d\n", rcode);
++ debug_printf_exec("run_pipe return %d\n", rcode);
+ return rcode;
+ }
+ }
+@@ -1866,20 +1869,21 @@
+ rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded) & 0xff;
+ free(argv_expanded);
+ restore_redirects(squirrel);
+- debug_printf_exec("run_pipe_real return %d\n", rcode);
++ debug_printf_exec("run_pipe return %d\n", rcode);
+ return rcode;
+ }
+ }
+ #endif
+ }
+
+- /* Going to fork a child per each pipe member */
+- pi->running_progs = 0;
+-
+ /* Disable job control signals for shell (parent) and
+ * for initial child code after fork */
+ set_jobctrl_sighandler(SIG_IGN);
+
++ /* Going to fork a child per each pipe member */
++ pi->running_progs = 0;
++ nextin = 0;
++
+ for (i = 0; i < pi->num_progs; i++) {
+ child = &(pi->progs[i]);
+ if (child->argv)
+@@ -1888,42 +1892,34 @@
+ debug_printf_exec(": pipe member with no argv\n");
+
+ /* pipes are inserted between pairs of commands */
+- if ((i + 1) < pi->num_progs) {
+- pipe(pipefds);
+- nextout = pipefds[1];
+- } else {
+- nextout = 1;
+- pipefds[0] = -1;
+- }
++ pipefds[0] = 0;
++ pipefds[1] = 1;
++ if ((i + 1) < pi->num_progs)
++ xpipe(pipefds);
+
+- /* XXX test for failed fork()? */
+-#if BB_MMU
+- child->pid = fork();
+-#else
+- child->pid = vfork();
+-#endif
++ child->pid = BB_MMU ? fork() : vfork();
+ if (!child->pid) { /* child */
+- /* Every child adds itself to new process group
+- * with pgid == pid of first child in pipe */
+ #if ENABLE_HUSH_JOB
++ /* Every child adds itself to new process group
++ * with pgid == pid_of_first_child_in_pipe */
+ if (run_list_level == 1 && interactive_fd) {
++ pid_t pgrp;
+ /* Don't do pgrp restore anymore on fatal signals */
+ set_fatal_sighandler(SIG_DFL);
+- if (pi->pgrp < 0) /* true for 1st process only */
+- pi->pgrp = getpid();
+- if (setpgid(0, pi->pgrp) == 0 && pi->followup != PIPE_BG) {
++ pgrp = pi->pgrp;
++ if (pgrp < 0) /* true for 1st process only */
++ pgrp = getpid();
++ if (setpgid(0, pgrp) == 0 && pi->followup != PIPE_BG) {
+ /* We do it in *every* child, not just first,
+ * to avoid races */
+- tcsetpgrp(interactive_fd, pi->pgrp);
++ tcsetpgrp(interactive_fd, pgrp);
+ }
+ }
+ #endif
+- /* in non-interactive case fatal sigs are already SIG_DFL */
+ xmove_fd(nextin, 0);
+- xmove_fd(nextout, 1);
+- if (pipefds[0] != -1) {
+- close(pipefds[0]); /* opposite end of our output pipe */
+- }
++ xmove_fd(pipefds[1], 1); /* write end */
++ if (pipefds[0] > 1)
++ close(pipefds[0]); /* read end */
+ /* Like bash, explicit redirects override pipes,
+ * and the pipe fd is available for dup'ing. */
+ setup_redirects(child, NULL);
+@@ -1932,26 +1928,35 @@
+ set_jobctrl_sighandler(SIG_DFL);
+ set_misc_sighandler(SIG_DFL);
+ signal(SIGCHLD, SIG_DFL);
+- pseudo_exec(child);
++ pseudo_exec(child); /* does not return */
+ }
+
+- pi->running_progs++;
+-
++ if (child->pid < 0) { /* [v]fork failed */
++ /* Clearly indicate, was it fork or vfork */
++ bb_perror_msg(BB_MMU ? "fork" : "vfork");
++ } else {
++ pi->running_progs++;
+ #if ENABLE_HUSH_JOB
+- /* Second and next children need to know pid of first one */
+- if (pi->pgrp < 0)
+- pi->pgrp = child->pid;
++ /* Second and next children need to know pid of first one */
++ if (pi->pgrp < 0)
++ pi->pgrp = child->pid;
+ #endif
+- if (nextin != 0)
+- close(nextin);
+- if (nextout != 1)
+- close(nextout);
++ }
+
+- /* If there isn't another process, nextin is garbage
+- but it doesn't matter */
++ if (i)
++ close(nextin);
++ if ((i + 1) < pi->num_progs)
++ close(pipefds[1]); /* write end */
++ /* Pass read (output) pipe end to next iteration */
+ nextin = pipefds[0];
+ }
+- debug_printf_exec("run_pipe_real return -1\n");
++
++ if (!pi->running_progs) {
++ debug_printf_exec("run_pipe return 1 (all forks failed, no children)\n");
++ return 1;
++ }
++
++ debug_printf_exec("run_pipe return -1 (%u children started)\n", pi->running_progs);
+ return -1;
+ }
+
+@@ -2020,7 +2025,7 @@
+
+ /* NB: called by pseudo_exec, and therefore must not modify any
+ * global data until exec/_exit (we can be a child after vfork!) */
+-static int run_list_real(struct pipe *pi)
++static int run_list(struct pipe *pi)
+ {
+ struct pipe *rpipe;
+ #if ENABLE_HUSH_LOOPS
+@@ -2029,7 +2034,6 @@
+ char **for_list = NULL;
+ int flag_rep = 0;
+ #endif
+- int save_num_progs;
+ int flag_skip = 1;
+ int rcode = 0; /* probably for gcc only */
+ int flag_restore = 0;
+@@ -2041,7 +2045,7 @@
+ reserved_style rword;
+ reserved_style skip_more_for_this_rword = RES_XXXX;
+
+- debug_printf_exec("run_list_real start lvl %d\n", run_list_level + 1);
++ debug_printf_exec("run_list start lvl %d\n", run_list_level + 1);
+
+ #if ENABLE_HUSH_LOOPS
+ /* check syntax for "for" */
+@@ -2050,7 +2054,7 @@
+ && (rpipe->next == NULL)
+ ) {
+ syntax("malformed for"); /* no IN or no commands after IN */
+- debug_printf_exec("run_list_real lvl %d return 1\n", run_list_level);
++ debug_printf_exec("run_list lvl %d return 1\n", run_list_level);
+ return 1;
+ }
+ if ((rpipe->res_word == RES_IN && rpipe->next->res_word == RES_IN && rpipe->next->progs[0].argv != NULL)
+@@ -2058,7 +2062,7 @@
+ ) {
+ /* TODO: what is tested in the first condition? */
+ syntax("malformed for"); /* 2nd condition: not followed by IN */
+- debug_printf_exec("run_list_real lvl %d return 1\n", run_list_level);
++ debug_printf_exec("run_list lvl %d return 1\n", run_list_level);
+ return 1;
+ }
+ }
+@@ -2106,9 +2110,10 @@
+ signal_SA_RESTART(SIGTSTP, handler_ctrl_z);
+ signal(SIGINT, handler_ctrl_c);
+ }
+-#endif
++#endif /* JOB */
+
+ for (; pi; pi = flag_restore ? rpipe : pi->next) {
++//why? int save_num_progs;
+ rword = pi->res_word;
+ #if ENABLE_HUSH_LOOPS
+ if (rword == RES_WHILE || rword == RES_UNTIL || rword == RES_FOR) {
+@@ -2181,12 +2186,12 @@
+ #endif
+ if (pi->num_progs == 0)
+ continue;
+- save_num_progs = pi->num_progs; /* save number of programs */
+- debug_printf_exec(": run_pipe_real with %d members\n", pi->num_progs);
+- rcode = run_pipe_real(pi);
++//why? save_num_progs = pi->num_progs;
++ debug_printf_exec(": run_pipe with %d members\n", pi->num_progs);
++ rcode = run_pipe(pi);
+ if (rcode != -1) {
+ /* We only ran a builtin: rcode was set by the return value
+- * of run_pipe_real(), and we don't need to wait for anything. */
++ * of run_pipe(), and we don't need to wait for anything. */
+ } else if (pi->followup == PIPE_BG) {
+ /* What does bash do with attempts to background builtins? */
+ /* Even bash 3.2 doesn't do that well with nested bg:
+@@ -2199,7 +2204,6 @@
+ rcode = EXIT_SUCCESS;
+ } else {
+ #if ENABLE_HUSH_JOB
+- /* Paranoia, just "interactive_fd" should be enough? */
+ if (run_list_level == 1 && interactive_fd) {
+ /* waits for completion, then fg's main shell */
+ rcode = checkjobs_and_fg_shell(pi);
+@@ -2213,7 +2217,7 @@
+ }
+ debug_printf_exec(": setting last_return_code=%d\n", rcode);
+ last_return_code = rcode;
+- pi->num_progs = save_num_progs; /* restore number of programs */
++//why? pi->num_progs = save_num_progs;
+ #if ENABLE_HUSH_IF
+ if (rword == RES_IF || rword == RES_ELIF)
+ next_if_code = rcode; /* can be overwritten a number of times */
+@@ -2244,7 +2248,7 @@
+ signal(SIGINT, SIG_IGN);
+ }
+ #endif
+- debug_printf_exec("run_list_real lvl %d return %d\n", run_list_level + 1, rcode);
++ debug_printf_exec("run_list lvl %d return %d\n", run_list_level + 1, rcode);
+ return rcode;
+ }
+
+@@ -2318,19 +2322,19 @@
+ }
+
+ /* Select which version we will use */
+-static int run_list(struct pipe *pi)
++static int run_and_free_list(struct pipe *pi)
+ {
+ int rcode = 0;
+- debug_printf_exec("run_list entered\n");
+- if (fake_mode == 0) {
+- debug_printf_exec(": run_list_real with %d members\n", pi->num_progs);
+- rcode = run_list_real(pi);
++ debug_printf_exec("run_and_free_list entered\n");
++ if (!fake_mode) {
++ debug_printf_exec(": run_list with %d members\n", pi->num_progs);
++ rcode = run_list(pi);
+ }
+ /* free_pipe_list has the side effect of clearing memory.
+- * In the long run that function can be merged with run_list_real,
++ * In the long run that function can be merged with run_list,
+ * but doing that now would hobble the debugging effort. */
+- free_pipe_list(pi, 0);
+- debug_printf_exec("run_list return %d\n", rcode);
++ free_pipe_list(pi, /* indent: */ 0);
++ debug_printf_exec("run_nad_free_list return %d\n", rcode);
+ return rcode;
+ }
+
+@@ -3224,15 +3228,17 @@
+ int pid, channel[2];
+
+ xpipe(channel);
+- pid = fork();
+- if (pid < 0) {
+- bb_perror_msg_and_die("fork");
+- } else if (pid == 0) {
++/* *** NOMMU WARNING *** */
++/* By using vfork here, we suspend parent till child exits or execs.
++ * If child will not do it before it fills the pipe, it can block forever
++ * in write(STDOUT_FILENO), and parent (shell) will be also stuck.
++ */
++ pid = BB_MMU ? fork() : vfork();
++ if (pid < 0)
++ bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
++ if (pid == 0) { /* child */
+ close(channel[0]);
+- if (channel[1] != 1) {
+- dup2(channel[1], 1);
+- close(channel[1]);
+- }
++ xmove_fd(channel[1], 1);
+ /* Prevent it from trying to handle ctrl-z etc */
+ #if ENABLE_HUSH_JOB
+ run_list_level = 1;
+@@ -3244,11 +3250,12 @@
+ * everywhere outside actual command execution. */
+ /*set_jobctrl_sighandler(SIG_IGN);*/
+ set_misc_sighandler(SIG_DFL);
+- _exit(run_list_real(head)); /* leaks memory */
++ _exit(run_list(head)); /* leaks memory */
+ }
+ close(channel[1]);
+ pf = fdopen(channel[0], "r");
+ return pf;
++ /* head is freed by the caller */
+ }
+
+ /* Return code is exit status of the process that is run. */
+@@ -3272,7 +3279,8 @@
+ b_free(&result);
+
+ p = generate_stream_from_list(inner.list_head);
+- if (p == NULL) return 1;
++ if (p == NULL)
++ return 1;
+ close_on_exec_on(fileno(p));
+ setup_file_in_str(&pipe_str, p);
+
+@@ -3297,7 +3305,7 @@
+ *@the same time. That would be a lot of work, and contrary
+ * to the KISS philosophy of this program. */
+ retcode = fclose(p);
+- free_pipe_list(inner.list_head, 0);
++ free_pipe_list(inner.list_head, /* indent: */ 0);
+ debug_printf("closed FILE from child, retcode=%d\n", retcode);
+ return retcode;
+ }
+@@ -3677,8 +3685,8 @@
+ done_word(&temp, &ctx);
+ done_pipe(&ctx, PIPE_SEQ);
+ debug_print_tree(ctx.list_head, 0);
+- debug_printf_exec("parse_stream_outer: run_list\n");
+- run_list(ctx.list_head);
++ debug_printf_exec("parse_stream_outer: run_and_free_list\n");
++ run_and_free_list(ctx.list_head);
+ } else {
+ if (ctx.old_flag != 0) {
+ free(ctx.stack);
+@@ -3687,7 +3695,7 @@
+ temp.nonnull = 0;
+ temp.o_quote = 0;
+ inp->p = NULL;
+- free_pipe_list(ctx.list_head, 0);
++ free_pipe_list(ctx.list_head, /* indent: */ 0);
+ }
+ b_free(&temp);
+ } while (rcode != -1 && !(parse_flag & PARSEFLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */
+@@ -3901,14 +3909,14 @@
+
+ if (argv[optind] == NULL) {
+ opt = parse_and_run_file(stdin);
+- goto final_return;
++ } else {
++ debug_printf("\nrunning script '%s'\n", argv[optind]);
++ global_argv = argv + optind;
++ global_argc = argc - optind;
++ input = xfopen(argv[optind], "r");
++ fcntl(fileno(input), F_SETFD, FD_CLOEXEC);
++ opt = parse_and_run_file(input);
+ }
+-
+- debug_printf("\nrunning script '%s'\n", argv[optind]);
+- global_argv = argv + optind;
+- global_argc = argc - optind;
+- input = xfopen(argv[optind], "r");
+- opt = parse_and_run_file(input);
+
+ final_return:
+
Added: trunk/buildroot/package/busybox/busybox-1.9.0-mdev.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-mdev.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-mdev.patch 2008-02-14 14:45:23 UTC (rev 21017)
@@ -0,0 +1,17 @@
+--- busybox-1.9.0/util-linux/mdev.c Fri Dec 21 23:16:45 2007
++++ busybox-1.9.0-mdev/util-linux/mdev.c Tue Feb 12 16:57:00 2008
+@@ -78,8 +78,12 @@
+ val = strtok(vline, " \t");
+ vline = NULL;
+ } while (val && !*val);
+- if (!val)
+- break;
++ if (!val) {
++ if (field)
++ break;
++ else
++ goto next_line;
++ }
+
+ if (field == 0) {
+
Added: trunk/buildroot/package/busybox/busybox-1.9.0-test.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-test.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-test.patch 2008-02-14 14:45:23 UTC (rev 21017)
@@ -0,0 +1,88 @@
+--- busybox-1.9.0/coreutils/test.c Fri Dec 21 23:00:29 2007
++++ busybox-1.9.0-test/coreutils/test.c Sat Feb 9 06:45:50 2008
+@@ -555,4 +555,4 @@
+ {
+ int res;
+ const char *arg0;
+- bool _off;
++ bool negate = 0;
+
+ arg0 = bb_basename(argv[0]);
+ if (arg0[0] == '[') {
+@@ -578,1 +578,1 @@
+ INIT_S();
+
+ res = setjmp(leaving);
+- if (res) {
++ if (res)
+ goto ret;
+- }
+
+ /* resetting ngroups is probably unnecessary. it will
+ * force a new call to getgroups(), which prevents using
+@@ -592,2 +591,2 @@
+ */
+ ngroups = 0;
+
++ //argc--;
++ argv++;
++
+ /* Implement special cases from POSIX.2, section 4.62.4 */
+- if (argc == 1) {
++ if (!argv[0]) { /* "test" */
+ res = 1;
+ goto ret;
+ }
+- if (argc == 2) {
+- res = (*argv[1] == '\0');
++ if (LONE_CHAR(argv[0], '!') && argv[1]) {
++ negate = 1;
++ //argc--;
++ argv++;
++ }
++ if (!argv[1]) { /* "test [!] arg" */
++ res = (*argv[0] == '\0');
+ goto ret;
+ }
+-
+- /* remember if we saw argc==4 which wants *no* '!' test */
+- _off = argc - 4;
+- if (_off ? (LONE_CHAR(argv[1], '!'))
+- : (argv[1][0] != '!' || argv[1][1] != '\0')
+- ) {
+- if (argc == 3) {
+- res = (*argv[2] != '\0');
+- goto ret;
+- }
+-
+- t_lex(argv[2 + _off]);
++ if (argv[2] && !argv[3]) {
++ t_lex(argv[1]);
+ if (t_wp_op && t_wp_op->op_type == BINOP) {
+- t_wp = &argv[1 + _off];
+- res = (binop() == _off);
++ /* "test [!] arg1 <binary_op> arg2" */
++ t_wp = &argv[0];
++ res = (binop() == 0);
+ goto ret;
+ }
+ }
+- t_wp = &argv[1];
++
++ /* Some complex expression. Undo '!' removal */
++ if (negate) {
++ negate = 0;
++ //argc++;
++ argv--;
++ }
++ t_wp = &argv[0];
+ res = !oexpr(t_lex(*t_wp));
+
+ if (*t_wp != NULL && *++t_wp != NULL) {
+@@ -628,5 +633,5 @@
+ }
+ ret:
+ DEINIT_S();
+- return res;
++ return negate ? !res : res;
+ }
Added: trunk/buildroot/package/busybox/busybox-1.9.0-zcip.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-zcip.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-zcip.patch 2008-02-14 14:45:23 UTC (rev 21017)
@@ -0,0 +1,69 @@
+--- busybox-1.9.0/networking/zcip.c Fri Dec 21 23:00:25 2007
++++ busybox-1.9.0-zcip/networking/zcip.c Mon Feb 4 10:37:14 2008
+@@ -180,7 +180,7 @@
+ char *r_opt;
+ unsigned opts;
+
+- /* Ugly trick, but I want these zeroed in one go */
++ // ugly trick, but I want these zeroed in one go
+ struct {
+ const struct in_addr null_ip;
+ const struct ether_addr null_addr;
+@@ -214,8 +214,17 @@
+ // exactly 2 args; -v accumulates and implies -f
+ opt_complementary = "=2:vv:vf";
+ opts = getopt32(argv, "fqr:v", &r_opt, &verbose);
++#if !BB_MMU
++ // on NOMMU reexec early (or else we will rerun things twice)
++ if (!FOREGROUND)
++ bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
++#endif
++ // open an ARP socket
++ // (need to do it before openlog to prevent openlog from taking
++ // fd 3 (sock_fd==3))
++ xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd);
+ if (!FOREGROUND) {
+- /* Do it early, before all bb_xx_msg calls */
++ // do it before all bb_xx_msg calls
+ openlog(applet_name, 0, LOG_DAEMON);
+ logmode |= LOGMODE_SYSLOG;
+ }
+@@ -226,11 +235,6 @@
+ bb_error_msg_and_die("invalid link address");
+ }
+ }
+- // On NOMMU reexec early (or else we will rerun things twice)
+-#if !BB_MMU
+- if (!FOREGROUND)
+- bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+-#endif
+ argc -= optind;
+ argv += optind;
+
+@@ -249,8 +253,6 @@
+ //TODO: are we leaving sa_family == 0 (AF_UNSPEC)?!
+ safe_strncpy(saddr.sa_data, intf, sizeof(saddr.sa_data));
+
+- // open an ARP socket
+- xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd);
+ // bind to the interface's ARP socket
+ xbind(sock_fd, &saddr, sizeof(saddr));
+
+@@ -290,7 +292,7 @@
+ // restarting after address conflicts:
+ // - start with some address we want to try
+ // - short random delay
+- // - arp probes to see if another host else uses it
++ // - arp probes to see if another host uses it
+ // - arp announcements that we're claiming it
+ // - use it
+ // - defend it, within limits
+@@ -321,1 +323,1 @@
+ switch (safe_poll(fds, 1, timeout_ms)) {
+
+ default:
+- /*bb_perror_msg("poll"); - done in safe_poll */
++ //bb_perror_msg("poll"); - done in safe_poll
+ return EXIT_FAILURE;
+
+ // timeout
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-02-02 21:49 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-02-02 21:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-02-02 13:49:48 -0800 (Sat, 02 Feb 2008)
New Revision: 20936
Log:
busybox: More 1.9.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.9.0-fsck.patch
trunk/buildroot/package/busybox/busybox-1.9.0-mkswap.patch
trunk/buildroot/package/busybox/busybox-1.9.0-msh.patch
trunk/buildroot/package/busybox/busybox-1.9.0-stty.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.9.0-fsck.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-fsck.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-fsck.patch 2008-02-02 21:49:48 UTC (rev 20936)
@@ -0,0 +1,15 @@
+--- busybox-1.9.0/e2fsprogs/fsck.c Fri Dec 21 22:00:31 2007
++++ busybox-1.9.0-fsck/e2fsprogs/fsck.c Sat Feb 2 18:55:22 2008
+@@ -665,6 +665,12 @@
+ for (i = num_args+1; i < argc; i++)
+ free(argv[i]);
+
++ /* No pid, so don't record an instance */
++ if (pid < 0) {
++ free(inst);
++ return;
++ }
++
+ inst->pid = pid;
+ inst->prog = argv[0];
+ inst->type = xstrdup(type);
Added: trunk/buildroot/package/busybox/busybox-1.9.0-mkswap.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-mkswap.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-mkswap.patch 2008-02-02 21:49:48 UTC (rev 20936)
@@ -0,0 +1,15 @@
+--- busybox-1.9.0/util-linux/mkswap.c Fri Dec 21 22:00:33 2007
++++ busybox-1.9.0-mkswap/util-linux/mkswap.c Sat Feb 2 18:55:31 2008
+@@ -64,9 +64,10 @@
+ // Figure out how big the device is and announce our intentions.
+
+ fd = xopen(argv[1], O_RDWR);
+- len = fdlength(fd);
++ len = lseek(fd, 0, SEEK_END);
++ lseek(fd, 0, SEEK_SET);
+ pagesize = getpagesize();
+- printf("Setting up swapspace version 1, size = %"OFF_FMT"d bytes\n",
++ printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n",
+ len - pagesize);
+ mkswap_selinux_setcontext(fd, argv[1]);
+
Added: trunk/buildroot/package/busybox/busybox-1.9.0-msh.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-msh.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-msh.patch 2008-02-02 21:49:48 UTC (rev 20936)
@@ -0,0 +1,79 @@
+--- busybox-1.9.0/include/libbb.h Fri Dec 21 22:00:31 2007
++++ busybox-1.9.0-msh/include/libbb.h Sat Feb 2 18:55:36 2008
+@@ -950,10 +950,9 @@
+ };
+ line_input_t *new_line_input_t(int flags);
+ /* Returns:
+- * -1 on read errors or EOF, or on bare Ctrl-D.
+- * 0 on ctrl-C,
++ * -1 on read errors or EOF, or on bare Ctrl-D,
++ * 0 on ctrl-C (the line entered is still returned in 'command'),
+ * >0 length of input string, including terminating '\n'
+- * [is this true? stores "" in 'command' if return value is 0 or -1]
+ */
+ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state);
+ #else
+--- busybox-1.9.0/libbb/lineedit.c Mon Dec 24 14:08:25 2007
++++ busybox-1.9.0-msh/libbb/lineedit.c Sat Feb 2 18:55:36 2008
+@@ -1315,8 +1315,8 @@
+ #define CTRL(a) ((a) & ~0x40)
+
+ /* Returns:
+- * -1 on read errors or EOF, or on bare Ctrl-D.
+- * 0 on ctrl-C,
++ * -1 on read errors or EOF, or on bare Ctrl-D,
++ * 0 on ctrl-C (the line entered is still returned in 'command'),
+ * >0 length of input string, including terminating '\n'
+ */
+ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
+--- busybox-1.9.0/shell/msh.c Fri Dec 21 22:00:28 2007
++++ busybox-1.9.0-msh/shell/msh.c Sat Feb 2 18:57:12 2008
+@@ -2825,11 +2825,13 @@
+
+ if (pin != NULL) {
+ xmove_fd(pin[0], 0);
+- if (pin[1] != 0) close(pin[1]);
++ if (pin[1] != 0)
++ close(pin[1]);
+ }
+ if (pout != NULL) {
+ xmove_fd(pout[1], 1);
+- if (pout[1] != 1) close(pout[0]);
++ if (pout[1] != 1)
++ close(pout[0]);
+ }
+
+ iopp = t->ioact;
+@@ -4162,7 +4164,7 @@
+ return 0;
+ }
+ if (i != 0) {
+- waitpid(i, NULL, 0);
++ waitpid(i, NULL, 0); // safe_waitpid?
+ global_env.iop->argp->aword = ++cp;
+ close(pf[1]);
+ PUSHIO(afile, remap(pf[0]),
+@@ -4181,7 +4183,8 @@
+ * echo "$files" >zz
+ */
+ xmove_fd(pf[1], 1);
+- if (pf[0] != 1) close(pf[0]);
++ if (pf[0] != 1)
++ close(pf[0]);
+
+ argument_list[0] = (char *) DEFAULT_SHELL;
+ argument_list[1] = (char *) "-c";
+@@ -4834,9 +4837,11 @@
+ static int position = 0, size = 0;
+
+ while (size == 0 || position >= size) {
+- read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state);
+- size = strlen(filechar_cmdbuf);
++ size = read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state);
++ if (size < 0) /* Error/EOF */
++ exit(0);
+ position = 0;
++ /* if Ctrl-C, size == 0 and loop will repeat */
+ }
+ c = filechar_cmdbuf[position];
+ position++;
Added: trunk/buildroot/package/busybox/busybox-1.9.0-stty.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-stty.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-stty.patch 2008-02-02 21:49:48 UTC (rev 20936)
@@ -0,0 +1,37 @@
+--- busybox-1.9.0/coreutils/stty.c Fri Dec 21 22:00:29 2007
++++ busybox-1.9.0-stty/coreutils/stty.c Sat Feb 2 18:55:40 2008
+@@ -780,30 +780,14 @@
+
+ static const struct mode_info *find_mode(const char *name)
+ {
+- int i = 0;
+- const char *m = mode_name;
+-
+- while (*m) {
+- if (strcmp(name, m) == 0)
+- return &mode_info[i];
+- m += strlen(m) + 1;
+- i++;
+- }
+- return NULL;
++ int i = index_in_strings(mode_name, name);
++ return i >= 0 ? &mode_info[i] : NULL;
+ }
+
+ static const struct control_info *find_control(const char *name)
+ {
+- int i = 0;
+- const char *m = mode_name;
+-
+- while (*m) {
+- if (strcmp(name, m) == 0)
+- return &control_info[i];
+- m += strlen(m) + 1;
+- i++;
+- }
+- return NULL;
++ int i = index_in_strings(control_name, name);
++ return i >= 0 ? &control_info[i] : NULL;
+ }
+
+ enum {
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-08 12:51 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-08 12:51 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-08 04:51:36 -0800 (Tue, 08 Jan 2008)
New Revision: 20821
Log:
busybox: 1.9.0 fixes
Added:
trunk/buildroot/package/busybox/busybox-1.9.0-allno.patch
trunk/buildroot/package/busybox/busybox-1.9.0-iproute.patch
trunk/buildroot/package/busybox/busybox-1.9.0-nameif.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.9.0-allno.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-allno.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-allno.patch 2008-01-08 12:51:36 UTC (rev 20821)
@@ -0,0 +1,23 @@
+diff -urN busybox-1.9.0/Makefile.help busybox-1.9.0-allno/Makefile.help
+--- busybox-1.9.0/Makefile.help 2007-12-21 22:00:33.000000000 +0000
++++ busybox-1.9.0-allno/Makefile.help 2008-01-04 20:03:30.000000000 +0000
+@@ -16,7 +16,6 @@
+ @echo 'Configuration:'
+ @echo ' allnoconfig - disable all symbols in .config'
+ @echo ' allyesconfig - enable all symbols in .config (see defconfig)'
+- @echo ' allbareconfig - enable all applets without any sub-features'
+ @echo ' config - text based configurator (of last resort)'
+ @echo ' defconfig - set .config to largest generic configuration'
+ @echo ' menuconfig - interactive curses-based configurator'
+diff -urN busybox-1.9.0/applets/applet_tables.c busybox-1.9.0-allno/applets/applet_tables.c
+--- busybox-1.9.0/applets/applet_tables.c 2007-12-24 14:08:25.000000000 +0000
++++ busybox-1.9.0-allno/applets/applet_tables.c 2008-01-04 20:00:12.000000000 +0000
+@@ -71,7 +71,7 @@
+
+ puts("/* This is a generated file, don't edit */");
+
+- puts("const char applet_names[] ALIGN1 =");
++ puts("const char applet_names[] ALIGN1 = \"\" \n");
+ for (i = 0; i < NUM_APPLETS; i++) {
+ printf("\"%s\" \"\\0\"\n", applets[i].name);
+ }
Added: trunk/buildroot/package/busybox/busybox-1.9.0-iproute.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-iproute.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-iproute.patch 2008-01-08 12:51:36 UTC (rev 20821)
@@ -0,0 +1,25 @@
+diff -urN busybox-1.9.0/networking/libiproute/iproute.c busybox-1.9.0-iproute/networking/libiproute/iproute.c
+--- busybox-1.9.0/networking/libiproute/iproute.c 2007-12-21 22:00:23.000000000 +0000
++++ busybox-1.9.0-iproute/networking/libiproute/iproute.c 2008-01-04 15:18:33.000000000 +0000
+@@ -841,15 +841,17 @@
+ /*0-3*/ "add\0""append\0""change\0""chg\0"
+ /*4-7*/ "delete\0""get\0""list\0""show\0"
+ /*8..*/ "prepend\0""replace\0""test\0""flush\0";
+- int command_num = 6;
++ int command_num;
+ unsigned flags = 0;
+ int cmd = RTM_NEWROUTE;
+
++ if (!*argv)
++ return iproute_list_or_flush(argv, 0);
++
+ /* "Standard" 'ip r a' treats 'a' as 'add', not 'append' */
+ /* It probably means that it is using "first match" rule */
+- if (*argv) {
+- command_num = index_in_substrings(ip_route_commands, *argv);
+- }
++ command_num = index_in_substrings(ip_route_commands, *argv);
++
+ switch (command_num) {
+ case 0: /* add */
+ flags = NLM_F_CREATE|NLM_F_EXCL;
Added: trunk/buildroot/package/busybox/busybox-1.9.0-nameif.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.9.0-nameif.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.9.0-nameif.patch 2008-01-08 12:51:36 UTC (rev 20821)
@@ -0,0 +1,33 @@
+diff -urN busybox-1.9.0/networking/nameif.c busybox-1.9.0-nameif/networking/nameif.c
+--- busybox-1.9.0/networking/nameif.c 2007-12-24 14:08:25.000000000 +0000
++++ busybox-1.9.0-nameif/networking/nameif.c 2008-01-04 20:05:48.000000000 +0000
+@@ -50,18 +50,18 @@
+ #define ETHTOOL_BUSINFO_LEN 32
+ /* these strings are set to whatever the driver author decides... */
+ struct ethtool_drvinfo {
+- __u32 cmd;
+- char driver[32]; /* driver short name, "tulip", "eepro100" */
+- char version[32]; /* driver version string */
+- char fw_version[32]; /* firmware version string, if applicable */
+- char bus_info[ETHTOOL_BUSINFO_LEN]; /* Bus info for this IF. */
++ uint32_t cmd;
++ char driver[32]; /* driver short name, "tulip", "eepro100" */
++ char version[32]; /* driver version string */
++ char fw_version[32]; /* firmware version string, if applicable */
++ char bus_info[ETHTOOL_BUSINFO_LEN]; /* Bus info for this IF. */
+ /* For PCI devices, use pci_dev->slot_name. */
+- char reserved1[32];
+- char reserved2[16];
+- __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
+- __u32 testinfo_len;
+- __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
+- __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
++ char reserved1[32];
++ char reserved2[16];
++ uint32_t n_stats; /* number of u64's from ETHTOOL_GSTATS */
++ uint32_t testinfo_len;
++ uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
++ uint32_t regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
+ };
+ #define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
+ #endif
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-03 13:33 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-03 13:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-03 05:33:30 -0800 (Thu, 03 Jan 2008)
New Revision: 20705
Log:
busybox: Don't depend on long gone busybox 1.0.1 symbol
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:28 UTC (rev 20704)
+++ trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:30 UTC (rev 20705)
@@ -88,7 +88,6 @@
config BR2_PACKAGE_BUSYBOX_SKELETON
bool "use minimal target skeleton"
depends on BR2_PACKAGE_BUSYBOX
- depends on !BR2_BUSYBOX_VERSION_1_0_1
help
Use a minimal target skeleton. Make sure to select mdev
which is used to populate /dev/.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-03 13:33 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-03 13:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-03 05:33:28 -0800 (Thu, 03 Jan 2008)
New Revision: 20704
Log:
busybox: Bump version to 1.9.0
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:25 UTC (rev 20703)
+++ trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:28 UTC (rev 20704)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_8_X
+ default BR2_BUSYBOX_VERSION_1_9_X
help
Select the version of BusyBox you wish to use.
@@ -30,7 +30,11 @@
config BR2_BUSYBOX_VERSION_1_8_X
bool "BusyBox 1.8.x"
+ depends on BR2_DEPRECATED || BR2_RECENT
+ config BR2_BUSYBOX_VERSION_1_9_X
+ bool "BusyBox 1.9.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -42,6 +46,7 @@
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.2" if BR2_BUSYBOX_VERSION_1_8_X
+ default "1.9.0" if BR2_BUSYBOX_VERSION_1_9_X
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -65,6 +70,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_X
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_8_X
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_9_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-03 13:33 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-03 13:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-03 05:33:25 -0800 (Thu, 03 Jan 2008)
New Revision: 20703
Log:
busybox: Bump version to 1.8.2
Added:
trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch
trunk/buildroot/package/busybox/busybox-1.8.2-static.patch
trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:21 UTC (rev 20702)
+++ trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:25 UTC (rev 20703)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_7_X
+ default BR2_BUSYBOX_VERSION_1_8_X
help
Select the version of BusyBox you wish to use.
@@ -26,7 +26,11 @@
config BR2_BUSYBOX_VERSION_1_7_X
bool "BusyBox 1.7.x"
+ depends on BR2_DEPRECATED || BR2_RECENT
+ config BR2_BUSYBOX_VERSION_1_8_X
+ bool "BusyBox 1.8.x"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -37,6 +41,7 @@
default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X
+ default "1.8.2" if BR2_BUSYBOX_VERSION_1_8_X
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -59,6 +64,7 @@
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_X
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_8_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.8.2-arping.patch 2008-01-03 13:33:25 UTC (rev 20703)
@@ -0,0 +1,13 @@
+diff -urN busybox-1.8.2/networking/arping.c busybox-1.8.2-arping/networking/arping.c
+--- busybox-1.8.2/networking/arping.c 2007-11-10 01:40:47.000000000 +0000
++++ busybox-1.8.2-arping/networking/arping.c 2007-12-18 10:31:55.000000000 +0000
+@@ -207,7 +207,8 @@
+ }
+
+ if (last) {
+- printf(" %u.%03ums\n", last / 1000, last % 1000);
++ unsigned diff = MONOTONIC_US() - last;
++ printf(" %u.%03ums\n", diff / 1000, diff % 1000);
+ } else {
+ printf(" UNSOLICITED?\n");
+ }
Added: trunk/buildroot/package/busybox/busybox-1.8.2-static.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.8.2-static.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.8.2-static.patch 2008-01-03 13:33:25 UTC (rev 20703)
@@ -0,0 +1,12 @@
+diff -urN busybox-1.8.2/applets/applets.c busybox-1.8.2-static/applets/applets.c
+--- busybox-1.8.2/applets/applets.c 2007-11-10 01:40:53.000000000 +0000
++++ busybox-1.8.2-static/applets/applets.c 2007-12-09 03:46:04.000000000 +0000
+@@ -17,7 +17,7 @@
+ #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
+ #warning Note that glibc is unsuitable for static linking anyway.
+ #warning If you still want to do it, remove -Wl,--gc-sections
+-#warning from top-level Makefile and remove this warning.
++#warning from file scripts/trylink and remove this warning.
+ #error Aborting compilation.
+ #endif
+
Added: trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.8.2-vi.patch 2008-01-03 13:33:25 UTC (rev 20703)
@@ -0,0 +1,40 @@
+diff -urN busybox-1.8.2/editors/vi.c busybox-1.8.2-vi/editors/vi.c
+--- busybox-1.8.2/editors/vi.c 2007-11-10 01:40:54.000000000 +0000
++++ busybox-1.8.2-vi/editors/vi.c 2007-12-10 16:26:01.000000000 +0000
+@@ -184,6 +184,7 @@
+ #if ENABLE_FEATURE_VI_COLON
+ char *initial_cmds[3]; // currently 2 entries, NULL terminated
+ #endif
++ char readbuffer[MAX_LINELEN];
+ };
+ #define G (*ptr_to_globals)
+ #define text (G.text )
+@@ -200,6 +201,10 @@
+ #define term_orig (G.term_orig )
+ #define term_vi (G.term_vi )
+ #define initial_cmds (G.initial_cmds )
++#define readbuffer (G.readbuffer )
++#define INIT_G() do { \
++ PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
++} while (0)
+
+ static int init_text_buffer(char *); // init from file or create new
+ static void edit_file(char *); // edit one file
+@@ -321,7 +326,7 @@
+ my_pid = getpid();
+ #endif
+
+- PTR_TO_GLOBALS = xzalloc(sizeof(G));
++ INIT_G();
+
+ #if ENABLE_FEATURE_VI_CRASHME
+ srand((long) my_pid);
+@@ -2142,8 +2147,6 @@
+ return safe_poll(pfd, 1, hund*10) > 0;
+ }
+
+-#define readbuffer bb_common_bufsiz1
+-
+ static int readed_for_parse;
+
+ //----- IO Routines --------------------------------------------
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-03 13:33 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-03 13:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-03 05:33:21 -0800 (Thu, 03 Jan 2008)
New Revision: 20702
Log:
busybox: Bump version to 1.7.4
Added:
trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:19 UTC (rev 20701)
+++ trunk/buildroot/package/busybox/Config.in 2008-01-03 13:33:21 UTC (rev 20702)
@@ -36,7 +36,7 @@
string
default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
- default "1.7.2" if BR2_BUSYBOX_VERSION_1_7_X
+ default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
Added: trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.7.4-grep.patch 2008-01-03 13:33:21 UTC (rev 20702)
@@ -0,0 +1,38 @@
+diff -urN busybox-1.7.4/findutils/grep.c busybox-1.7.4-grep/findutils/grep.c
+--- busybox-1.7.4/findutils/grep.c 2007-09-03 04:48:54.000000000 -0700
++++ busybox-1.7.4-grep/findutils/grep.c 2007-12-08 19:02:33.000000000 -0800
+@@ -154,14 +154,14 @@
+
+ while ((line = xmalloc_getline(file)) != NULL) {
+ llist_t *pattern_ptr = pattern_head;
+- grep_list_data_t * gl;
++ grep_list_data_t *gl = gl; /* for gcc */
+
+ linenum++;
+ ret = 0;
+ while (pattern_ptr) {
+ gl = (grep_list_data_t *)pattern_ptr->data;
+ if (FGREP_FLAG) {
+- ret = strstr(line, gl->pattern) != NULL;
++ ret |= (strstr(line, gl->pattern) != NULL);
+ } else {
+ /*
+ * test for a postitive-assertion match (regexec returns success (0)
+@@ -255,8 +255,15 @@
+ print_n_lines_after = lines_after;
+ #endif
+ if (option_mask32 & OPT_o) {
+- line[regmatch.rm_eo] = '\0';
+- print_line(line + regmatch.rm_so, linenum, ':');
++ if (FGREP_FLAG) {
++ /* -Fo just prints the pattern
++ * (unless -v: -Fov doesnt print anything at all) */
++ if (ret)
++ print_line(gl->pattern, linenum, ':');
++ } else {
++ line[regmatch.rm_eo] = '\0';
++ print_line(line + regmatch.rm_so, linenum, ':');
++ }
+ } else {
+ print_line(line, linenum, ':');
+ }
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-03 13:33 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-03 13:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-03 05:33:19 -0800 (Thu, 03 Jan 2008)
New Revision: 20701
Log:
busybox: Remove unused 1.7.0 patches
Removed:
trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch
trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch
trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch
trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch
Changeset:
Deleted: trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch 2008-01-03 13:31:26 UTC (rev 20700)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch 2008-01-03 13:33:19 UTC (rev 20701)
@@ -1,95 +0,0 @@
-diff -urN busybox-1.7.0/networking/isrv.c busybox-1.7.0-gettimeofday_ns/networking/isrv.c
---- busybox-1.7.0/networking/isrv.c 2007-08-24 11:49:41.000000000 +0100
-+++ busybox-1.7.0-gettimeofday_ns/networking/isrv.c 2007-09-06 17:39:55.000000000 +0100
-@@ -21,20 +21,6 @@
-
- /* Helpers */
-
--/* Even if _POSIX_MONOTONIC_CLOCK is defined, this
-- * may require librt */
--#if 0 /*def _POSIX_MONOTONIC_CLOCK*/
--static time_t monotonic_time(void)
--{
-- struct timespec ts;
-- if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
-- time(&ts.tv_sec);
-- return ts.tv_sec;
--}
--#else
--#define monotonic_time() (time(NULL))
--#endif
--
- /* Opaque structure */
-
- struct isrv_state_t {
-@@ -258,7 +244,7 @@
- /* this peer is gone */
- remove_peer(state, peer);
- } else if (TIMEOUT) {
-- TIMEO_TBL[peer] = monotonic_time();
-+ TIMEO_TBL[peer] = monotonic_sec();
- }
- }
- }
-@@ -335,7 +321,7 @@
- break;
-
- if (timeout) {
-- time_t t = monotonic_time();
-+ time_t t = monotonic_sec();
- if (t != CURTIME) {
- CURTIME = t;
- handle_timeout(state, do_timeout);
-diff -urN busybox-1.7.0/runit/runsv.c busybox-1.7.0-gettimeofday_ns/runit/runsv.c
---- busybox-1.7.0/runit/runsv.c 2007-08-24 11:50:01.000000000 +0100
-+++ busybox-1.7.0-gettimeofday_ns/runit/runsv.c 2007-09-06 17:39:55.000000000 +0100
-@@ -33,6 +33,34 @@
- #include "libbb.h"
- #include "runit_lib.h"
-
-+#if ENABLE_MONOTONIC_SYSCALL
-+#include <sys/syscall.h>
-+
-+/* libc has incredibly messy way of doing this,
-+ * typically requiring -lrt. We just skip all this mess */
-+static void gettimeofday_ns(struct timespec *ts)
-+{
-+ syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
-+}
-+#else
-+static void gettimeofday_ns(struct timespec *ts)
-+{
-+ if (sizeof(struct timeval) == sizeof(struct timespec)
-+ && sizeof(((struct timeval*)ts)->tv_usec) == sizeof(ts->tv_nsec)
-+ ) {
-+ /* Cheat */
-+ gettimeofday((void*)ts, NULL);
-+ ts->tv_nsec *= 1000;
-+ } else {
-+ extern void BUG_need_to_implement_gettimeofday_ns(void);
-+ BUG_need_to_implement_gettimeofday_ns();
-+ }
-+}
-+#endif
-+
-+/* Compare possibly overflowing unsigned counters */
-+#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
-+
- static int selfpipe[2];
-
- /* state */
-@@ -126,14 +154,6 @@
- return 0;
- }
-
--#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
--
--#include <sys/syscall.h>
--static void gettimeofday_ns(struct timespec *ts)
--{
-- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
--}
--
- static void update_status(struct svdir *s)
- {
- ssize_t sz;
Deleted: trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch 2008-01-03 13:31:26 UTC (rev 20700)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch 2008-01-03 13:33:19 UTC (rev 20701)
@@ -1,107 +0,0 @@
-diff -urN busybox-1.7.0/applets/applets.c busybox-1.7.0-readlink/applets/applets.c
---- busybox-1.7.0/applets/applets.c 2007-08-24 11:50:02.000000000 +0100
-+++ busybox-1.7.0-readlink/applets/applets.c 2007-09-06 17:41:38.000000000 +0100
-@@ -546,7 +546,7 @@
- help:
- output_width = 80;
- if (ENABLE_FEATURE_AUTOWIDTH) {
-- /* Obtain the terminal width. */
-+ /* Obtain the terminal width */
- get_terminal_width_height(0, &output_width, NULL);
- }
- /* leading tab and room to wrap */
-@@ -580,12 +580,11 @@
-
- if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) {
- const char *busybox;
-- busybox = xmalloc_readlink_or_warn(bb_busybox_exec_path);
-+ busybox = xmalloc_readlink(bb_busybox_exec_path);
- if (!busybox)
- busybox = bb_busybox_exec_path;
- /* -s makes symlinks */
-- install_links(busybox,
-- argv[2] && strcmp(argv[2], "-s") == 0);
-+ install_links(busybox, argv[2] && strcmp(argv[2], "-s") == 0);
- return 0;
- }
-
-diff -urN busybox-1.7.0/include/libbb.h busybox-1.7.0-readlink/include/libbb.h
---- busybox-1.7.0/include/libbb.h 2007-08-24 11:49:55.000000000 +0100
-+++ busybox-1.7.0-readlink/include/libbb.h 2007-09-06 17:41:38.000000000 +0100
-@@ -248,9 +248,10 @@
- DIR *xopendir(const char *path);
- DIR *warn_opendir(const char *path);
-
--char *xrealloc_getcwd_or_warn(char *cwd);
-+/* UNUSED: char *xmalloc_realpath(const char *path); */
-+char *xmalloc_readlink(const char *path);
- char *xmalloc_readlink_or_warn(const char *path);
--char *xmalloc_realpath(const char *path);
-+char *xrealloc_getcwd_or_warn(char *cwd);
-
-
- //TODO: signal(sid, f) is the same? then why?
-@@ -316,8 +317,8 @@
- };
- /* Create stream socket, and allocate suitable lsa.
- * (lsa of correct size and lsa->sa.sa_family (AF_INET/AF_INET6))
-- * af == AF_UNSPEC will result in trying to create IPv6, and
-- * if kernel doesn't support it, IPv4.
-+ * af == AF_UNSPEC will result in trying to create IPv6 socket,
-+ * and if kernel doesn't support it, IPv4.
- */
- int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type);
- int xsocket_stream(len_and_sockaddr **lsap);
-diff -urN busybox-1.7.0/libbb/xreadlink.c busybox-1.7.0-readlink/libbb/xreadlink.c
---- busybox-1.7.0/libbb/xreadlink.c 2007-08-24 11:49:51.000000000 +0100
-+++ busybox-1.7.0-readlink/libbb/xreadlink.c 2007-09-06 17:41:38.000000000 +0100
-@@ -10,8 +10,7 @@
- * NOTE: This function returns a malloced char* that you will have to free
- * yourself. You have been warned.
- */
--
--char *xmalloc_readlink_or_warn(const char *path)
-+char *xmalloc_readlink(const char *path)
- {
- enum { GROWBY = 80 }; /* how large we will grow strings by */
-
-@@ -20,20 +19,30 @@
-
- do {
- buf = xrealloc(buf, bufsize += GROWBY);
-- readsize = readlink(path, buf, bufsize); /* 1st try */
-+ readsize = readlink(path, buf, bufsize);
- if (readsize == -1) {
-- bb_perror_msg("%s", path);
- free(buf);
- return NULL;
- }
-- }
-- while (bufsize < readsize + 1);
-+ } while (bufsize < readsize + 1);
-
- buf[readsize] = '\0';
-
- return buf;
- }
-
-+char *xmalloc_readlink_or_warn(const char *path)
-+{
-+ char *buf = xmalloc_readlink(path);
-+ if (!buf) {
-+ /* EINVAL => "file: Invalid argument" => puzzled user */
-+ bb_error_msg("%s: cannot read link (not a symlink?)", path);
-+ }
-+ return buf;
-+}
-+
-+/* UNUSED */
-+#if 0
- char *xmalloc_realpath(const char *path)
- {
- #if defined(__GLIBC__) && !defined(__UCLIBC__)
-@@ -46,3 +55,4 @@
- return xstrdup(realpath(path, buf));
- #endif
- }
-+#endif
Deleted: trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch 2008-01-03 13:31:26 UTC (rev 20700)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch 2008-01-03 13:33:19 UTC (rev 20701)
@@ -1,282 +0,0 @@
-diff -urN busybox-1.7.0/archival/bbunzip.c busybox-1.7.0-targz_nommu/archival/bbunzip.c
---- busybox-1.7.0/archival/bbunzip.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/bbunzip.c 2007-09-06 17:42:02.000000000 +0100
-@@ -298,7 +298,7 @@
- int unlzma_main(int argc, char **argv);
- int unlzma_main(int argc, char **argv)
- {
-- getopt32(argv, "c");
-+ getopt32(argv, "cf");
- argv += optind;
- /* lzmacat? */
- if (applet_name[4] == 'c')
-diff -urN busybox-1.7.0/archival/libunarchive/Kbuild busybox-1.7.0-targz_nommu/archival/libunarchive/Kbuild
---- busybox-1.7.0/archival/libunarchive/Kbuild 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/libunarchive/Kbuild 2007-09-06 17:42:02.000000000 +0100
-@@ -35,36 +35,34 @@
- get_header_tar.o \
- filter_accept_list_reassign.o
-
--# open_transformer uses fork(). Compile it only if absolutely necessary
- lib-$(CONFIG_RPM) += open_transformer.o
--lib-$(CONFIG_FEATURE_TAR_BZIP2) += open_transformer.o
--lib-$(CONFIG_FEATURE_TAR_LZMA) += open_transformer.o
--lib-$(CONFIG_FEATURE_TAR_GZIP) += open_transformer.o
--lib-$(CONFIG_FEATURE_TAR_COMPRESS) += open_transformer.o
--lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += open_transformer.o
--lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += open_transformer.o
--lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += open_transformer.o
--
--lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
--lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
--lib-$(CONFIG_UNLZMA) += decompress_unlzma.o
--lib-$(CONFIG_CPIO) += get_header_cpio.o
--lib-$(CONFIG_DPKG) += $(DPKG_FILES)
--lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES)
--lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o
--lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o
--lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
--lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
--lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o
--lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
--lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
--lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o
--lib-$(CONFIG_TAR) += get_header_tar.o
--lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
--lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
--lib-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o
--lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o
--lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
--lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
--lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o
-+lib-$(CONFIG_FEATURE_TAR_BZIP2) += open_transformer.o
-+lib-$(CONFIG_FEATURE_TAR_LZMA) += open_transformer.o
-+lib-$(CONFIG_FEATURE_TAR_GZIP) += open_transformer.o
-+lib-$(CONFIG_FEATURE_TAR_COMPRESS) += open_transformer.o
-+lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += open_transformer.o
-+lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += open_transformer.o
-+lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += open_transformer.o
-
-+lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
-+lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
-+lib-$(CONFIG_UNLZMA) += decompress_unlzma.o
-+lib-$(CONFIG_CPIO) += get_header_cpio.o
-+lib-$(CONFIG_DPKG) += $(DPKG_FILES)
-+lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES)
-+lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o
-+lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o
-+lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
-+lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
-+lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o
-+lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
-+lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
-+lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o
-+lib-$(CONFIG_TAR) += get_header_tar.o
-+lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
-+lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
-+lib-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o
-+lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o
-+lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
-+lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
-+lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o
-diff -urN busybox-1.7.0/archival/libunarchive/get_header_tar_bz2.c busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_bz2.c
---- busybox-1.7.0/archival/libunarchive/get_header_tar_bz2.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_bz2.c 2007-09-06 17:42:02.000000000 +0100
-@@ -11,7 +11,7 @@
- /* Can't lseek over pipes */
- archive_handle->seek = seek_by_read;
-
-- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream);
-+ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream, "bunzip2", "bunzip2", "-cf", "-", NULL);
- archive_handle->offset = 0;
- while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
-
-diff -urN busybox-1.7.0/archival/libunarchive/get_header_tar_gz.c busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_gz.c
---- busybox-1.7.0/archival/libunarchive/get_header_tar_gz.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_gz.c 2007-09-06 17:42:02.000000000 +0100
-@@ -8,19 +8,26 @@
-
- char get_header_tar_gz(archive_handle_t *archive_handle)
- {
-+#if BB_MMU
- unsigned char magic[2];
-+#endif
-
- /* Can't lseek over pipes */
- archive_handle->seek = seek_by_read;
-
-+ /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case).
-+ * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will
-+ * need the header. */
-+#if BB_MMU
- xread(archive_handle->src_fd, &magic, 2);
- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
- bb_error_msg_and_die("invalid gzip magic");
- }
-
- check_header_gzip_or_die(archive_handle->src_fd);
-+#endif
-
-- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream);
-+ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip", "gunzip", "-cf", "-", NULL);
- archive_handle->offset = 0;
- while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
-
-diff -urN busybox-1.7.0/archival/libunarchive/get_header_tar_lzma.c busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_lzma.c
---- busybox-1.7.0/archival/libunarchive/get_header_tar_lzma.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_lzma.c 2007-09-06 17:42:02.000000000 +0100
-@@ -14,7 +14,7 @@
- /* Can't lseek over pipes */
- archive_handle->seek = seek_by_read;
-
-- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_lzma_stream);
-+ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_lzma_stream, "unlzma", "unlzma", "-cf", "-", NULL);
- archive_handle->offset = 0;
- while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
-
-diff -urN busybox-1.7.0/archival/libunarchive/open_transformer.c busybox-1.7.0-targz_nommu/archival/libunarchive/open_transformer.c
---- busybox-1.7.0/archival/libunarchive/open_transformer.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/libunarchive/open_transformer.c 2007-09-05 12:28:55.000000000 +0100
-@@ -7,27 +7,48 @@
- #include "unarchive.h"
-
- /* transformer(), more than meets the eye */
-+/*
-+ * On MMU machine, the transform_prog and ... are stripped
-+ * by a macro in include/unarchive.h. On NOMMU, transformer is stripped.
-+ */
- int open_transformer(int src_fd,
-- USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd))
-+ USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd),
-+ const char *transform_prog, ...)
- {
- int fd_pipe[2];
- int pid;
-
- xpipe(fd_pipe);
-
-+#if BB_MMU
- pid = fork();
-- if (pid == -1) {
-+#else
-+ pid = vfork();
-+#endif
-+ if (pid == -1)
- bb_perror_msg_and_die("fork failed");
-- }
-
- if (pid == 0) {
-+#if !BB_MMU
-+ va_list ap;
-+#endif
- /* child process */
- close(fd_pipe[0]); /* We don't wan't to read from the parent */
- // FIXME: error check?
-+#if BB_MMU
- transformer(src_fd, fd_pipe[1]);
-- close(fd_pipe[1]); /* Send EOF */
-- close(src_fd);
-+ if (ENABLE_FEATURE_CLEAN_UP) {
-+ close(fd_pipe[1]); /* Send EOF */
-+ close(src_fd);
-+ }
- exit(0);
-+#else
-+ xmove_fd(src_fd, 0);
-+ xmove_fd(fd_pipe[1], 1);
-+ va_start(ap, transform_prog);
-+ BB_EXECVP(transform_prog, ap);
-+ bb_perror_and_die("exec failed");
-+#endif
- /* notreached */
- }
-
-diff -urN busybox-1.7.0/archival/rpm.c busybox-1.7.0-targz_nommu/archival/rpm.c
---- busybox-1.7.0/archival/rpm.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/rpm.c 2007-09-06 17:42:02.000000000 +0100
-@@ -187,9 +187,15 @@
-
- static void extract_cpio_gz(int fd)
- {
-- USE_DESKTOP(long long) int (*xformer)(int src_fd, int dst_fd);
- archive_handle_t *archive_handle;
- unsigned char magic[2];
-+#if BB_MMU
-+ USE_DESKTOP(long long) int (*xformer)(int src_fd, int dst_fd);
-+ enum { xformer_prog = 0 };
-+#else
-+ enum { xformer = 0 };
-+ const char *xformer_prog;
-+#endif
-
- /* Initialize */
- archive_handle = init_handle();
-@@ -202,11 +208,19 @@
- archive_handle->offset = 0;
-
- xread(archive_handle->src_fd, &magic, 2);
-+#if BB_MMU
- xformer = unpack_gz_stream;
-+#else
-+ xformer_prog = "gunzip";
-+#endif
- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
- if (ENABLE_FEATURE_RPM_BZ2
- && (magic[0] == 0x42) && (magic[1] == 0x5a)) {
-+#if BB_MMU
- xformer = unpack_bz2_stream;
-+#else
-+ xformer_prog = "bunzip2";
-+#endif
- /* We can do better, need modifying unpack_bz2_stream to not require
- * first 2 bytes. Not very hard to do... I mean, TODO :) */
- xlseek(archive_handle->src_fd, -2, SEEK_CUR);
-@@ -214,11 +228,17 @@
- bb_error_msg_and_die("no gzip"
- USE_FEATURE_RPM_BZ2("/bzip")
- " magic");
-- } else
-+ } else {
- check_header_gzip_or_die(archive_handle->src_fd);
-+#if !BB_MMU
-+ /* NOMMU version of open_transformer execs an external unzipper that should
-+ * have the file position at the start of the file */
-+ xlseek(archive_handle->src_fd, 0, SEEK_SET);
-+#endif
-+ }
-
- xchdir("/"); /* Install RPM's to root */
-- archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer);
-+ archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer, xformer_prog, xformer_prog, "-cf", "-", NULL);
- archive_handle->offset = 0;
- while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
- continue;
-diff -urN busybox-1.7.0/archival/tar.c busybox-1.7.0-targz_nommu/archival/tar.c
---- busybox-1.7.0/archival/tar.c 2007-08-24 11:49:45.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/archival/tar.c 2007-09-06 17:42:02.000000000 +0100
-@@ -648,7 +648,7 @@
- bb_error_msg_and_die("invalid magic");
- }
-
-- archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress);
-+ archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress, "uncompress", "uncompress", "-cf", "-", NULL);
- archive_handle->offset = 0;
- while (get_header_tar(archive_handle) == EXIT_SUCCESS)
- /* nothing */;
-diff -urN busybox-1.7.0/include/unarchive.h busybox-1.7.0-targz_nommu/include/unarchive.h
---- busybox-1.7.0/include/unarchive.h 2007-08-24 11:49:55.000000000 +0100
-+++ busybox-1.7.0-targz_nommu/include/unarchive.h 2007-09-06 17:42:02.000000000 +0100
-@@ -115,7 +115,13 @@
- extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd);
- extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd);
-
-+#if BB_MMU
- extern int open_transformer(int src_fd,
- USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd));
-+#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transformer)
-+#else
-+extern int open_transformer(int src_fd, const char *transform_prog, ...);
-+#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transform_prog, __VA_ARGS__)
-+#endif
-
- #endif
Deleted: trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch 2008-01-03 13:31:26 UTC (rev 20700)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch 2008-01-03 13:33:19 UTC (rev 20701)
@@ -1,89 +0,0 @@
-diff -urN busybox-1.7.0/scripts/trylink busybox-1.7.0-trylink/scripts/trylink
---- busybox-1.7.0/scripts/trylink 2007-08-24 11:49:43.000000000 +0100
-+++ busybox-1.7.0-trylink/scripts/trylink 2007-09-03 12:08:18.000000000 +0100
-@@ -14,37 +14,30 @@
- BBOX_LIB_LIST=`echo "$BBOX_LIB_LIST" | xargs -n1 | sort | uniq | xargs`
-
- # First link with all libs. If it fails, bail out
--l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/'`
- echo "Trying libraries: $BBOX_LIB_LIST"
--try "-Wl,--start-group $l_list -Wl,--end-group" "$@" \
-+l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-+test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
-+try "$l_list" "$@" \
- || {
- echo "Failed: $* -Wl,--start-group $l_list -Wl,--end-group"
- cat busybox_ld.err
- exit 1
- }
-
--#### Hack disabled: conflicts with ld --verbose flag in last link phase
--
--##### Hack: we are not supposed to know executable name,
--##### but this hack cuts down link time
--####mv busybox_unstripped busybox_unstripped.tmp
--####mv busybox.map busybox.map.tmp
--
- # Now try to remove each lib and build without it.
- # Stop when no lib can be removed.
--####ever_discarded=false
- while test "$BBOX_LIB_LIST"; do
- $debug && echo "Trying libraries: $BBOX_LIB_LIST"
- all_needed=true
- for one in $BBOX_LIB_LIST; do
- without_one=`echo " $BBOX_LIB_LIST " | sed "s/ $one / /g" | xargs`
-- l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/'`
-- $debug && echo "Trying -l options: $l_list"
-- if try "-Wl,--start-group $l_list -Wl,--end-group" "$@"; then
-+ l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-+ test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
-+ $debug && echo "Trying -l options: '$l_list'"
-+ if try "$l_list" "$@"; then
- echo "Library $one is not needed"
- BBOX_LIB_LIST="$without_one"
- all_needed=false
--#### ever_discarded=true
- else
- echo "Library $one is needed"
- fi
-@@ -57,24 +50,19 @@
- #{ echo "$BBOX_LIB_LIST" | grep -q ' '; } || break
- done
-
--####mv busybox_unstripped.tmp busybox_unstripped
--####mv busybox.map.tmp busybox.map
--####$ever_discarded && {
-- # Make the binary with final, minimal list of libs
-- echo "Final link with: $BBOX_LIB_LIST"
-- l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/'`
-- # --verbose gives us gobs of info to stdout (e.g. linker script used)
-- if ! test -f busybox_ldscript; then
-- try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose" "$@" >busybox_ld.out ####|| exit 1
-- else
-- echo "Custom linker script 'busybox_ldscript' found, using it"
-- # Add SORT_BY_ALIGNMENT to linker script (found in busybox_ld.out):
-- # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
-- # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*)
-- # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
-- # This will eliminate most of the data padding (~3kb).
-- try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out
-- fi
--####}
--####rm busybox_ld.err
--####exit 0 # Ensure "success" exit code
-+# Make the binary with final, minimal list of libs
-+echo "Final link with: $BBOX_LIB_LIST"
-+l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
-+test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose"
-+# --verbose gives us gobs of info to stdout (e.g. linker script used)
-+if ! test -f busybox_ldscript; then
-+ try "$l_list -Wl,--verbose" "$@" >busybox_ld.out
-+else
-+ echo "Custom linker script 'busybox_ldscript' found, using it"
-+ # Add SORT_BY_ALIGNMENT to linker script (found in busybox_ld.out):
-+ # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
-+ # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*)
-+ # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
-+ # This will eliminate most of the data padding (~3kb).
-+ try "$l_list -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out
-+fi
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2008-01-03 13:31 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2008-01-03 13:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-01-03 05:31:26 -0800 (Thu, 03 Jan 2008)
New Revision: 20700
Log:
busybox: Get rid of minor version selection.
There isn't much point in selecting anything else than the latest
in a stable release series, so merge all the 1.7.x options into a
single selection.
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2008-01-03 12:13:42 UTC (rev 20699)
+++ trunk/buildroot/package/busybox/Config.in 2008-01-03 13:31:26 UTC (rev 20700)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_7_2
+ default BR2_BUSYBOX_VERSION_1_7_X
help
Select the version of BusyBox you wish to use.
@@ -24,17 +24,9 @@
bool "BusyBox 1.6.1"
depends on BR2_DEPRECATED
- config BR2_BUSYBOX_VERSION_1_7_0
- bool "BusyBox 1.7.0"
- depends on BR2_DEPRECATED || BR2_RECENT
+ config BR2_BUSYBOX_VERSION_1_7_X
+ bool "BusyBox 1.7.x"
- config BR2_BUSYBOX_VERSION_1_7_1
- bool "BusyBox 1.7.1"
- depends on BR2_DEPRECATED || BR2_RECENT
-
- config BR2_BUSYBOX_VERSION_1_7_2
- bool "BusyBox 1.7.2"
-
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -44,9 +36,7 @@
string
default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
- default "1.7.0" if BR2_BUSYBOX_VERSION_1_7_0
- default "1.7.1" if BR2_BUSYBOX_VERSION_1_7_1
- default "1.7.2" if BR2_BUSYBOX_VERSION_1_7_2
+ default "1.7.2" if BR2_BUSYBOX_VERSION_1_7_X
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -68,9 +58,7 @@
default "target/device/x86/i386/busybox.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
- default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_0
- default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_1
- default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_2
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-30 12:50 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-30 12:50 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-30 05:50:25 -0700 (Sun, 30 Sep 2007)
New Revision: 20143
Log:
- bump version
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-09-30 12:48:25 UTC (rev 20142)
+++ trunk/buildroot/package/busybox/Config.in 2007-09-30 12:50:25 UTC (rev 20143)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_7_1
+ default BR2_BUSYBOX_VERSION_1_7_2
help
Select the version of BusyBox you wish to use.
@@ -30,7 +30,11 @@
config BR2_BUSYBOX_VERSION_1_7_1
bool "BusyBox 1.7.1"
+ depends on BR2_DEPRECATED
+ config BR2_BUSYBOX_VERSION_1_7_2
+ bool "BusyBox 1.7.2"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -42,6 +46,7 @@
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
default "1.7.0" if BR2_BUSYBOX_VERSION_1_7_0
default "1.7.1" if BR2_BUSYBOX_VERSION_1_7_1
+ default "1.7.2" if BR2_BUSYBOX_VERSION_1_7_2
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -65,6 +70,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_0
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_1
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_2
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-30 12:48 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-30 12:48 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-30 05:48:25 -0700 (Sun, 30 Sep 2007)
New Revision: 20142
Log:
- no need to $(strip ..) bool/tristate values (Cristian Ionescu-Idbohrn)
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-09-30 12:46:02 UTC (rev 20141)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-09-30 12:48:25 UTC (rev 20142)
@@ -5,7 +5,7 @@
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
@@ -35,7 +35,7 @@
$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
endif
# Allow busybox patches.
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
else
toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VERSION)-\*.patch
@@ -46,21 +46,21 @@
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
+ifeq ($(BR2_BUSYBOX_VERSION_1_0_1),y)
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
$(BUSYBOX_DIR)/Rules.mak
endif
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y)
+ifeq ($(BR2_BUSYBOX_VERSION_1_1_3),y)
$(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config
endif
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y)
+ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y)
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config
endif
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
@@ -148,6 +148,6 @@
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX)),y)
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
TARGETS+=busybox
endif
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-22 17:29 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-22 17:29 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-22 10:29:23 -0700 (Sat, 22 Sep 2007)
New Revision: 19944
Log:
- fix typo in .config filename
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-09-22 16:42:25 UTC (rev 19943)
+++ trunk/buildroot/package/busybox/Config.in 2007-09-22 17:29:23 UTC (rev 19944)
@@ -112,7 +112,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_0
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_0
- default "package/busybox/busybox-1.6.1.config" if BR2_BUSYBOX_VERSION_1_7_1
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_1
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-22 10:25 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-22 10:25 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-22 03:25:09 -0700 (Sat, 22 Sep 2007)
New Revision: 19936
Log:
- remove inadequate dependencies prerequisite.
If needed, this should be done slightly different, otherwise the source target runs dependencies, which is not correct.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-09-22 10:20:35 UTC (rev 19935)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-09-22 10:25:09 UTC (rev 19936)
@@ -28,7 +28,7 @@
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) dependencies
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-20 16:58 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-20 16:58 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-20 09:58:35 -0700 (Thu, 20 Sep 2007)
New Revision: 19916
Log:
- bump version
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-09-20 16:51:59 UTC (rev 19915)
+++ trunk/buildroot/package/busybox/Config.in 2007-09-20 16:58:35 UTC (rev 19916)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_6_0
+ default BR2_BUSYBOX_VERSION_1_7_1
help
Select the version of BusyBox you wish to use.
@@ -54,10 +54,15 @@
config BR2_BUSYBOX_VERSION_1_6_1
bool "BusyBox 1.6.1"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_7_0
bool "BusyBox 1.7.0"
+ depends on BR2_DEPRECATED
+ config BR2_BUSYBOX_VERSION_1_7_1
+ bool "BusyBox 1.7.1"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -76,6 +81,7 @@
default "1.6.0" if BR2_BUSYBOX_VERSION_1_6_0
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
default "1.7.0" if BR2_BUSYBOX_VERSION_1_7_0
+ default "1.7.1" if BR2_BUSYBOX_VERSION_1_7_1
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -106,6 +112,7 @@
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_0
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_0
+ default "package/busybox/busybox-1.6.1.config" if BR2_BUSYBOX_VERSION_1_7_1
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-15 18:14 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-15 18:14 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-15 11:14:53 -0700 (Sat, 15 Sep 2007)
New Revision: 19855
Log:
- depends on host-fakeroot
Modified:
trunk/buildroot/package/busybox/initramfs.mk
Changeset:
Modified: trunk/buildroot/package/busybox/initramfs.mk
===================================================================
--- trunk/buildroot/package/busybox/initramfs.mk 2007-09-15 13:28:30 UTC (rev 19854)
+++ trunk/buildroot/package/busybox/initramfs.mk 2007-09-15 18:14:53 UTC (rev 19855)
@@ -104,7 +104,7 @@
$(STRIP) $(STRIP_STRIP_ALL) $@
-$(BB_INITRAMFS_TARGET): $(BR2_INITRAMFS_DIR)/bin/busybox
+$(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox
ln -fs bin/busybox $(PROJECT_BUILD_DIR)/initramfs/init
mkdir -p $(PROJECT_BUILD_DIR)/initramfs/etc
cat target/generic/target_busybox_skeleton/etc/inittab > \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-10 7:38 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-09-10 7:38 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-09-10 00:38:03 -0700 (Mon, 10 Sep 2007)
New Revision: 19808
Log:
Busybox 1.7.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch
trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch
trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch
trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-gettimeofday_ns.patch 2007-09-10 07:38:03 UTC (rev 19808)
@@ -0,0 +1,95 @@
+diff -urN busybox-1.7.0/networking/isrv.c busybox-1.7.0-gettimeofday_ns/networking/isrv.c
+--- busybox-1.7.0/networking/isrv.c 2007-08-24 11:49:41.000000000 +0100
++++ busybox-1.7.0-gettimeofday_ns/networking/isrv.c 2007-09-06 17:39:55.000000000 +0100
+@@ -21,20 +21,6 @@
+
+ /* Helpers */
+
+-/* Even if _POSIX_MONOTONIC_CLOCK is defined, this
+- * may require librt */
+-#if 0 /*def _POSIX_MONOTONIC_CLOCK*/
+-static time_t monotonic_time(void)
+-{
+- struct timespec ts;
+- if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
+- time(&ts.tv_sec);
+- return ts.tv_sec;
+-}
+-#else
+-#define monotonic_time() (time(NULL))
+-#endif
+-
+ /* Opaque structure */
+
+ struct isrv_state_t {
+@@ -258,7 +244,7 @@
+ /* this peer is gone */
+ remove_peer(state, peer);
+ } else if (TIMEOUT) {
+- TIMEO_TBL[peer] = monotonic_time();
++ TIMEO_TBL[peer] = monotonic_sec();
+ }
+ }
+ }
+@@ -335,7 +321,7 @@
+ break;
+
+ if (timeout) {
+- time_t t = monotonic_time();
++ time_t t = monotonic_sec();
+ if (t != CURTIME) {
+ CURTIME = t;
+ handle_timeout(state, do_timeout);
+diff -urN busybox-1.7.0/runit/runsv.c busybox-1.7.0-gettimeofday_ns/runit/runsv.c
+--- busybox-1.7.0/runit/runsv.c 2007-08-24 11:50:01.000000000 +0100
++++ busybox-1.7.0-gettimeofday_ns/runit/runsv.c 2007-09-06 17:39:55.000000000 +0100
+@@ -33,6 +33,34 @@
+ #include "libbb.h"
+ #include "runit_lib.h"
+
++#if ENABLE_MONOTONIC_SYSCALL
++#include <sys/syscall.h>
++
++/* libc has incredibly messy way of doing this,
++ * typically requiring -lrt. We just skip all this mess */
++static void gettimeofday_ns(struct timespec *ts)
++{
++ syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
++}
++#else
++static void gettimeofday_ns(struct timespec *ts)
++{
++ if (sizeof(struct timeval) == sizeof(struct timespec)
++ && sizeof(((struct timeval*)ts)->tv_usec) == sizeof(ts->tv_nsec)
++ ) {
++ /* Cheat */
++ gettimeofday((void*)ts, NULL);
++ ts->tv_nsec *= 1000;
++ } else {
++ extern void BUG_need_to_implement_gettimeofday_ns(void);
++ BUG_need_to_implement_gettimeofday_ns();
++ }
++}
++#endif
++
++/* Compare possibly overflowing unsigned counters */
++#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
++
+ static int selfpipe[2];
+
+ /* state */
+@@ -126,14 +154,6 @@
+ return 0;
+ }
+
+-#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
+-
+-#include <sys/syscall.h>
+-static void gettimeofday_ns(struct timespec *ts)
+-{
+- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
+-}
+-
+ static void update_status(struct svdir *s)
+ {
+ ssize_t sz;
Added: trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-readlink.patch 2007-09-10 07:38:03 UTC (rev 19808)
@@ -0,0 +1,107 @@
+diff -urN busybox-1.7.0/applets/applets.c busybox-1.7.0-readlink/applets/applets.c
+--- busybox-1.7.0/applets/applets.c 2007-08-24 11:50:02.000000000 +0100
++++ busybox-1.7.0-readlink/applets/applets.c 2007-09-06 17:41:38.000000000 +0100
+@@ -546,7 +546,7 @@
+ help:
+ output_width = 80;
+ if (ENABLE_FEATURE_AUTOWIDTH) {
+- /* Obtain the terminal width. */
++ /* Obtain the terminal width */
+ get_terminal_width_height(0, &output_width, NULL);
+ }
+ /* leading tab and room to wrap */
+@@ -580,12 +580,11 @@
+
+ if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) {
+ const char *busybox;
+- busybox = xmalloc_readlink_or_warn(bb_busybox_exec_path);
++ busybox = xmalloc_readlink(bb_busybox_exec_path);
+ if (!busybox)
+ busybox = bb_busybox_exec_path;
+ /* -s makes symlinks */
+- install_links(busybox,
+- argv[2] && strcmp(argv[2], "-s") == 0);
++ install_links(busybox, argv[2] && strcmp(argv[2], "-s") == 0);
+ return 0;
+ }
+
+diff -urN busybox-1.7.0/include/libbb.h busybox-1.7.0-readlink/include/libbb.h
+--- busybox-1.7.0/include/libbb.h 2007-08-24 11:49:55.000000000 +0100
++++ busybox-1.7.0-readlink/include/libbb.h 2007-09-06 17:41:38.000000000 +0100
+@@ -248,9 +248,10 @@
+ DIR *xopendir(const char *path);
+ DIR *warn_opendir(const char *path);
+
+-char *xrealloc_getcwd_or_warn(char *cwd);
++/* UNUSED: char *xmalloc_realpath(const char *path); */
++char *xmalloc_readlink(const char *path);
+ char *xmalloc_readlink_or_warn(const char *path);
+-char *xmalloc_realpath(const char *path);
++char *xrealloc_getcwd_or_warn(char *cwd);
+
+
+ //TODO: signal(sid, f) is the same? then why?
+@@ -316,8 +317,8 @@
+ };
+ /* Create stream socket, and allocate suitable lsa.
+ * (lsa of correct size and lsa->sa.sa_family (AF_INET/AF_INET6))
+- * af == AF_UNSPEC will result in trying to create IPv6, and
+- * if kernel doesn't support it, IPv4.
++ * af == AF_UNSPEC will result in trying to create IPv6 socket,
++ * and if kernel doesn't support it, IPv4.
+ */
+ int xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int af,) int sock_type);
+ int xsocket_stream(len_and_sockaddr **lsap);
+diff -urN busybox-1.7.0/libbb/xreadlink.c busybox-1.7.0-readlink/libbb/xreadlink.c
+--- busybox-1.7.0/libbb/xreadlink.c 2007-08-24 11:49:51.000000000 +0100
++++ busybox-1.7.0-readlink/libbb/xreadlink.c 2007-09-06 17:41:38.000000000 +0100
+@@ -10,8 +10,7 @@
+ * NOTE: This function returns a malloced char* that you will have to free
+ * yourself. You have been warned.
+ */
+-
+-char *xmalloc_readlink_or_warn(const char *path)
++char *xmalloc_readlink(const char *path)
+ {
+ enum { GROWBY = 80 }; /* how large we will grow strings by */
+
+@@ -20,20 +19,30 @@
+
+ do {
+ buf = xrealloc(buf, bufsize += GROWBY);
+- readsize = readlink(path, buf, bufsize); /* 1st try */
++ readsize = readlink(path, buf, bufsize);
+ if (readsize == -1) {
+- bb_perror_msg("%s", path);
+ free(buf);
+ return NULL;
+ }
+- }
+- while (bufsize < readsize + 1);
++ } while (bufsize < readsize + 1);
+
+ buf[readsize] = '\0';
+
+ return buf;
+ }
+
++char *xmalloc_readlink_or_warn(const char *path)
++{
++ char *buf = xmalloc_readlink(path);
++ if (!buf) {
++ /* EINVAL => "file: Invalid argument" => puzzled user */
++ bb_error_msg("%s: cannot read link (not a symlink?)", path);
++ }
++ return buf;
++}
++
++/* UNUSED */
++#if 0
+ char *xmalloc_realpath(const char *path)
+ {
+ #if defined(__GLIBC__) && !defined(__UCLIBC__)
+@@ -46,3 +55,4 @@
+ return xstrdup(realpath(path, buf));
+ #endif
+ }
++#endif
Added: trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-targz_nommu.patch 2007-09-10 07:38:03 UTC (rev 19808)
@@ -0,0 +1,282 @@
+diff -urN busybox-1.7.0/archival/bbunzip.c busybox-1.7.0-targz_nommu/archival/bbunzip.c
+--- busybox-1.7.0/archival/bbunzip.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/bbunzip.c 2007-09-06 17:42:02.000000000 +0100
+@@ -298,7 +298,7 @@
+ int unlzma_main(int argc, char **argv);
+ int unlzma_main(int argc, char **argv)
+ {
+- getopt32(argv, "c");
++ getopt32(argv, "cf");
+ argv += optind;
+ /* lzmacat? */
+ if (applet_name[4] == 'c')
+diff -urN busybox-1.7.0/archival/libunarchive/Kbuild busybox-1.7.0-targz_nommu/archival/libunarchive/Kbuild
+--- busybox-1.7.0/archival/libunarchive/Kbuild 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/libunarchive/Kbuild 2007-09-06 17:42:02.000000000 +0100
+@@ -35,36 +35,34 @@
+ get_header_tar.o \
+ filter_accept_list_reassign.o
+
+-# open_transformer uses fork(). Compile it only if absolutely necessary
+ lib-$(CONFIG_RPM) += open_transformer.o
+-lib-$(CONFIG_FEATURE_TAR_BZIP2) += open_transformer.o
+-lib-$(CONFIG_FEATURE_TAR_LZMA) += open_transformer.o
+-lib-$(CONFIG_FEATURE_TAR_GZIP) += open_transformer.o
+-lib-$(CONFIG_FEATURE_TAR_COMPRESS) += open_transformer.o
+-lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += open_transformer.o
+-lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += open_transformer.o
+-lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += open_transformer.o
+-
+-lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
+-lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
+-lib-$(CONFIG_UNLZMA) += decompress_unlzma.o
+-lib-$(CONFIG_CPIO) += get_header_cpio.o
+-lib-$(CONFIG_DPKG) += $(DPKG_FILES)
+-lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES)
+-lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o
+-lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o
+-lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
+-lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
+-lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o
+-lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
+-lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
+-lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o
+-lib-$(CONFIG_TAR) += get_header_tar.o
+-lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
+-lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
+-lib-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o
+-lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o
+-lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
+-lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
+-lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o
++lib-$(CONFIG_FEATURE_TAR_BZIP2) += open_transformer.o
++lib-$(CONFIG_FEATURE_TAR_LZMA) += open_transformer.o
++lib-$(CONFIG_FEATURE_TAR_GZIP) += open_transformer.o
++lib-$(CONFIG_FEATURE_TAR_COMPRESS) += open_transformer.o
++lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += open_transformer.o
++lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += open_transformer.o
++lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += open_transformer.o
+
++lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o
++lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o
++lib-$(CONFIG_UNLZMA) += decompress_unlzma.o
++lib-$(CONFIG_CPIO) += get_header_cpio.o
++lib-$(CONFIG_DPKG) += $(DPKG_FILES)
++lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES)
++lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o
++lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o
++lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
++lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
++lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o
++lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
++lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
++lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o
++lib-$(CONFIG_TAR) += get_header_tar.o
++lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
++lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
++lib-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o
++lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o
++lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
++lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
++lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o
+diff -urN busybox-1.7.0/archival/libunarchive/get_header_tar_bz2.c busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_bz2.c
+--- busybox-1.7.0/archival/libunarchive/get_header_tar_bz2.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_bz2.c 2007-09-06 17:42:02.000000000 +0100
+@@ -11,7 +11,7 @@
+ /* Can't lseek over pipes */
+ archive_handle->seek = seek_by_read;
+
+- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream);
++ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_bz2_stream, "bunzip2", "bunzip2", "-cf", "-", NULL);
+ archive_handle->offset = 0;
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
+
+diff -urN busybox-1.7.0/archival/libunarchive/get_header_tar_gz.c busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_gz.c
+--- busybox-1.7.0/archival/libunarchive/get_header_tar_gz.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_gz.c 2007-09-06 17:42:02.000000000 +0100
+@@ -8,19 +8,26 @@
+
+ char get_header_tar_gz(archive_handle_t *archive_handle)
+ {
++#if BB_MMU
+ unsigned char magic[2];
++#endif
+
+ /* Can't lseek over pipes */
+ archive_handle->seek = seek_by_read;
+
++ /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case).
++ * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will
++ * need the header. */
++#if BB_MMU
+ xread(archive_handle->src_fd, &magic, 2);
+ if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
+ bb_error_msg_and_die("invalid gzip magic");
+ }
+
+ check_header_gzip_or_die(archive_handle->src_fd);
++#endif
+
+- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream);
++ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip", "gunzip", "-cf", "-", NULL);
+ archive_handle->offset = 0;
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
+
+diff -urN busybox-1.7.0/archival/libunarchive/get_header_tar_lzma.c busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_lzma.c
+--- busybox-1.7.0/archival/libunarchive/get_header_tar_lzma.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/libunarchive/get_header_tar_lzma.c 2007-09-06 17:42:02.000000000 +0100
+@@ -14,7 +14,7 @@
+ /* Can't lseek over pipes */
+ archive_handle->seek = seek_by_read;
+
+- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_lzma_stream);
++ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_lzma_stream, "unlzma", "unlzma", "-cf", "-", NULL);
+ archive_handle->offset = 0;
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
+
+diff -urN busybox-1.7.0/archival/libunarchive/open_transformer.c busybox-1.7.0-targz_nommu/archival/libunarchive/open_transformer.c
+--- busybox-1.7.0/archival/libunarchive/open_transformer.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/libunarchive/open_transformer.c 2007-09-05 12:28:55.000000000 +0100
+@@ -7,27 +7,48 @@
+ #include "unarchive.h"
+
+ /* transformer(), more than meets the eye */
++/*
++ * On MMU machine, the transform_prog and ... are stripped
++ * by a macro in include/unarchive.h. On NOMMU, transformer is stripped.
++ */
+ int open_transformer(int src_fd,
+- USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd))
++ USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd),
++ const char *transform_prog, ...)
+ {
+ int fd_pipe[2];
+ int pid;
+
+ xpipe(fd_pipe);
+
++#if BB_MMU
+ pid = fork();
+- if (pid == -1) {
++#else
++ pid = vfork();
++#endif
++ if (pid == -1)
+ bb_perror_msg_and_die("fork failed");
+- }
+
+ if (pid == 0) {
++#if !BB_MMU
++ va_list ap;
++#endif
+ /* child process */
+ close(fd_pipe[0]); /* We don't wan't to read from the parent */
+ // FIXME: error check?
++#if BB_MMU
+ transformer(src_fd, fd_pipe[1]);
+- close(fd_pipe[1]); /* Send EOF */
+- close(src_fd);
++ if (ENABLE_FEATURE_CLEAN_UP) {
++ close(fd_pipe[1]); /* Send EOF */
++ close(src_fd);
++ }
+ exit(0);
++#else
++ xmove_fd(src_fd, 0);
++ xmove_fd(fd_pipe[1], 1);
++ va_start(ap, transform_prog);
++ BB_EXECVP(transform_prog, ap);
++ bb_perror_and_die("exec failed");
++#endif
+ /* notreached */
+ }
+
+diff -urN busybox-1.7.0/archival/rpm.c busybox-1.7.0-targz_nommu/archival/rpm.c
+--- busybox-1.7.0/archival/rpm.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/rpm.c 2007-09-06 17:42:02.000000000 +0100
+@@ -187,9 +187,15 @@
+
+ static void extract_cpio_gz(int fd)
+ {
+- USE_DESKTOP(long long) int (*xformer)(int src_fd, int dst_fd);
+ archive_handle_t *archive_handle;
+ unsigned char magic[2];
++#if BB_MMU
++ USE_DESKTOP(long long) int (*xformer)(int src_fd, int dst_fd);
++ enum { xformer_prog = 0 };
++#else
++ enum { xformer = 0 };
++ const char *xformer_prog;
++#endif
+
+ /* Initialize */
+ archive_handle = init_handle();
+@@ -202,11 +208,19 @@
+ archive_handle->offset = 0;
+
+ xread(archive_handle->src_fd, &magic, 2);
++#if BB_MMU
+ xformer = unpack_gz_stream;
++#else
++ xformer_prog = "gunzip";
++#endif
+ if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
+ if (ENABLE_FEATURE_RPM_BZ2
+ && (magic[0] == 0x42) && (magic[1] == 0x5a)) {
++#if BB_MMU
+ xformer = unpack_bz2_stream;
++#else
++ xformer_prog = "bunzip2";
++#endif
+ /* We can do better, need modifying unpack_bz2_stream to not require
+ * first 2 bytes. Not very hard to do... I mean, TODO :) */
+ xlseek(archive_handle->src_fd, -2, SEEK_CUR);
+@@ -214,11 +228,17 @@
+ bb_error_msg_and_die("no gzip"
+ USE_FEATURE_RPM_BZ2("/bzip")
+ " magic");
+- } else
++ } else {
+ check_header_gzip_or_die(archive_handle->src_fd);
++#if !BB_MMU
++ /* NOMMU version of open_transformer execs an external unzipper that should
++ * have the file position at the start of the file */
++ xlseek(archive_handle->src_fd, 0, SEEK_SET);
++#endif
++ }
+
+ xchdir("/"); /* Install RPM's to root */
+- archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer);
++ archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer, xformer_prog, xformer_prog, "-cf", "-", NULL);
+ archive_handle->offset = 0;
+ while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
+ continue;
+diff -urN busybox-1.7.0/archival/tar.c busybox-1.7.0-targz_nommu/archival/tar.c
+--- busybox-1.7.0/archival/tar.c 2007-08-24 11:49:45.000000000 +0100
++++ busybox-1.7.0-targz_nommu/archival/tar.c 2007-09-06 17:42:02.000000000 +0100
+@@ -648,7 +648,7 @@
+ bb_error_msg_and_die("invalid magic");
+ }
+
+- archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress);
++ archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress, "uncompress", "uncompress", "-cf", "-", NULL);
+ archive_handle->offset = 0;
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS)
+ /* nothing */;
+diff -urN busybox-1.7.0/include/unarchive.h busybox-1.7.0-targz_nommu/include/unarchive.h
+--- busybox-1.7.0/include/unarchive.h 2007-08-24 11:49:55.000000000 +0100
++++ busybox-1.7.0-targz_nommu/include/unarchive.h 2007-09-06 17:42:02.000000000 +0100
+@@ -115,7 +115,13 @@
+ extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd);
+ extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd);
+
++#if BB_MMU
+ extern int open_transformer(int src_fd,
+ USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd));
++#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transformer)
++#else
++extern int open_transformer(int src_fd, const char *transform_prog, ...);
++#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transform_prog, __VA_ARGS__)
++#endif
+
+ #endif
Added: trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.7.0-trylink.patch 2007-09-10 07:38:03 UTC (rev 19808)
@@ -0,0 +1,89 @@
+diff -urN busybox-1.7.0/scripts/trylink busybox-1.7.0-trylink/scripts/trylink
+--- busybox-1.7.0/scripts/trylink 2007-08-24 11:49:43.000000000 +0100
++++ busybox-1.7.0-trylink/scripts/trylink 2007-09-03 12:08:18.000000000 +0100
+@@ -14,37 +14,30 @@
+ BBOX_LIB_LIST=`echo "$BBOX_LIB_LIST" | xargs -n1 | sort | uniq | xargs`
+
+ # First link with all libs. If it fails, bail out
+-l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/'`
+ echo "Trying libraries: $BBOX_LIB_LIST"
+-try "-Wl,--start-group $l_list -Wl,--end-group" "$@" \
++l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
++test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
++try "$l_list" "$@" \
+ || {
+ echo "Failed: $* -Wl,--start-group $l_list -Wl,--end-group"
+ cat busybox_ld.err
+ exit 1
+ }
+
+-#### Hack disabled: conflicts with ld --verbose flag in last link phase
+-
+-##### Hack: we are not supposed to know executable name,
+-##### but this hack cuts down link time
+-####mv busybox_unstripped busybox_unstripped.tmp
+-####mv busybox.map busybox.map.tmp
+-
+ # Now try to remove each lib and build without it.
+ # Stop when no lib can be removed.
+-####ever_discarded=false
+ while test "$BBOX_LIB_LIST"; do
+ $debug && echo "Trying libraries: $BBOX_LIB_LIST"
+ all_needed=true
+ for one in $BBOX_LIB_LIST; do
+ without_one=`echo " $BBOX_LIB_LIST " | sed "s/ $one / /g" | xargs`
+- l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/'`
+- $debug && echo "Trying -l options: $l_list"
+- if try "-Wl,--start-group $l_list -Wl,--end-group" "$@"; then
++ l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
++ test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group"
++ $debug && echo "Trying -l options: '$l_list'"
++ if try "$l_list" "$@"; then
+ echo "Library $one is not needed"
+ BBOX_LIB_LIST="$without_one"
+ all_needed=false
+-#### ever_discarded=true
+ else
+ echo "Library $one is needed"
+ fi
+@@ -57,24 +50,19 @@
+ #{ echo "$BBOX_LIB_LIST" | grep -q ' '; } || break
+ done
+
+-####mv busybox_unstripped.tmp busybox_unstripped
+-####mv busybox.map.tmp busybox.map
+-####$ever_discarded && {
+- # Make the binary with final, minimal list of libs
+- echo "Final link with: $BBOX_LIB_LIST"
+- l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/'`
+- # --verbose gives us gobs of info to stdout (e.g. linker script used)
+- if ! test -f busybox_ldscript; then
+- try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose" "$@" >busybox_ld.out ####|| exit 1
+- else
+- echo "Custom linker script 'busybox_ldscript' found, using it"
+- # Add SORT_BY_ALIGNMENT to linker script (found in busybox_ld.out):
+- # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
+- # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*)
+- # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
+- # This will eliminate most of the data padding (~3kb).
+- try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out
+- fi
+-####}
+-####rm busybox_ld.err
+-####exit 0 # Ensure "success" exit code
++# Make the binary with final, minimal list of libs
++echo "Final link with: $BBOX_LIB_LIST"
++l_list=`echo "$BBOX_LIB_LIST" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'`
++test "x$l_list" != "x" && l_list="-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose"
++# --verbose gives us gobs of info to stdout (e.g. linker script used)
++if ! test -f busybox_ldscript; then
++ try "$l_list -Wl,--verbose" "$@" >busybox_ld.out
++else
++ echo "Custom linker script 'busybox_ldscript' found, using it"
++ # Add SORT_BY_ALIGNMENT to linker script (found in busybox_ld.out):
++ # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
++ # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*)
++ # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
++ # This will eliminate most of the data padding (~3kb).
++ try "$l_list -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out
++fi
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-02 22:09 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-02 22:09 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-02 15:09:11 -0700 (Sun, 02 Sep 2007)
New Revision: 19767
Log:
- adjust list of needed applets
Modified:
trunk/buildroot/package/busybox/initramfs.mk
Changeset:
Modified: trunk/buildroot/package/busybox/initramfs.mk
===================================================================
--- trunk/buildroot/package/busybox/initramfs.mk 2007-09-02 21:50:37 UTC (rev 19766)
+++ trunk/buildroot/package/busybox/initramfs.mk 2007-09-02 22:09:11 UTC (rev 19767)
@@ -50,14 +50,17 @@
echo CONFIG_FEATURE_CHECK_TAINTED_MODULE=n; \
echo CONFIG_FEATURE_2_4_MODULES=n; \
echo CONFIG_MOUNT=y; \
- echo CONFIG_ASH=y; \
- echo CONFIG_FEATURE_SH_IS_ASH=y; \
+ echo CONFIG_MSH=y; \
+ echo CONFIG_FEATURE_SH_IS_MSH=y; \
echo CONFIG_PS=y; \
echo CONFIG_READLINK=y; \
echo CONFIG_RMMOD=y; \
- echo CONFIG_SLEEP=y; \
echo CONFIG_STATIC=y; \
echo CONFIG_SWITCH_ROOT=y; \
+ echo CONFIG_SYNC=y; \
+ echo CONFIG_TFTP=y; \
+ echo CONFIG_FEATURE_TFTP_GET=y; \
+ echo CONFIG_FEATURE_TFTP_PUT=y; \
echo CONFIG_TRUE=y; \
echo CONFIG_UMOUNT=y; \
echo CONFIG_FEATURE_UMOUNT_ALL=y; \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-02 14:56 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-02 14:56 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-02 07:56:39 -0700 (Sun, 02 Sep 2007)
New Revision: 19761
Log:
- improve configury
Modified:
trunk/buildroot/package/busybox/initramfs.mk
Changeset:
Modified: trunk/buildroot/package/busybox/initramfs.mk
===================================================================
--- trunk/buildroot/package/busybox/initramfs.mk 2007-09-02 14:51:54 UTC (rev 19760)
+++ trunk/buildroot/package/busybox/initramfs.mk 2007-09-02 14:56:39 UTC (rev 19761)
@@ -5,6 +5,7 @@
#############################################################
BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
+BR2_INITRAMFS_DIR:=$(PROJECT_BUILD_DIR)/initramfs
$(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR)
@@ -17,8 +18,16 @@
endif
touch $@
-$(BUSYBOX_INITRAMFS_DIR)/.configured: $(BUSYBOX_INITRAMFS_DIR)/.unpacked
- (echo CONFIG_CAT=y; \
+$(BUSYBOX_INITRAMFS_DIR)/.config $(BUSYBOX_INITRAMFS_DIR)/.configured: $(BUSYBOX_INITRAMFS_DIR)/.unpacked
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) \
+ allnoconfig
+ mv $(BUSYBOX_INITRAMFS_DIR)/.config $(BUSYBOX_INITRAMFS_DIR)/.config.no
+ (echo CONFIG_PREFIX=\"$(BR2_INITRAMFS_DIR)\"; \
+ echo CONFIG_NITPICK=y; \
+ echo CONFIG_FEATURE_BUFFERS_USE_MALLOC=y; \
+ echo CONFIG_INCLUDE_SUSv2=n; \
+ echo CONFIG_CAT=y; \
echo CONFIG_CHROOT=y; \
echo CONFIG_DD=y; \
echo CONFIG_FEATURE_DD_IBS_OBS=y; \
@@ -28,7 +37,6 @@
echo CONFIG_INSMOD=y; \
echo CONFIG_KILL=y; \
echo CONFIG_LN=y; \
- echo CONFIG_PS=y; \
echo CONFIG_MDEV=y; \
echo CONFIG_MKDIR=y; \
echo CONFIG_MKFIFO=y; \
@@ -39,25 +47,34 @@
echo CONFIG_FEATURE_CHECK_TAINTED_MODULE=n; \
echo CONFIG_FEATURE_2_4_MODULES=n; \
echo CONFIG_MOUNT=y; \
- echo CONFIG_SWITCH_ROOT=y; \
+ echo CONFIG_MSH=y; \
+ echo CONFIG_FEATURE_SH_IS_MSH=y; \
+ echo CONFIG_PS=y; \
echo CONFIG_READLINK=y; \
echo CONFIG_RMMOD=y; \
- echo CONFIG_MSH=y; \
- echo CONFIG_FEATURE_SH_IS_MSH=y; \
echo CONFIG_SLEEP=y; \
echo CONFIG_STATIC=y; \
+ echo CONFIG_SWITCH_ROOT=y; \
echo CONFIG_TRUE=y; \
echo CONFIG_UMOUNT=y; \
echo CONFIG_FEATURE_UMOUNT_ALL=y; \
echo CONFIG_UNAME=y; \
- ) > $(BUSYBOX_INITRAMFS_DIR)/.config
+ ) > $(BUSYBOX_INITRAMFS_DIR)/.config
+ cp -f $(BUSYBOX_INITRAMFS_DIR)/.config \
+ $(BUSYBOX_INITRAMFS_DIR)/.config.prune
+ $(SED) 's|\([^=]*\)=.*|/\1[^_]*/d|g' \
+ $(BUSYBOX_INITRAMFS_DIR)/.config.prune
+ $(SED) '' -f $(BUSYBOX_INITRAMFS_DIR)/.config.prune \
+ $(BUSYBOX_INITRAMFS_DIR)/.config.no
+ cat $(BUSYBOX_INITRAMFS_DIR)/.config.no >> \
+ $(BUSYBOX_INITRAMFS_DIR)/.config
yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
- CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) oldconfig
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) \
+ oldconfig
touch $@
-$(BUSYBOX_INITRAMFS_DIR)/inst/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
- -mkdir $(@D)
+$(BUSYBOX_INITRAMFS_DIR)/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
ARCH=$(KERNEL_ARCH) \
@@ -71,21 +88,31 @@
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
-f scripts/Makefile.IMA
endif
- cp -f $(BUSYBOX_INITRAMFS_DIR)/busybox $@
+
+$(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" \
+ ARCH=$(KERNEL_ARCH) STRIP="$(STRIP)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
+ install
$(STRIP) $(STRIP_STRIP_ALL) $@
-busybox-initramfs: uclibc $(BUSYBOX_INITRAMFS_DIR)/inst/busybox
+$(PROJECT_BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox
+ touch $@
+busybox-initramfs: uclibc $(PROJECT_BUILD_DIR)/.initramfs_done
+
busybox-initramfs-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_INITRAMFS_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_INITRAMFS_DIR) menuconfig
busybox-initramfs-clean:
- rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox \
- $(BUSYBOX_INITRAMFS_DIR)/inst/busybox
+ rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox $(PROJECT_BUILD_DIR)/.initramfs_*
+ rm -rf $(BR2_INITRAMFS_DIR)
-$(MAKE) -C $(BUSYBOX_INITRAMFS_DIR) clean
busybox-initramfs-dirclean:
- rm -rf $(BUSYBOX_INITRAMFS_DIR)
+ rm -rf $(BUSYBOX_INITRAMFS_DIR) $(BR2_INITRAMFS_DIR) \
+ $(PROJECT_BUILD_DIR)/.initramfs_*
#############################################################
#
# Toplevel Makefile options
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-09-01 17:33 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-09-01 17:33 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-01 10:33:19 -0700 (Sat, 01 Sep 2007)
New Revision: 19755
Log:
- add my working draft for busybox-initramfs (not yet finished, so still commented out in Config.in)
Added:
trunk/buildroot/package/busybox/initramfs.mk
Changeset:
Added: trunk/buildroot/package/busybox/initramfs.mk
===================================================================
--- trunk/buildroot/package/busybox/initramfs.mk (rev 0)
+++ trunk/buildroot/package/busybox/initramfs.mk 2007-09-01 17:33:19 UTC (rev 19755)
@@ -0,0 +1,96 @@
+#############################################################
+#
+# busybox image for initramfs
+#
+#############################################################
+
+BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
+
+$(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
+ rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR)
+ -mkdir $(BUILD_DIR)/tmp
+ $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR)/tmp $(TAR_OPTIONS) -
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ mv $(BUILD_DIR)/tmp/busybox $(BUSYBOX_INITRAMFS_DIR)
+else
+ mv $(BUILD_DIR)/tmp/busybox-$(BUSYBOX_VERSION) $(BUSYBOX_INITRAMFS_DIR)
+endif
+ touch $@
+
+$(BUSYBOX_INITRAMFS_DIR)/.configured: $(BUSYBOX_INITRAMFS_DIR)/.unpacked
+ (echo CONFIG_CAT=y; \
+ echo CONFIG_CHROOT=y; \
+ echo CONFIG_DD=y; \
+ echo CONFIG_FEATURE_DD_IBS_OBS=y; \
+ echo CONFIG_FALSE=y; \
+ echo CONFIG_GUNZIP=y; \
+ echo CONFIG_HALT=y; \
+ echo CONFIG_INSMOD=y; \
+ echo CONFIG_KILL=y; \
+ echo CONFIG_LN=y; \
+ echo CONFIG_PS=y; \
+ echo CONFIG_MDEV=y; \
+ echo CONFIG_MKDIR=y; \
+ echo CONFIG_MKFIFO=y; \
+ echo CONFIG_MKNOD=y; \
+ echo CONFIG_MODPROBE=y; \
+ echo CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y; \
+ echo CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y; \
+ echo CONFIG_FEATURE_CHECK_TAINTED_MODULE=n; \
+ echo CONFIG_FEATURE_2_4_MODULES=n; \
+ echo CONFIG_MOUNT=y; \
+ echo CONFIG_SWITCH_ROOT=y; \
+ echo CONFIG_READLINK=y; \
+ echo CONFIG_RMMOD=y; \
+ echo CONFIG_MSH=y; \
+ echo CONFIG_FEATURE_SH_IS_MSH=y; \
+ echo CONFIG_SLEEP=y; \
+ echo CONFIG_STATIC=y; \
+ echo CONFIG_TRUE=y; \
+ echo CONFIG_UMOUNT=y; \
+ echo CONFIG_FEATURE_UMOUNT_ALL=y; \
+ echo CONFIG_UNAME=y; \
+ ) > $(BUSYBOX_INITRAMFS_DIR)/.config
+ yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) oldconfig
+ touch $@
+
+
+$(BUSYBOX_INITRAMFS_DIR)/inst/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
+ -mkdir $(@D)
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(KERNEL_ARCH) \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
+ busybox.links busybox
+ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
+ rm -f $@
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(KERNEL_ARCH) STRIP="$(STRIP)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
+ -f scripts/Makefile.IMA
+endif
+ cp -f $(BUSYBOX_INITRAMFS_DIR)/busybox $@
+ $(STRIP) $(STRIP_STRIP_ALL) $@
+
+busybox-initramfs: uclibc $(BUSYBOX_INITRAMFS_DIR)/inst/busybox
+
+busybox-initramfs-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_INITRAMFS_DIR)/.configured
+ $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_INITRAMFS_DIR) menuconfig
+
+busybox-initramfs-clean:
+ rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox \
+ $(BUSYBOX_INITRAMFS_DIR)/inst/busybox
+ -$(MAKE) -C $(BUSYBOX_INITRAMFS_DIR) clean
+
+busybox-initramfs-dirclean:
+ rm -rf $(BUSYBOX_INITRAMFS_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_INITRAMFS)),y)
+TARGETS+=busybox-initramfs
+endif
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-08-24 14:23 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-08-24 14:23 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-08-24 07:23:53 -0700 (Fri, 24 Aug 2007)
New Revision: 19686
Log:
- add busybox-1.7.0
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-08-24 14:18:47 UTC (rev 19685)
+++ trunk/buildroot/package/busybox/Config.in 2007-08-24 14:23:53 UTC (rev 19686)
@@ -55,6 +55,9 @@
config BR2_BUSYBOX_VERSION_1_6_1
bool "BusyBox 1.6.1"
+ config BR2_BUSYBOX_VERSION_1_7_0
+ bool "BusyBox 1.7.0"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -72,6 +75,7 @@
default "1.5.1" if BR2_BUSYBOX_VERSION_1_5_1
default "1.6.0" if BR2_BUSYBOX_VERSION_1_6_0
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
+ default "1.7.0" if BR2_BUSYBOX_VERSION_1_7_0
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -101,6 +105,7 @@
default "package/busybox/busybox-1.5.0.config" if BR2_BUSYBOX_VERSION_1_5_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_0
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_7_0
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
@@ -123,3 +128,8 @@
Use a minimal target skeleton. Make sure to select mdev
which is used to populate /dev/.
+#config BR2_PACKAGE_BUSYBOX_INITRAMFS
+# bool "initramfs perusing busybox"
+# depends on BR2_PACKAGE_BUSYBOX
+# help
+# Build small initramfs perusing busybox.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-07-08 12:10 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 12:10 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 05:10:21 -0700 (Sun, 08 Jul 2007)
New Revision: 19032
Log:
- CONFIG_FDISK_SUPPORT_LARGE_DISKS depends on LFS
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-07-08 12:05:03 UTC (rev 19031)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-07-08 12:10:21 UTC (rev 19032)
@@ -70,9 +70,10 @@
endif
ifeq ($(BR2_LARGEFILE),y)
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
+ $(SED) "s/^.*CONFIG_FDISK_SUPPORT_LARGE_DISKS.*/CONFIG_FDISK_SUPPORT_LARGE_DISKS=y/;" $(BUSYBOX_DIR)/.config
else
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
- $(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
+ $(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/CONFIG_FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
endif
ifeq ($(BR2_INET_IPV6),y)
$(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=y/;" $(BUSYBOX_DIR)/.config
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-07-08 12:04 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 12:04 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 05:04:34 -0700 (Sun, 08 Jul 2007)
New Revision: 19030
Log:
- fdisk was broken in r18727, disable for now.
Modified:
trunk/buildroot/package/busybox/busybox-1.6.0.config
Changeset:
Modified: trunk/buildroot/package/busybox/busybox-1.6.0.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.6.0.config 2007-07-08 11:56:38 UTC (rev 19029)
+++ trunk/buildroot/package/busybox/busybox-1.6.0.config 2007-07-08 12:04:34 UTC (rev 19030)
@@ -404,7 +404,7 @@
# CONFIG_FEATURE_FBSET_READMODE is not set
CONFIG_FDFLUSH=y
CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
+# CONFIG_FDISK is not set
CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_AIX_LABEL is not set
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-07-08 11:56 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 11:56 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 04:56:38 -0700 (Sun, 08 Jul 2007)
New Revision: 19029
Log:
- forgot to provide a default config for 1.6.1
Thanks to Cristian Ionescu-Idbohrn for noticing this.
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-07-08 11:25:25 UTC (rev 19028)
+++ trunk/buildroot/package/busybox/Config.in 2007-07-08 11:56:38 UTC (rev 19029)
@@ -100,6 +100,7 @@
default "package/busybox/busybox-1.5.0.config" if BR2_BUSYBOX_VERSION_1_5_0
default "package/busybox/busybox-1.5.0.config" if BR2_BUSYBOX_VERSION_1_5_1
default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_0
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-07-02 15:20 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-07-02 15:20 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-02 08:20:05 -0700 (Mon, 02 Jul 2007)
New Revision: 18993
Log:
- forgot a line
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-07-02 14:35:11 UTC (rev 18992)
+++ trunk/buildroot/package/busybox/Config.in 2007-07-02 15:20:05 UTC (rev 18993)
@@ -71,6 +71,7 @@
default "1.5.0" if BR2_BUSYBOX_VERSION_1_5_0
default "1.5.1" if BR2_BUSYBOX_VERSION_1_5_1
default "1.6.0" if BR2_BUSYBOX_VERSION_1_6_0
+ default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-07-02 9:54 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-07-02 9:54 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-02 02:54:18 -0700 (Mon, 02 Jul 2007)
New Revision: 18991
Log:
- bump version
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-07-02 08:58:56 UTC (rev 18990)
+++ trunk/buildroot/package/busybox/Config.in 2007-07-02 09:54:18 UTC (rev 18991)
@@ -46,10 +46,15 @@
config BR2_BUSYBOX_VERSION_1_5_1
bool "BusyBox 1.5.1"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_6_0
bool "BusyBox 1.6.0"
+ depends on BR2_DEPRECATED
+ config BR2_BUSYBOX_VERSION_1_6_1
+ bool "BusyBox 1.6.1"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-06-27 21:07 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-06-27 21:07 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-27 14:07:09 -0700 (Wed, 27 Jun 2007)
New Revision: 18954
Log:
- use BR2_INET_IPV6
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-06-27 21:03:42 UTC (rev 18953)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-06-27 21:07:09 UTC (rev 18954)
@@ -74,6 +74,11 @@
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
endif
+ifeq ($(BR2_INET_IPV6),y)
+ $(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=y/;" $(BUSYBOX_DIR)/.config
+else
+ $(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=n/;" $(BUSYBOX_DIR)/.config
+endif
ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
# force mdev on
$(SED) "s/^.*CONFIG_MDEV.*/CONFIG_MDEV=y/" $(BUSYBOX_DIR)/.config
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-06-25 11:07 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 11:07 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 04:07:11 -0700 (Mon, 25 Jun 2007)
New Revision: 18925
Log:
- add post 1.6.0 fix
Added:
trunk/buildroot/package/busybox/busybox-1.6.0-test.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.6.0-test.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.6.0-test.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.6.0-test.patch 2007-06-25 11:07:11 UTC (rev 18925)
@@ -0,0 +1,70 @@
+--- busybox-1.6.0/coreutils/test.c 2007-06-01 13:48:34.000000000 +0200
++++ /tmp/busybox_1_6_stable/coreutils/test.c 2007-06-25 12:29:55.000000000 +0200
+@@ -182,19 +182,23 @@
+ int bb_test(int argc, char **argv)
+ {
+ int res;
++ char *arg0;
++ bool _off;
+
+- if (LONE_CHAR(argv[0], '[')) {
++ arg0 = strrchr(argv[0], '/');
++ if (!arg0++) arg0 = argv[0];
++ if (arg0[0] == '[') {
+ --argc;
+- if (NOT_LONE_CHAR(argv[argc], ']')) {
+- bb_error_msg("missing ]");
+- return 2;
+- }
+- argv[argc] = NULL;
+- } else if (strcmp(argv[0], "[[") == 0) {
+- --argc;
+- if (strcmp(argv[argc], "]]")) {
+- bb_error_msg("missing ]]");
+- return 2;
++ if (!arg0[1]) { /* "[" ? */
++ if (NOT_LONE_CHAR(argv[argc], ']')) {
++ bb_error_msg("missing ]");
++ return 2;
++ }
++ } else { /* assuming "[[" */
++ if (strcmp(argv[argc], "]]") != 0) {
++ bb_error_msg("missing ]]");
++ return 2;
++ }
+ }
+ argv[argc] = NULL;
+ }
+@@ -219,15 +223,19 @@
+ if (argc == 2)
+ return *argv[1] == '\0';
+ //assert(argc);
+- if (LONE_CHAR(argv[1], '!')) {
+- bool _off;
++ /* remember if we saw argc==4 which wants *no* '!' test */
++ _off = argc - 4;
++ if (_off ?
++ (LONE_CHAR(argv[1], '!'))
++ : (argv[1][0] != '!' || argv[1][1] != '\0'))
++ {
+ if (argc == 3)
+ return *argv[2] != '\0';
+- _off = argc - 4;
++
+ t_lex(argv[2 + _off]);
+ if (t_wp_op && t_wp_op->op_type == BINOP) {
+ t_wp = &argv[1 + _off];
+- return binop() == 0;
++ return binop() == _off;
+ }
+ }
+ t_wp = &argv[1];
+@@ -378,7 +386,7 @@
+ static int filstat(char *nm, enum token mode)
+ {
+ struct stat s;
+- int i;
++ int i = i; /* gcc 3.x thinks it can be used uninitialized */
+
+ if (mode == FILSYM) {
+ #ifdef S_IFLNK
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-06-14 13:09 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-06-14 13:09 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-06-14 06:09:06 -0700 (Thu, 14 Jun 2007)
New Revision: 18822
Log:
busybox 1.6.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.6.0-echo.patch
trunk/buildroot/package/busybox/busybox-1.6.0-hushdep.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.6.0-echo.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.6.0-echo.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.6.0-echo.patch 2007-06-14 13:09:06 UTC (rev 18822)
@@ -0,0 +1,11 @@
+--- busybox-1.6.0/coreutils/echo.c Fri Jun 1 13:48:34 2007
++++ busybox-1.6.0-echo/coreutils/echo.c Wed Jun 6 09:49:18 2007
+@@ -33,7 +33,7 @@
+ eflag = '\\',
+ nflag = 1, /* 1 -- print '\n' */
+ };
+- ++argv;
++ arg = ++argv;
+ #else
+ const char *p;
+ char nflag = 1;
Added: trunk/buildroot/package/busybox/busybox-1.6.0-hushdep.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.6.0-hushdep.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.6.0-hushdep.patch 2007-06-14 13:09:06 UTC (rev 18822)
@@ -0,0 +1,32 @@
+--- busybox-1.6.0/shell/Config.in Fri Jun 1 13:48:33 2007
++++ busybox-1.6.0-hushdep/shell/Config.in Sun Jun 10 01:02:47 2007
+@@ -179,6 +179,7 @@
+ config HUSH_HELP
+ bool "help builtin"
+ default n
++ depends on HUSH
+ help
+ Enable help builtin in hush. Code size + ~1 kbyte.
+
+@@ -206,18 +207,21 @@
+ config HUSH_TICK
+ bool "Process substitution"
+ default n
++ depends on HUSH
+ help
+ Enable process substitution `command` and $(command) in hush.
+
+ config HUSH_IF
+ bool "Support if/then/elif/else/fi"
+ default n
++ depends on HUSH
+ help
+ Enable if/then/elif/else/fi in hush.
+
+ config HUSH_LOOPS
+ bool "Support for, while and until loops"
+ default n
++ depends on HUSH
+ help
+ Enable for, while and until loops in hush.
+
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-06-02 13:13 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-06-02 13:13 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-02 06:13:56 -0700 (Sat, 02 Jun 2007)
New Revision: 18732
Log:
- bump version
Added:
trunk/buildroot/package/busybox/busybox-1.6.0.config
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-06-02 13:05:29 UTC (rev 18731)
+++ trunk/buildroot/package/busybox/Config.in 2007-06-02 13:13:56 UTC (rev 18732)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_5_0
+ default BR2_BUSYBOX_VERSION_1_6_0
help
Select the version of BusyBox you wish to use.
@@ -42,7 +42,14 @@
config BR2_BUSYBOX_VERSION_1_5_0
bool "BusyBox 1.5.0"
+ depends on BR2_DEPRECATED
+ config BR2_BUSYBOX_VERSION_1_5_1
+ bool "BusyBox 1.5.1"
+
+ config BR2_BUSYBOX_VERSION_1_6_0
+ bool "BusyBox 1.6.0"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -57,6 +64,8 @@
default "1.4.1" if BR2_BUSYBOX_VERSION_1_4_1
default "1.4.2" if BR2_BUSYBOX_VERSION_1_4_2
default "1.5.0" if BR2_BUSYBOX_VERSION_1_5_0
+ default "1.5.1" if BR2_BUSYBOX_VERSION_1_5_1
+ default "1.6.0" if BR2_BUSYBOX_VERSION_1_6_0
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -83,6 +92,8 @@
default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_1
default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_2
default "package/busybox/busybox-1.5.0.config" if BR2_BUSYBOX_VERSION_1_5_0
+ default "package/busybox/busybox-1.5.0.config" if BR2_BUSYBOX_VERSION_1_5_1
+ default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_0
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Copied: trunk/buildroot/package/busybox/busybox-1.6.0.config (from rev 18731, trunk/buildroot/package/busybox/busybox-1.5.0.config)
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.6.0.config (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.6.0.config 2007-06-02 13:13:56 UTC (rev 18732)
@@ -0,0 +1,690 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.5.0
+# Wed Mar 14 13:42:28 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_NITPICK=y
+CONFIG_DESKTOP=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_FEATURE_HAVE_RPC is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_EXEC_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_BUILD_AT_ONCE=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_LZMA=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=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=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WATCH=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+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=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+CONFIG_FEATURE_INSMOD_LOAD_MAP=y
+CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_READPROFILE=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+CONFIG_DEBUG_CROND_OPTION=y
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_LAST=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+CONFIG_SETSID=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NAMEIF=y
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_DHCPRELAY=y
+CONFIG_APP_DUMPLEASES=y
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+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
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-05-15 9:34 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-05-15 9:34 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-05-15 02:33:57 -0700 (Tue, 15 May 2007)
New Revision: 18619
Log:
- fixed upstream in r18618
Removed:
trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch
Changeset:
Deleted: trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch 2007-05-15 09:33:32 UTC (rev 18618)
+++ trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch 2007-05-15 09:33:57 UTC (rev 18619)
@@ -1,59 +0,0 @@
-Index: busybox/networking/libiproute/Kbuild
-===================================================================
---- busybox/networking/libiproute/Kbuild (revision 17720)
-+++ busybox/networking/libiproute/Kbuild (working copy)
-@@ -8,11 +8,6 @@
- lib-y:=
- lib-$(CONFIG_IP) += \
- ip_parse_common_args.o \
-- ipaddress.o \
-- iplink.o \
-- iproute.o \
-- iptunnel.o \
-- iprule.o \
- libnetlink.o \
- ll_addr.o \
- ll_map.o \
-@@ -22,7 +17,7 @@
- rtm_map.o \
- utils.o
-
--lib-$(CONFIG_IPADDR) += \
-+lib-$(CONFIG_FEATURE_IP_ADDRESS) += \
- ip_parse_common_args.o \
- ipaddress.o \
- libnetlink.o \
-@@ -32,7 +27,7 @@
- rt_names.o \
- utils.o
-
--lib-$(CONFIG_IPLINK) += \
-+lib-$(CONFIG_FEATURE_IP_LINK) += \
- ip_parse_common_args.o \
- ipaddress.o \
- iplink.o \
-@@ -43,7 +38,7 @@
- rt_names.o \
- utils.o
-
--lib-$(CONFIG_IPROUTE) += \
-+lib-$(CONFIG_FEATURE_IP_ROUTE) += \
- ip_parse_common_args.o \
- iproute.o \
- libnetlink.o \
-@@ -52,13 +47,13 @@
- rtm_map.o \
- utils.o
-
--lib-$(CONFIG_IPTUNNEL) += \
-+lib-$(CONFIG_FEATURE_IP_TUNNEL) += \
- ip_parse_common_args.o \
- iptunnel.o \
- rt_names.o \
- utils.o
-
--lib-$(CONFIG_IPRULE) += \
-+lib-$(CONFIG_FEATURE_IP_RULE) += \
- ip_parse_common_args.o \
- iprule.o \
- rt_names.o \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-05-07 4:07 sjhill at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: sjhill at uclibc.org @ 2007-05-07 4:07 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-05-06 21:07:06 -0700 (Sun, 06 May 2007)
New Revision: 18581
Log:
This patch increases the maximum host name length for 'dnsd' to 40 characters in length and fixes a resolving bug. For example, if there are two entries in the 'dnsd.conf' file of 'foo1' and 'foo2'. Doing a 'nslookup foo2' the 'dnsd' will always return the IP address of 'foo1' because the string comparison is faulty.
Added:
trunk/buildroot/package/busybox/busybox-1.2.2.1-max_host_len_40.patch
trunk/buildroot/package/busybox/busybox-1.4.0-max_host_len_40.patch
trunk/buildroot/package/busybox/busybox-1.5.0-max_host_len_40.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.2.2.1-max_host_len_40.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.2.2.1-max_host_len_40.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.2.2.1-max_host_len_40.patch 2007-05-07 04:07:06 UTC (rev 18581)
@@ -0,0 +1,61 @@
+diff -ur busybox-1.2.2.1/networking/dnsd.c busybox-1.2.2.1-patched/networking/dnsd.c
+--- busybox-1.2.2.1/networking/dnsd.c 2006-10-24 15:21:17.000000000 -0500
++++ busybox-1.2.2.1-patched/networking/dnsd.c 2007-04-12 12:49:53.000000000 -0500
+@@ -31,11 +31,11 @@
+
+ #define is_daemon() (flags&16)
+ #define is_verbose() (flags&32)
+-//#define DEBUG
++#undef DEBUG
+
+
+ enum {
+- MAX_HOST_LEN = 16, // longest host name allowed is 15
++ MAX_HOST_LEN = 41, // longest host name allowed is 40
+ IP_STRING_LEN = 18, // .xxx.xxx.xxx.xxx\0
+
+ //must be strlen('.in-addr.arpa') larger than IP_STRING_LEN
+@@ -229,19 +229,23 @@
+ {
+ int i;
+ struct dns_entry *d = dnsentry;
++ char *p,*q;
++
++ q = (char *)&(qs[1]);
++ p = &(d->name[1]);
+
+ if(d) do {
+ #ifdef DEBUG
+ if(qs && d) {
+- char *p,*q;
+- q = (char *)&(qs[1]);
+- p = &(d->name[1]);
+ fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d",
+ __FUNCTION__, strlen(p), (int)(d->name[0]),
+ p, q, strlen(q));
+ }
+ #endif
+ if (type == REQ_A) { /* search by host name */
++ p = &(d->name[1]);
++ if(strlen(q) != strlen(p))
++ continue;
+ for(i = 1; i <= (int)(d->name[0]); i++)
+ if(tolower(qs[i]) != d->name[i])
+ break;
+@@ -398,13 +402,15 @@
+ fprintf(stderr,"fileconf: %s\n", fileconf);
+ }
+
+- if(is_daemon())
++ if(is_daemon()) {
+ #ifdef BB_NOMMU
+ /* reexec for vfork() do continue parent */
+ vfork_daemon_rexec(1, 0, argc, argv, "-d");
+ #else
+ bb_xdaemon(1, 0);
+ #endif
++ daemonmode = 1;
++ }
+
+ dnsentryinit(is_verbose());
+
Added: trunk/buildroot/package/busybox/busybox-1.4.0-max_host_len_40.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0-max_host_len_40.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0-max_host_len_40.patch 2007-05-07 04:07:06 UTC (rev 18581)
@@ -0,0 +1,61 @@
+diff -ur busybox-1.2.2.1/networking/dnsd.c busybox-1.2.2.1-patched/networking/dnsd.c
+--- busybox-1.2.2.1/networking/dnsd.c 2006-10-24 15:21:17.000000000 -0500
++++ busybox-1.2.2.1-patched/networking/dnsd.c 2007-04-12 12:49:53.000000000 -0500
+@@ -31,11 +31,11 @@
+
+ #define is_daemon() (flags&16)
+ #define is_verbose() (flags&32)
+-//#define DEBUG
++#undef DEBUG
+
+
+ enum {
+- MAX_HOST_LEN = 16, // longest host name allowed is 15
++ MAX_HOST_LEN = 41, // longest host name allowed is 40
+ IP_STRING_LEN = 18, // .xxx.xxx.xxx.xxx\0
+
+ //must be strlen('.in-addr.arpa') larger than IP_STRING_LEN
+@@ -229,19 +229,23 @@
+ {
+ int i;
+ struct dns_entry *d = dnsentry;
++ char *p,*q;
++
++ q = (char *)&(qs[1]);
++ p = &(d->name[1]);
+
+ if(d) do {
+ #ifdef DEBUG
+ if(qs && d) {
+- char *p,*q;
+- q = (char *)&(qs[1]);
+- p = &(d->name[1]);
+ fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d",
+ __FUNCTION__, strlen(p), (int)(d->name[0]),
+ p, q, strlen(q));
+ }
+ #endif
+ if (type == REQ_A) { /* search by host name */
++ p = &(d->name[1]);
++ if(strlen(q) != strlen(p))
++ continue;
+ for(i = 1; i <= (int)(d->name[0]); i++)
+ if(tolower(qs[i]) != d->name[i])
+ break;
+@@ -398,13 +402,15 @@
+ fprintf(stderr,"fileconf: %s\n", fileconf);
+ }
+
+- if(is_daemon())
++ if(is_daemon()) {
+ #ifdef BB_NOMMU
+ /* reexec for vfork() do continue parent */
+ vfork_daemon_rexec(1, 0, argc, argv, "-d");
+ #else
+ bb_xdaemon(1, 0);
+ #endif
++ daemonmode = 1;
++ }
+
+ dnsentryinit(is_verbose());
+
Added: trunk/buildroot/package/busybox/busybox-1.5.0-max_host_len_40.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.5.0-max_host_len_40.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.5.0-max_host_len_40.patch 2007-05-07 04:07:06 UTC (rev 18581)
@@ -0,0 +1,37 @@
+diff -ur busybox-1.5.0/networking/dnsd.c busybox-1.5.0-patched/networking/dnsd.c
+--- busybox-1.5.0/networking/dnsd.c 2007-03-22 15:21:23.000000000 -0500
++++ busybox-1.5.0-patched/networking/dnsd.c 2007-04-13 06:53:49.000000000 -0500
+@@ -30,7 +30,7 @@
+ #define DEBUG 0
+
+ enum {
+- MAX_HOST_LEN = 16, // longest host name allowed is 15
++ MAX_HOST_LEN = 41, // longest host name allowed is 40
+ IP_STRING_LEN = 18, // .xxx.xxx.xxx.xxx\0
+
+ //must be strlen('.in-addr.arpa') larger than IP_STRING_LEN
+@@ -186,17 +186,21 @@
+ {
+ int i;
+ struct dns_entry *d=dnsentry;
++ char *p,*q;
++
++ q = (char *)&(qs[1]);
++ p = &(d->name[1]);
+
+ do {
+ #if DEBUG
+- char *p,*q;
+- q = (char *)&(qs[1]);
+- p = &(d->name[1]);
+ fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d",
+ __FUNCTION__, (int)strlen(p), (int)(d->name[0]),
+ p, q, (int)strlen(q));
+ #endif
+ if (type == REQ_A) { /* search by host name */
++ p = &(d->name[1]);
++ if(strlen(q) != strlen(p))
++ continue;
+ for (i = 1; i <= (int)(d->name[0]); i++)
+ if (tolower(qs[i]) != d->name[i])
+ break;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-05-07 4:04 sjhill at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: sjhill at uclibc.org @ 2007-05-07 4:04 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-05-06 21:04:34 -0700 (Sun, 06 May 2007)
New Revision: 18580
Log:
If any of the netkit packages were selected, we disable their counterparts in Busybox and warn the user.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-05-07 04:03:42 UTC (rev 18579)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-05-07 04:04:34 UTC (rev 18580)
@@ -78,6 +78,16 @@
# force mdev on
$(SED) "s/^.*CONFIG_MDEV.*/CONFIG_MDEV=y/" $(BUSYBOX_DIR)/.config
endif
+ifeq ($(BR2_PACKAGE_NETKITBASE),y)
+ # disable usage of inetd if netkit-base package is selected
+ $(SED) "s/^.*CONFIG_INETD.*/CONFIG_INETD=n/;" $(BUSYBOX_DIR)/.config
+ @echo "WARNING!! CONFIG_INETD option disabled!"
+endif
+ifeq ($(BR2_PACKAGE_NETKITTELNET),y)
+ # disable usage of telnetd if netkit-telnetd package is selected
+ $(SED) "s/^.*CONFIG_TELNETD.*/CONFIG_TELNETD=n/;" $(BUSYBOX_DIR)/.config
+ @echo "WARNING!! CONFIG_TELNETD option disabled!"
+endif
yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
touch $@
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-04-25 7:11 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-04-25 7:11 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-04-25 00:11:10 -0700 (Wed, 25 Apr 2007)
New Revision: 18518
Log:
sed patch
Added:
trunk/buildroot/package/busybox/busybox-1.5.0-sed.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.5.0-sed.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.5.0-sed.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.5.0-sed.patch 2007-04-25 07:11:10 UTC (rev 18518)
@@ -0,0 +1,11 @@
+--- busybox-1.5.0/editors/sed.c Thu Mar 22 22:21:38 2007
++++ busybox-1.5.0-sed/editors/sed.c Fri Apr 13 22:10:24 2007
+@@ -481,7 +481,7 @@
+ if (bbg.add_cmd_line) {
+ char *tp = xasprintf("%s\n%s", bbg.add_cmd_line, cmdstr);
+ free(bbg.add_cmd_line);
+- bbg.add_cmd_line = tp;
++ cmdstr = bbg.add_cmd_line = tp;
+ }
+
+ /* If this line ends with backslash, request next line. */
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-04-05 7:04 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-04-05 7:04 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-04-05 00:04:31 -0700 (Thu, 05 Apr 2007)
New Revision: 18330
Log:
busybox 1.5.0 patches
Added:
trunk/buildroot/package/busybox/busybox-1.5.0-hdparm.patch
trunk/buildroot/package/busybox/busybox-1.5.0-ps.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.5.0-hdparm.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.5.0-hdparm.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.5.0-hdparm.patch 2007-04-05 07:04:31 UTC (rev 18330)
@@ -0,0 +1,14 @@
+--- busybox-1.5.0/miscutils/hdparm.c Thu Mar 22 22:21:34 2007
++++ busybox-1.5.0-hdparm/miscutils/hdparm.c Sat Mar 31 12:23:07 2007
+@@ -1569,9 +1569,9 @@
+ if (set_mult) {
+ print_flag(get_mult, "multcount", mult);
+ #ifdef HDIO_DRIVE_CMD
+- bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT");
++ bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT");
+ #else
+- force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, &mult, "HDIO_SET_MULTCOUNT"));
++ force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT"));
+ #endif
+ }
+ if (set_readonly) {
Added: trunk/buildroot/package/busybox/busybox-1.5.0-ps.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.5.0-ps.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.5.0-ps.patch 2007-04-05 07:04:31 UTC (rev 18330)
@@ -0,0 +1,13 @@
+--- busybox-1.5.0/procps/ps.c Thu Mar 22 22:21:37 2007
++++ busybox-1.5.0-ps/procps/ps.c Wed Mar 28 23:57:34 2007
+@@ -262,7 +262,9 @@
+ parse_o(default_o);
+ post_process();
+
+- terminal_width = INT_MAX;
++ /* Was INT_MAX, but some libc's go belly up with printf("%.*s")
++ * and such large widths */
++ terminal_width = 30000;
+ if (isatty(1)) {
+ get_terminal_width_height(1, &terminal_width, NULL);
+ terminal_width--;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-24 12:09 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-03-24 12:09 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-24 05:08:57 -0700 (Sat, 24 Mar 2007)
New Revision: 18218
Log:
- strip quotes. Thanks to Heikki Lindholm for pointing this out.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-03-24 12:08:36 UTC (rev 18217)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-03-24 12:08:57 UTC (rev 18218)
@@ -11,8 +11,10 @@
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BR2_BUSYBOX_VERSION)
-BUSYBOX_SOURCE:=busybox-$(BR2_BUSYBOX_VERSION).tar.bz2
+BUSYBOX_VERSION=$(strip $(subst ",, $(BR2_BUSYBOX_VERSION)))
+#"))
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VERSION)
+BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VERSION).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
@@ -38,7 +40,7 @@
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
else
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BR2_BUSYBOX_VERSION)-\*.patch
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VERSION)-\*.patch
endif
touch $@
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-23 13:26 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-03-23 13:26 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-23 06:26:51 -0700 (Fri, 23 Mar 2007)
New Revision: 18214
Log:
- make sure we have a build_$arch dir for -menuconfig even when in a pristine checkout
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-03-23 13:24:56 UTC (rev 18213)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-03-23 13:26:51 UTC (rev 18214)
@@ -109,7 +109,7 @@
busybox: uclibc $(TARGET_DIR)/bin/busybox
-busybox-menuconfig: host-sed busybox-source $(BUSYBOX_DIR)/.configured
+busybox-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-23 13:24 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-03-23 13:24 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-23 06:24:56 -0700 (Fri, 23 Mar 2007)
New Revision: 18213
Log:
- bump version
Added:
trunk/buildroot/package/busybox/busybox-1.5.0.config
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-03-22 23:31:29 UTC (rev 18212)
+++ trunk/buildroot/package/busybox/Config.in 2007-03-23 13:24:56 UTC (rev 18213)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_4_2
+ default BR2_BUSYBOX_VERSION_1_5_0
help
Select the version of BusyBox you wish to use.
@@ -38,7 +38,11 @@
config BR2_BUSYBOX_VERSION_1_4_2
bool "BusyBox 1.4.2"
+ depends on BR2_DEPRECATED
+ config BR2_BUSYBOX_VERSION_1_5_0
+ bool "BusyBox 1.5.0"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -52,6 +56,7 @@
default "1.4.0" if BR2_BUSYBOX_VERSION_1_4_0
default "1.4.1" if BR2_BUSYBOX_VERSION_1_4_1
default "1.4.2" if BR2_BUSYBOX_VERSION_1_4_2
+ default "1.5.0" if BR2_BUSYBOX_VERSION_1_5_0
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
@@ -70,13 +75,14 @@
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
depends BR2_PACKAGE_BUSYBOX
- default "target/device/x86/i386/busybox.config" if BR2_i386 && BR2_PACKAGE_BUSYBOX_SNAPSHOT
+ default "target/device/x86/i386/busybox.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
default "package/busybox/busybox-1.0.1.config" if BR2_BUSYBOX_VERSION_1_0_1
default "package/busybox/busybox-1.1.3.config" if BR2_BUSYBOX_VERSION_1_1_3
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_1
default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_2
+ default "package/busybox/busybox-1.5.0.config" if BR2_BUSYBOX_VERSION_1_5_0
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.5.0.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.5.0.config (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.5.0.config 2007-03-23 13:24:56 UTC (rev 18213)
@@ -0,0 +1,690 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.5.0
+# Wed Mar 14 13:42:28 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_NITPICK=y
+CONFIG_DESKTOP=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_FEATURE_HAVE_RPC is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_EXEC_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+CONFIG_BUILD_AT_ONCE=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_LZMA=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=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=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WATCH=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+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=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+CONFIG_FEATURE_INSMOD_LOAD_MAP=y
+CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_READPROFILE=y
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+CONFIG_DEBUG_CROND_OPTION=y
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_EJECT=y
+CONFIG_LAST=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_FLAGCS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RUNLEVEL=y
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+CONFIG_SETSID=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_TIME=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+CONFIG_FEATURE_IFUPDOWN_IP=y
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NAMEIF=y
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_DHCPRELAY=y
+CONFIG_APP_DUMPLEASES=y
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+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
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-03-22 23:31:29 UTC (rev 18212)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-03-23 13:24:56 UTC (rev 18213)
@@ -109,7 +109,7 @@
busybox: uclibc $(TARGET_DIR)/bin/busybox
-busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured
+busybox-menuconfig: host-sed busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-20 9:51 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-03-20 9:51 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-20 02:51:37 -0700 (Tue, 20 Mar 2007)
New Revision: 18173
Log:
- simplify busybox version fiddling
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-03-20 08:53:17 UTC (rev 18172)
+++ trunk/buildroot/package/busybox/Config.in 2007-03-20 09:51:37 UTC (rev 18173)
@@ -12,7 +12,7 @@
choice
prompt "BusyBox Version"
depends BR2_PACKAGE_BUSYBOX
- default BR2_BUSYBOX_VERSION_1_2_2_1
+ default BR2_BUSYBOX_VERSION_1_4_2
help
Select the version of BusyBox you wish to use.
@@ -26,6 +26,7 @@
config BR2_BUSYBOX_VERSION_1_2_2_1
bool "BusyBox 1.2.2.1"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_4_0
bool "BusyBox 1.4.0"
@@ -43,6 +44,14 @@
endchoice
+config BR2_BUSYBOX_VERSION
+ string
+ default "1.0.1" if BR2_BUSYBOX_VERSION_1_0_1
+ default "1.1.3" if BR2_BUSYBOX_VERSION_1_1_3
+ default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1
+ default "1.4.0" if BR2_BUSYBOX_VERSION_1_4_0
+ default "1.4.1" if BR2_BUSYBOX_VERSION_1_4_1
+ default "1.4.2" if BR2_BUSYBOX_VERSION_1_4_2
config BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-03-20 08:53:17 UTC (rev 18172)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-03-20 09:51:37 UTC (rev 18173)
@@ -4,39 +4,15 @@
#
#############################################################
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
-BUSYBOX_VER:=1.01
-endif
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y)
-BUSYBOX_VER:=1.1.3
-endif
-
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y)
-BUSYBOX_VER:=1.2.2.1
-endif
-
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_0)),y)
-BUSYBOX_VER:=1.4.0
-endif
-
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_1)),y)
-BUSYBOX_VER:=1.4.1
-endif
-
-ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_2)),y)
-BUSYBOX_VER:=1.4.2
-endif
-
-
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BR2_BUSYBOX_VERSION)
+BUSYBOX_SOURCE:=busybox-$(BR2_BUSYBOX_VERSION).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
@@ -62,7 +38,7 @@
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
else
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BR2_BUSYBOX_VERSION)-\*.patch
endif
touch $@
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-20 8:53 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-03-20 8:53 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-20 01:53:17 -0700 (Tue, 20 Mar 2007)
New Revision: 18172
Log:
- add busybox-1.4.2
Removed:
trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch
trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-03-20 03:32:26 UTC (rev 18171)
+++ trunk/buildroot/package/busybox/Config.in 2007-03-20 08:53:17 UTC (rev 18172)
@@ -18,19 +18,26 @@
config BR2_BUSYBOX_VERSION_1_0_1
bool "BusyBox 1.0.1"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_1_3
bool "BusyBox 1.1.3"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_2_2_1
bool "BusyBox 1.2.2.1"
config BR2_BUSYBOX_VERSION_1_4_0
bool "BusyBox 1.4.0"
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_4_1
bool "BusyBox 1.4.1"
+ depends on BR2_DEPRECATED
+ config BR2_BUSYBOX_VERSION_1_4_2
+ bool "BusyBox 1.4.2"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -60,6 +67,7 @@
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_1
+ default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_2
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Deleted: trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch 2007-03-20 03:32:26 UTC (rev 18171)
+++ trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch 2007-03-20 08:53:17 UTC (rev 18172)
@@ -1,11 +0,0 @@
-Index: busybox/libbb/messages.c
-===================================================================
---- busybox/libbb/messages.c (revision 18097)
-+++ busybox/libbb/messages.c (working copy)
-@@ -56,4 +56,5 @@ WTMP_FILE;
-
- char bb_common_bufsiz1[BUFSIZ+1];
-
--void *ptr_to_globals;
-+struct global1;
-+struct global1 *ptr_to_globals;
Deleted: trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch 2007-03-20 03:32:26 UTC (rev 18171)
+++ trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch 2007-03-20 08:53:17 UTC (rev 18172)
@@ -1,13 +0,0 @@
-Index: busybox/util-linux/mdev.c
-===================================================================
---- busybox/util-linux/mdev.c (revision 17891)
-+++ busybox/util-linux/mdev.c (working copy)
-@@ -39,7 +39,7 @@
-
- if (!delete) {
- strcat(path, "/dev");
-- len = open_read_close(path, temp + 1, 64);
-+ len = open_read_close(path, temp + 1, 9);
- *temp++ = 0;
- if (len < 1) return;
- }
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-03-20 03:32:26 UTC (rev 18171)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-03-20 08:53:17 UTC (rev 18172)
@@ -24,6 +24,11 @@
BUSYBOX_VER:=1.4.1
endif
+ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_2)),y)
+BUSYBOX_VER:=1.4.2
+endif
+
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-15 8:36 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-03-15 8:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-03-15 01:36:18 -0700 (Thu, 15 Mar 2007)
New Revision: 18117
Log:
tftp patch
Added:
trunk/buildroot/package/busybox/busybox-1.4.1-tftp.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.4.1-tftp.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.1-tftp.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.1-tftp.patch 2007-03-15 08:36:18 UTC (rev 18117)
@@ -0,0 +1,112 @@
+--- busybox-1.4.1/include/libbb.h Wed Jan 24 22:34:48 2007
++++ busybox-1.4.1-tftp/include/libbb.h Sat Mar 3 00:02:34 2007
+@@ -290,7 +290,7 @@
+
+ /* "new" (ipv4+ipv6) API */
+ typedef struct len_and_sockaddr {
+- int len;
++ socklen_t len;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+--- busybox-1.4.1/networking/tftp.c Wed Jan 24 22:34:34 2007
++++ busybox-1.4.1-tftp/networking/tftp.c Sat Mar 3 00:02:56 2007
+@@ -132,7 +132,7 @@
+ #if ENABLE_FEATURE_TFTP_GET && ENABLE_FEATURE_TFTP_PUT
+ const int cmd,
+ #endif
+- const len_and_sockaddr *peer_lsa,
++ len_and_sockaddr *peer_lsa,
+ const char *remotefile, const int localfd,
+ unsigned port, int tftp_bufsize)
+ {
+@@ -149,6 +149,9 @@
+
+ USE_FEATURE_TFTP_BLOCKSIZE(int want_option_ack = 0;)
+
++ unsigned org_port;
++ len_and_sockaddr *const from = alloca(offsetof(len_and_sockaddr, sa) + peer_lsa->len);
++
+ /* Can't use RESERVE_CONFIG_BUFFER here since the allocation
+ * size varies meaning BUFFERS_GO_ON_STACK would fail */
+ /* We must keep the transmit and receive buffers seperate */
+@@ -156,7 +159,7 @@
+ char *xbuf = xmalloc(tftp_bufsize += 4);
+ char *rbuf = xmalloc(tftp_bufsize);
+
+- port = htons(port);
++ port = org_port = htons(port);
+
+ socketfd = xsocket(peer_lsa->sa.sa_family, SOCK_DGRAM, 0);
+
+@@ -167,10 +170,10 @@
+ }
+
+ while (1) {
+-
+ cp = xbuf;
+
+ /* first create the opcode part */
++ /* (this 16bit store is aligned) */
+ *((uint16_t*)cp) = htons(opcode);
+ cp += 2;
+
+@@ -222,6 +225,7 @@
+ /* add ack and data */
+
+ if (CMD_GET(cmd) ? (opcode == TFTP_ACK) : (opcode == TFTP_DATA)) {
++ /* TODO: unaligned access! */
+ *((uint16_t*)cp) = htons(block_nr);
+ cp += 2;
+ block_nr++;
+@@ -273,28 +277,26 @@
+ FD_SET(socketfd, &rfds);
+
+ switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
+- struct sockaddr *from;
+- socklen_t fromlen;
+-
++ unsigned from_port;
+ case 1:
+- fromlen = peer_lsa->len;
+- from = alloca(fromlen);
+- memset(from, 0, fromlen);
+-
++ from->len = peer_lsa->len;
++ memset(&from->sa, 0, peer_lsa->len);
+ len = recvfrom(socketfd, rbuf, tftp_bufsize, 0,
+- from, &fromlen);
++ &from->sa, &from->len);
+ if (len < 0) {
+ bb_perror_msg("recvfrom");
+ break;
+ }
+-#if ENABLE_FEATURE_IPV6
+- if (from->sa_family == AF_INET6)
+- if (((struct sockaddr_in6*)from)->sin6_port != port)
+- goto recv_again;
+-#endif
+- if (from->sa_family == AF_INET)
+- if (((struct sockaddr_in*)from)->sin_port != port)
+- goto recv_again;
++ from_port = get_nport(from);
++ if (port == org_port) {
++ /* Our first query went to port 69
++ * but reply will come from different one.
++ * Remember and use this new port */
++ port = from_port;
++ set_nport(peer_lsa, from_port);
++ }
++ if (port != from_port)
++ goto recv_again;
+ timeout = 0;
+ break;
+ case 0:
+@@ -317,6 +319,7 @@
+ }
+
+ /* process received packet */
++ /* (both accesses seems to be aligned) */
+
+ opcode = ntohs( ((uint16_t*)rbuf)[0] );
+ tmp = ntohs( ((uint16_t*)rbuf)[1] );
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-03-14 13:02 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-03-14 13:02 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-14 06:02:07 -0700 (Wed, 14 Mar 2007)
New Revision: 18101
Log:
- fix ptr_to_globals
Added:
trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox.fix-ptr_to_globals.patch 2007-03-14 13:02:07 UTC (rev 18101)
@@ -0,0 +1,11 @@
+Index: busybox/libbb/messages.c
+===================================================================
+--- busybox/libbb/messages.c (revision 18097)
++++ busybox/libbb/messages.c (working copy)
+@@ -56,4 +56,5 @@ WTMP_FILE;
+
+ char bb_common_bufsiz1[BUFSIZ+1];
+
+-void *ptr_to_globals;
++struct global1;
++struct global1 *ptr_to_globals;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-27 9:04 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-27 9:04 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-27 01:04:31 -0800 (Tue, 27 Feb 2007)
New Revision: 17978
Log:
tar -t hotfix
Added:
trunk/buildroot/package/busybox/busybox-1.4.1-tar_t.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.4.1-tar_t.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.1-tar_t.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.1-tar_t.patch 2007-02-27 09:04:31 UTC (rev 17978)
@@ -0,0 +1,76 @@
+--- busybox-1.4.1/archival/tar.c Wed Jan 24 22:49:25 2007
++++ busybox-1.4.1-tar_t/archival/tar.c Sun Feb 25 21:50:35 2007
+@@ -760,7 +760,9 @@
+ const char *tar_filename = "-";
+ unsigned opt;
+ int verboseFlag = 0;
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+ llist_t *excludes = NULL;
++#endif
+
+ /* Initialise default values */
+ tar_handle = init_handle();
+@@ -773,7 +775,9 @@
+ "tt:vv:" // count -t,-v
+ "?:" // bail out with usage instead of error return
+ "X::T::" // cumulative lists
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+ "\xff::" // cumulative lists for --exclude
++#endif
+ USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
+ USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
+ SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive
+@@ -788,14 +792,15 @@
+ USE_FEATURE_TAR_FROM( "T:X:")
+ USE_FEATURE_TAR_GZIP( "z" )
+ USE_FEATURE_TAR_COMPRESS("Z" )
+- ,
+- &base_dir, // -C dir
+- &tar_filename, // -f filename
+- USE_FEATURE_TAR_FROM(&(tar_handle->accept),) // T
+- USE_FEATURE_TAR_FROM(&(tar_handle->reject),) // X
+- USE_FEATURE_TAR_FROM(&excludes ,) // --exclude
+- &verboseFlag, // combined count for -t and -v
+- &verboseFlag // combined count for -t and -v
++ , &base_dir // -C dir
++ , &tar_filename // -f filename
++ USE_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
++ USE_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
++ , &excludes // --exclude
++#endif
++ , &verboseFlag // combined count for -t and -v
++ , &verboseFlag // combined count for -t and -v
+ );
+
+ if (verboseFlag) tar_handle->action_header = header_verbose_list;
+@@ -828,17 +833,19 @@
+ if (opt & OPT_COMPRESS)
+ get_header_ptr = get_header_tar_Z;
+
+- if (ENABLE_FEATURE_TAR_FROM) {
+- tar_handle->reject = append_file_list_to_list(tar_handle->reject);
+- /* Append excludes to reject */
+- while (excludes) {
+- llist_t *temp = excludes->link;
+- excludes->link = tar_handle->reject;
+- tar_handle->reject = excludes;
+- excludes = temp;
+- }
+- tar_handle->accept = append_file_list_to_list(tar_handle->accept);
++#if ENABLE_FEATURE_TAR_FROM
++ tar_handle->reject = append_file_list_to_list(tar_handle->reject);
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS
++ /* Append excludes to reject */
++ while (excludes) {
++ llist_t *next = excludes->link;
++ excludes->link = tar_handle->reject;
++ tar_handle->reject = excludes;
++ excludes = next;
+ }
++#endif
++ tar_handle->accept = append_file_list_to_list(tar_handle->accept);
++#endif
+
+ /* Check if we are reading from stdin */
+ if (argv[optind] && *argv[optind] == '-') {
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-23 11:55 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-23 11:55 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-23 03:55:27 -0800 (Fri, 23 Feb 2007)
New Revision: 17962
Log:
Set CONFIG_PREFIX for all versions
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-02-23 01:05:52 UTC (rev 17961)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-02-23 11:55:27 UTC (rev 17962)
@@ -63,13 +63,13 @@
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
+ $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ;
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
$(BUSYBOX_DIR)/Rules.mak ;
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y)
- $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
- $(BUSYBOX_DIR)/.config ;
$(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config ;
endif
@@ -79,14 +79,7 @@
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
endif
-# either 1.4.0 or 1.4.1
-ifneq ($(strip $(BR2_BUSYBOX_VERSION_1_4_0))$(strip $(BR2_BUSYBOX_VERSION_1_4_1)),)
- $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
- $(BUSYBOX_DIR)/.config ;
-endif
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
- $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
- $(BUSYBOX_DIR)/.config ;
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-16 15:19 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-02-16 15:19 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-02-16 07:19:49 -0800 (Fri, 16 Feb 2007)
New Revision: 17908
Log:
- just reading the first 9 bytes for the maj:min ought to be enough (TM)
Added:
trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox.mdev-just-read-9-bytes.patch 2007-02-16 15:19:49 UTC (rev 17908)
@@ -0,0 +1,13 @@
+Index: busybox/util-linux/mdev.c
+===================================================================
+--- busybox/util-linux/mdev.c (revision 17891)
++++ busybox/util-linux/mdev.c (working copy)
+@@ -39,7 +39,7 @@
+
+ if (!delete) {
+ strcat(path, "/dev");
+- len = open_read_close(path, temp + 1, 64);
++ len = open_read_close(path, temp + 1, 9);
+ *temp++ = 0;
+ if (len < 1) return;
+ }
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-12 14:43 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-12 14:43 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-12 06:43:57 -0800 (Mon, 12 Feb 2007)
New Revision: 17865
Log:
Additional 1.4.1 patches
Added:
trunk/buildroot/package/busybox/busybox-1.4.1-iproute.patch
trunk/buildroot/package/busybox/busybox-1.4.1-wgetSEGV.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.4.1-iproute.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.1-iproute.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.1-iproute.patch 2007-02-12 14:43:57 UTC (rev 17865)
@@ -0,0 +1,71 @@
+diff -urN busybox-1.4.1/networking/ip.c busybox-1.4.1-iproute/networking/ip.c
+--- busybox-1.4.1/networking/ip.c 2007-01-24 22:34:34.000000000 +0100
++++ busybox-1.4.1-iproute/networking/ip.c 2007-01-27 14:07:05.000000000 +0100
+@@ -33,8 +33,9 @@
+ if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) {
+ ret = do_iplink(argc-2, argv+2);
+ }
+- if (ENABLE_FEATURE_IP_TUNNEL &&
+- (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)) {
++ if (ENABLE_FEATURE_IP_TUNNEL
++ && (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)
++ ) {
+ ret = do_iptunnel(argc-2, argv+2);
+ }
+ if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) {
+diff -urN busybox-1.4.1/networking/libiproute/iproute.c busybox-1.4.1-iproute/networking/libiproute/iproute.c
+--- busybox-1.4.1/networking/libiproute/iproute.c 2007-01-24 22:34:33.000000000 +0100
++++ busybox-1.4.1-iproute/networking/libiproute/iproute.c 2007-01-27 14:07:05.000000000 +0100
+@@ -835,9 +835,11 @@
+
+ int do_iproute(int argc, char **argv)
+ {
+- static const char * const ip_route_commands[] =
+- { "add", "append", "change", "chg", "delete", "get",
+- "list", "show", "prepend", "replace", "test", "flush", 0 };
++ static const char * const ip_route_commands[] = {
++ /*0-3*/ "add", "append", "change", "chg",
++ /*4-7*/ "delete", "get", "list", "show",
++ /*8..*/ "prepend", "replace", "test", "flush", 0
++ };
+ int command_num = 6;
+ unsigned int flags = 0;
+ int cmd = RTM_NEWROUTE;
+@@ -848,7 +850,7 @@
+ command_num = index_in_substr_array(ip_route_commands, *argv);
+ }
+ switch (command_num) {
+- case 0: /* add*/
++ case 0: /* add */
+ flags = NLM_F_CREATE|NLM_F_EXCL;
+ break;
+ case 1: /* append */
+@@ -859,21 +861,20 @@
+ flags = NLM_F_REPLACE;
+ break;
+ case 4: /* delete */
+- case 5: /* del */
+ cmd = RTM_DELROUTE;
+ break;
+- case 6: /* get */
++ case 5: /* get */
+ return iproute_get(argc-1, argv+1);
+- case 7: /* list */
+- case 8: /* show */
++ case 6: /* list */
++ case 7: /* show */
+ return iproute_list_or_flush(argc-1, argv+1, 0);
+- case 9: /* prepend */
++ case 8: /* prepend */
+ flags = NLM_F_CREATE;
+- case 10: /* replace */
++ case 9: /* replace */
+ flags = NLM_F_CREATE|NLM_F_REPLACE;
+- case 11: /* test */
++ case 10: /* test */
+ flags = NLM_F_EXCL;
+- case 12: /* flush */
++ case 11: /* flush */
+ return iproute_list_or_flush(argc-1, argv+1, 1);
+ default:
+ bb_error_msg_and_die("unknown command %s", *argv);
Added: trunk/buildroot/package/busybox/busybox-1.4.1-wgetSEGV.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.1-wgetSEGV.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.1-wgetSEGV.patch 2007-02-12 14:43:57 UTC (rev 17865)
@@ -0,0 +1,14 @@
+diff -urN busybox-1.4.1/networking/wget.c busybox-1.4.1-wgetSEGV/networking/wget.c
+--- busybox-1.4.1/networking/wget.c 2007-01-24 22:34:34.000000000 +0100
++++ busybox-1.4.1-wgetSEGV/networking/wget.c 2007-02-11 17:21:18.000000000 +0100
+@@ -543,7 +543,9 @@
+ p = strchr(h->host, '?'); if (!sp || (p && sp > p)) sp = p;
+ p = strchr(h->host, '#'); if (!sp || (p && sp > p)) sp = p;
+ if (!sp) {
+- h->path = "";
++ /* must be writable because of bb_get_last_path_component() */
++ static char nullstr[] = "";
++ h->path = nullstr;
+ } else if (*sp == '/') {
+ *sp = '\0';
+ h->path = sp + 1;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-06 16:34 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-06 16:34 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-06 08:34:54 -0800 (Tue, 06 Feb 2007)
New Revision: 17793
Log:
Made _DIR/_SOURCE/_SITE common for all non-snapshot versions
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:31:59 UTC (rev 17792)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:34:54 UTC (rev 17793)
@@ -6,37 +6,22 @@
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
BUSYBOX_VER:=1.01
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y)
BUSYBOX_VER:=1.1.3
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y)
BUSYBOX_VER:=1.2.2.1
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_0)),y)
BUSYBOX_VER:=1.4.0
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_1)),y)
BUSYBOX_VER:=1.4.1
-BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
@@ -44,6 +29,10 @@
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
+else
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
+BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
+BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
BUSYBOX_UNZIP=$(BZCAT)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-06 16:31 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-06 16:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-06 08:31:59 -0800 (Tue, 06 Feb 2007)
New Revision: 17792
Log:
v1.0.1 tarball is called busybox-1.01
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:23:33 UTC (rev 17791)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:31:59 UTC (rev 17792)
@@ -5,7 +5,7 @@
#############################################################
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
-BUSYBOX_VER:=1.0.1
+BUSYBOX_VER:=1.01
BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-06 16:23 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-06 16:23 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-06 08:23:33 -0800 (Tue, 06 Feb 2007)
New Revision: 17791
Log:
CONFIG_PREFIX hack (r17670) no longer needed
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:20:29 UTC (rev 17790)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:23:33 UTC (rev 17791)
@@ -132,7 +132,7 @@
ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- CONFIG_PREFIX="$(TARGET_DIR)" ARCH=$(KERNEL_ARCH) \
+ ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
else
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-06 16:18 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-02-06 16:18 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-02-06 08:18:12 -0800 (Tue, 06 Feb 2007)
New Revision: 17789
Log:
busybox 1.4.1 support
Added:
trunk/buildroot/package/busybox/busybox-1.4.1-binhex.patch
trunk/buildroot/package/busybox/busybox-1.4.1.config
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-02-06 11:31:50 UTC (rev 17788)
+++ trunk/buildroot/package/busybox/Config.in 2007-02-06 16:18:12 UTC (rev 17789)
@@ -27,6 +27,9 @@
config BR2_BUSYBOX_VERSION_1_4_0
bool "BusyBox 1.4.0"
+ config BR2_BUSYBOX_VERSION_1_4_1
+ bool "BusyBox 1.4.1"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -55,6 +58,7 @@
default "package/busybox/busybox-1.1.3.config" if BR2_BUSYBOX_VERSION_1_1_3
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
+ default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_1
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Added: trunk/buildroot/package/busybox/busybox-1.4.1-binhex.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.1-binhex.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.1-binhex.patch 2007-02-06 16:18:12 UTC (rev 17789)
@@ -0,0 +1,24 @@
+--- busybox-1.4.1/include/libbb.h Wed Jan 24 22:34:48 2007
++++ busybox-1.4.1-binhex/include/libbb.h Sat Jan 27 00:32:01 2007
+@@ -690,7 +690,7 @@
+ extern const char bb_msg_standard_output[];
+
+ extern const char bb_str_default[];
+-/* NB: (bb_hexdigits_upcase[i] | 0x10) -> lowercase hex digit */
++/* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */
+ extern const char bb_hexdigits_upcase[];
+
+ extern const char bb_path_mtab_file[];
+--- busybox-1.4.1/libbb/xfuncs.c Wed Jan 24 22:49:25 2007
++++ busybox-1.4.1-binhex/libbb/xfuncs.c Sat Jan 27 00:32:01 2007
+@@ -340,8 +340,8 @@
+ while (count) {
+ unsigned char c = *cp++;
+ /* put lowercase hex digits */
+- *p++ = 0x10 | bb_hexdigits_upcase[c >> 4];
+- *p++ = 0x10 | bb_hexdigits_upcase[c & 0xf];
++ *p++ = 0x20 | bb_hexdigits_upcase[c >> 4];
++ *p++ = 0x20 | bb_hexdigits_upcase[c & 0xf];
+ count--;
+ }
+ return p;
Added: trunk/buildroot/package/busybox/busybox-1.4.1.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.1.config (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.1.config 2007-02-06 16:18:12 UTC (rev 17789)
@@ -0,0 +1,675 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.4.1
+# Tue Jan 30 14:22:01 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=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=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_SEQ is not set
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+# CONFIG_WATCH is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+# CONFIG_WHO is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+# CONFIG_FEATURE_AWK_MATH is not set
+# CONFIG_ED is not set
+# CONFIG_PATCH 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=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+# CONFIG_FEATURE_FIND_MMIN is not set
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+# CONFIG_LOSETUP is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+CONFIG_MT=y
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_TFTP is not set
+# CONFIG_FEATURE_TFTP_GET is not set
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_RENICE is not set
+# CONFIG_BB_SYSCTL is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+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
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-02-06 11:31:50 UTC (rev 17788)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-02-06 16:18:12 UTC (rev 17789)
@@ -32,6 +32,13 @@
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
+ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_1)),y)
+BUSYBOX_VER:=1.4.1
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
+BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
+BUSYBOX_SITE:=http://www.busybox.net/downloads
+endif
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
@@ -83,6 +90,11 @@
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
endif
+# either 1.4.0 or 1.4.1
+ifneq ($(strip $(BR2_BUSYBOX_VERSION_1_4_0))$(strip $(BR2_BUSYBOX_VERSION_1_4_1)),)
+ $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ;
+endif
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config ;
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-02 16:15 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-02-02 16:15 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-02-02 08:15:51 -0800 (Fri, 02 Feb 2007)
New Revision: 17728
Log:
- there is something wrong in the new buildsys: If one selects ip and has e..g rule or route unset, ip still wants to build those.
This fails (correctly) since rtnl_rttable_n2a and rtnl_rtrealm_n2a aren't available if they were turned off. TODO: Talk to vda about this
Added:
trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch
Changeset:
Added: trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox.network-odd-dependencies.patch 2007-02-02 16:15:51 UTC (rev 17728)
@@ -0,0 +1,59 @@
+Index: busybox/networking/libiproute/Kbuild
+===================================================================
+--- busybox/networking/libiproute/Kbuild (revision 17720)
++++ busybox/networking/libiproute/Kbuild (working copy)
+@@ -8,11 +8,6 @@
+ lib-y:=
+ lib-$(CONFIG_IP) += \
+ ip_parse_common_args.o \
+- ipaddress.o \
+- iplink.o \
+- iproute.o \
+- iptunnel.o \
+- iprule.o \
+ libnetlink.o \
+ ll_addr.o \
+ ll_map.o \
+@@ -22,7 +17,7 @@
+ rtm_map.o \
+ utils.o
+
+-lib-$(CONFIG_IPADDR) += \
++lib-$(CONFIG_FEATURE_IP_ADDRESS) += \
+ ip_parse_common_args.o \
+ ipaddress.o \
+ libnetlink.o \
+@@ -32,7 +27,7 @@
+ rt_names.o \
+ utils.o
+
+-lib-$(CONFIG_IPLINK) += \
++lib-$(CONFIG_FEATURE_IP_LINK) += \
+ ip_parse_common_args.o \
+ ipaddress.o \
+ iplink.o \
+@@ -43,7 +38,7 @@
+ rt_names.o \
+ utils.o
+
+-lib-$(CONFIG_IPROUTE) += \
++lib-$(CONFIG_FEATURE_IP_ROUTE) += \
+ ip_parse_common_args.o \
+ iproute.o \
+ libnetlink.o \
+@@ -52,13 +47,13 @@
+ rtm_map.o \
+ utils.o
+
+-lib-$(CONFIG_IPTUNNEL) += \
++lib-$(CONFIG_FEATURE_IP_TUNNEL) += \
+ ip_parse_common_args.o \
+ iptunnel.o \
+ rt_names.o \
+ utils.o
+
+-lib-$(CONFIG_IPRULE) += \
++lib-$(CONFIG_FEATURE_IP_RULE) += \
+ ip_parse_common_args.o \
+ iprule.o \
+ rt_names.o \
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-02-01 12:30 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-02-01 12:30 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-02-01 04:30:34 -0800 (Thu, 01 Feb 2007)
New Revision: 17697
Log:
- the generic x86 busybox config is ment for current busybox trunk
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-02-01 07:30:37 UTC (rev 17696)
+++ trunk/buildroot/package/busybox/Config.in 2007-02-01 12:30:34 UTC (rev 17697)
@@ -50,7 +50,7 @@
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
depends BR2_PACKAGE_BUSYBOX
- default "target/device/x86/i386/busybox.config" if BR2_i386
+ default "target/device/x86/i386/busybox.config" if BR2_i386 && BR2_PACKAGE_BUSYBOX_SNAPSHOT
default "package/busybox/busybox-1.0.1.config" if BR2_BUSYBOX_VERSION_1_0_1
default "package/busybox/busybox-1.1.3.config" if BR2_BUSYBOX_VERSION_1_1_3
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-01-31 14:21 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2007-01-31 14:21 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-01-31 06:21:08 -0800 (Wed, 31 Jan 2007)
New Revision: 17685
Log:
- fix patch application. Use busybox-$(VER)-\*.patch for versions and busybox.\*.patch for snapshot
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-01-31 10:10:06 UTC (rev 17684)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-01-31 14:21:08 UTC (rev 17685)
@@ -58,8 +58,12 @@
$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
endif
# Allow busybox patches.
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)\*.patch
- touch $(BUSYBOX_DIR)/.unpacked
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
+else
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+endif
+ touch $@
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
@@ -95,7 +99,7 @@
endif
yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
- touch $(BUSYBOX_DIR)/.configured
+ touch $@
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-01-30 16:47 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-01-30 16:47 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-01-30 08:47:27 -0800 (Tue, 30 Jan 2007)
New Revision: 17670
Log:
busybox 1.4.0 seems to use CONFIG_PREFIX instead of PREFIX
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-01-30 13:37:21 UTC (rev 17669)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-01-30 16:47:27 UTC (rev 17670)
@@ -116,7 +116,7 @@
ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- ARCH=$(KERNEL_ARCH) \
+ CONFIG_PREFIX="$(TARGET_DIR)" ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
else
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-01-30 13:37 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-01-30 13:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-01-30 05:37:21 -0800 (Tue, 30 Jan 2007)
New Revision: 17669
Log:
busybox 1.4.0 support files
Added:
trunk/buildroot/package/busybox/busybox-1.4.0-conf.patch
trunk/buildroot/package/busybox/busybox-1.4.0-libnetlink.patch
trunk/buildroot/package/busybox/busybox-1.4.0-parse_config_file.patch
trunk/buildroot/package/busybox/busybox-1.4.0-syslogd-n.patch
trunk/buildroot/package/busybox/busybox-1.4.0-tar.patch
trunk/buildroot/package/busybox/busybox-1.4.0.config
Changeset:
Added: trunk/buildroot/package/busybox/busybox-1.4.0-conf.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0-conf.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0-conf.patch 2007-01-30 13:37:21 UTC (rev 17669)
@@ -0,0 +1,37 @@
+--- busybox-1.4.0/applets/applets.c Fri Jan 19 22:23:11 2007
++++ busybox-1.4.0-conf/applets/applets.c Wed Jan 24 10:15:49 2007
+@@ -340,20 +340,26 @@
+ if (sct) {
+ mode_t m = sct->m_mode;
+
+- if (sct->m_uid == ruid) /* same uid */
++ if (sct->m_uid == ruid)
++ /* same uid */
+ m >>= 6;
+- else if ((sct->m_gid == rgid) || ingroup(ruid, sct->m_gid)) /* same group / in group */
++ else if ((sct->m_gid == rgid) || ingroup(ruid, sct->m_gid))
++ /* same group / in group */
+ m >>= 3;
+
+ if (!(m & S_IXOTH)) /* is x bit not set ? */
+ bb_error_msg_and_die("you have no permission to run this applet!");
+
+- if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) { /* *both* have to be set for sgid */
+- xsetgid(sct->m_gid);
+- } else xsetgid(rgid); /* no sgid -> drop */
+-
+- if (sct->m_mode & S_ISUID) xsetuid(sct->m_uid);
+- else xsetuid(ruid); /* no suid -> drop */
++ if (sct->m_gid != 0) {
++ /* _both_ have to be set for sgid */
++ if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
++ xsetgid(sct->m_gid);
++ } else xsetgid(rgid); /* no sgid -> drop */
++ }
++ if (sct->m_uid != 0) {
++ if (sct->m_mode & S_ISUID) xsetuid(sct->m_uid);
++ else xsetuid(ruid); /* no suid -> drop */
++ }
+ } else {
+ /* default: drop all privileges */
+ xsetgid(rgid);
Added: trunk/buildroot/package/busybox/busybox-1.4.0-libnetlink.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0-libnetlink.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0-libnetlink.patch 2007-01-30 13:37:21 UTC (rev 17669)
@@ -0,0 +1,19 @@
+--- busybox-1.4.0/networking/libiproute/libnetlink.h Fri Jan 19 22:22:58 2007
++++ busybox-1.4.0-libnetlink/networking/libiproute/libnetlink.h Tue Jan 23 00:30:45 2007
+@@ -2,6 +2,9 @@
+ #ifndef __LIBNETLINK_H__
+ #define __LIBNETLINK_H__ 1
+
++#include <linux/types.h>
++/* We need linux/types.h because older kernels use __u32 etc
++ * in linux/[rt]netlink.h. 2.6.19 seems to be ok, though */
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+
+@@ -37,6 +40,4 @@
+
+ extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
+
+-
+ #endif /* __LIBNETLINK_H__ */
+-
Added: trunk/buildroot/package/busybox/busybox-1.4.0-parse_config_file.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0-parse_config_file.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0-parse_config_file.patch 2007-01-30 13:37:21 UTC (rev 17669)
@@ -0,0 +1,11 @@
+--- busybox-1.4.0/applets/applets.c Fri Jan 19 22:23:11 2007
++++ busybox-1.4.0-parse_config_file/applets/applets.c Tue Jan 23 21:35:00 2007
+@@ -320,7 +320,7 @@
+ }
+
+ #else
+-#define parse_config_file()
++#define parse_config_file() ((void)0)
+ #endif /* CONFIG_FEATURE_SUID_CONFIG */
+
+ #ifdef CONFIG_FEATURE_SUID
Added: trunk/buildroot/package/busybox/busybox-1.4.0-syslogd-n.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0-syslogd-n.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0-syslogd-n.patch 2007-01-30 13:37:21 UTC (rev 17669)
@@ -0,0 +1,65 @@
+--- busybox-1.4.0/libbb/vdprintf.c Fri Jan 19 22:23:06 2007
++++ busybox-1.4.0-syslogd-n/libbb/vdprintf.c Tue Jan 23 21:50:54 2007
+@@ -7,11 +7,7 @@
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+-#include <stdio.h>
+-#include <unistd.h>
+ #include "libbb.h"
+-
+-
+
+ #if defined(__GLIBC__) && __GLIBC__ < 2
+ int vdprintf(int d, const char *format, va_list ap)
+--- busybox-1.4.0/libbb/xfuncs.c Fri Jan 19 22:23:06 2007
++++ busybox-1.4.0-syslogd-n/libbb/xfuncs.c Tue Jan 23 21:47:27 2007
+@@ -81,13 +81,14 @@
+ t = (char*) s;
+ while (m) {
+ if (!*t) break;
+- m--; t++;
++ m--;
++ t++;
+ }
+- n = n - m;
++ n -= m;
+ t = xmalloc(n + 1);
+ t[n] = '\0';
+
+- return memcpy(t,s,n);
++ return memcpy(t, s, n);
+ }
+
+ // Die if we can't open a file and return a FILE * to it.
+--- busybox-1.4.0/libbb/xreadlink.c Fri Jan 19 22:23:06 2007
++++ busybox-1.4.0-syslogd-n/libbb/xreadlink.c Tue Jan 23 22:35:45 2007
+@@ -36,7 +36,7 @@
+
+ char *xmalloc_realpath(const char *path)
+ {
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ /* glibc provides a non-standard extension */
+ return realpath(path, NULL);
+ #else
+--- busybox-1.4.0/sysklogd/syslogd.c Fri Jan 19 22:23:02 2007
++++ busybox-1.4.0-syslogd-n/sysklogd/syslogd.c Wed Jan 24 21:52:07 2007
+@@ -569,7 +569,7 @@
+ //if (option_mask32 & OPT_locallog) // -L
+ #endif
+ #if ENABLE_FEATURE_IPC_SYSLOG
+- if ((option_mask32 & OPT_circularlog) && opt_C) // -C
++ if (opt_C) // -Cn
+ shm_size = xatoul_range(opt_C, 4, INT_MAX/1024) * 1024;
+ #endif
+
+@@ -588,7 +588,7 @@
+ #ifdef BB_NOMMU
+ vfork_daemon_rexec(0, 1, argc, argv, "-n");
+ #else
+- xdaemon(0, 1);
++ bb_daemonize();
+ #endif
+ }
+ umask(0);
Added: trunk/buildroot/package/busybox/busybox-1.4.0-tar.patch
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0-tar.patch (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0-tar.patch 2007-01-30 13:37:21 UTC (rev 17669)
@@ -0,0 +1,117 @@
+--- busybox-1.4.0/archival/tar.c Fri Jan 19 22:23:02 2007
++++ busybox-1.4.0-tar/archival/tar.c Wed Jan 24 21:32:00 2007
+@@ -23,10 +23,10 @@
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+-#include "busybox.h"
+-#include "unarchive.h"
+ #include <fnmatch.h>
+ #include <getopt.h>
++#include "busybox.h"
++#include "unarchive.h"
+
+ #if ENABLE_FEATURE_TAR_CREATE
+
+@@ -37,6 +37,7 @@
+ /* POSIX tar Header Block, from POSIX 1003.1-1990 */
+ #define NAME_SIZE 100
+ #define NAME_SIZE_STR "100"
++typedef struct TarHeader TarHeader;
+ struct TarHeader { /* byte offset */
+ char name[NAME_SIZE]; /* 0-99 */
+ char mode[8]; /* 100-107 */
+@@ -56,7 +57,6 @@
+ char prefix[155]; /* 345-499 */
+ char padding[12]; /* 500-512 (pad to exactly the TAR_BLOCK_SIZE) */
+ };
+-typedef struct TarHeader TarHeader;
+
+ /*
+ ** writeTarFile(), writeFileToTarball(), and writeTarHeader() are
+@@ -73,6 +73,7 @@
+ };
+
+ /* Some info to be carried along when creating a new tarball */
++typedef struct TarBallInfo TarBallInfo;
+ struct TarBallInfo {
+ int tarFd; /* Open-for-write file descriptor
+ for the tarball */
+@@ -85,7 +86,6 @@
+ HardLinkInfo *hlInfoHead; /* Hard Link Tracking Information */
+ HardLinkInfo *hlInfo; /* Hard Link Info for the current file */
+ };
+-typedef struct TarBallInfo TarBallInfo;
+
+ /* A nice enum with all the possible tar file content types */
+ enum TarFileType {
+@@ -348,7 +348,7 @@
+ return TRUE;
+ }
+
+-# if ENABLE_FEATURE_TAR_FROM
++#if ENABLE_FEATURE_TAR_FROM
+ static int exclude_file(const llist_t *excluded_files, const char *file)
+ {
+ while (excluded_files) {
+@@ -371,12 +371,12 @@
+
+ return 0;
+ }
+-# else
++#else
+ #define exclude_file(excluded_files, file) 0
+-# endif
++#endif
+
+ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
+- void *userData, int depth)
++ void *userData, int depth ATTRIBUTE_UNUSED)
+ {
+ struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
+ const char *header_name;
+@@ -509,14 +509,14 @@
+ if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0)
+ bb_perror_msg_and_die("pipe");
+
+- signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
++ signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
+
+-# if __GNUC__
++#if defined(__GNUC__) && __GNUC__
+ /* Avoid vfork clobbering */
+ (void) &include;
+ (void) &errorFlag;
+ (void) &zip_exec;
+-# endif
++#endif
+
+ gzipPid = vfork();
+
+@@ -600,7 +600,7 @@
+ int writeTarFile(const int tar_fd, const int verboseFlag,
+ const unsigned long dereferenceFlag, const llist_t *include,
+ const llist_t *exclude, const int gzip);
+-#endif /* tar_create */
++#endif /* FEATURE_TAR_CREATE */
+
+ #if ENABLE_FEATURE_TAR_FROM
+ static llist_t *append_file_list_to_list(llist_t *list)
+@@ -628,7 +628,7 @@
+ return newlist;
+ }
+ #else
+-#define append_file_list_to_list(x) 0
++#define append_file_list_to_list(x) 0
+ #endif
+
+ #if ENABLE_FEATURE_TAR_COMPRESS
+@@ -653,7 +653,7 @@
+ return EXIT_FAILURE;
+ }
+ #else
+-#define get_header_tar_Z 0
++#define get_header_tar_Z NULL
+ #endif
+
+ #ifdef CHECK_FOR_CHILD_EXITCODE
Added: trunk/buildroot/package/busybox/busybox-1.4.0.config
===================================================================
--- trunk/buildroot/package/busybox/busybox-1.4.0.config (rev 0)
+++ trunk/buildroot/package/busybox/busybox-1.4.0.config 2007-01-30 13:37:21 UTC (rev 17669)
@@ -0,0 +1,675 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.4.0
+# Tue Jan 30 14:22:01 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=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=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_SEQ is not set
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+# CONFIG_WATCH is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+# CONFIG_WHO is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+# CONFIG_FEATURE_AWK_MATH is not set
+# CONFIG_ED is not set
+# CONFIG_PATCH 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=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+# CONFIG_FEATURE_FIND_MMIN is not set
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+# CONFIG_LOSETUP is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+CONFIG_MT=y
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_TFTP is not set
+# CONFIG_FEATURE_TFTP_GET is not set
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_RENICE is not set
+# CONFIG_BB_SYSCTL is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+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
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2007-01-30 13:36 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2007-01-30 13:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-01-30 05:36:10 -0800 (Tue, 30 Jan 2007)
New Revision: 17668
Log:
Busybox 1.4.0 support
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2007-01-30 08:35:32 UTC (rev 17667)
+++ trunk/buildroot/package/busybox/Config.in 2007-01-30 13:36:10 UTC (rev 17668)
@@ -24,6 +24,9 @@
config BR2_BUSYBOX_VERSION_1_2_2_1
bool "BusyBox 1.2.2.1"
+ config BR2_BUSYBOX_VERSION_1_4_0
+ bool "BusyBox 1.4.0"
+
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@@ -51,6 +54,7 @@
default "package/busybox/busybox-1.0.1.config" if BR2_BUSYBOX_VERSION_1_0_1
default "package/busybox/busybox-1.1.3.config" if BR2_BUSYBOX_VERSION_1_1_3
default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
+ default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-01-30 08:35:32 UTC (rev 17667)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-01-30 13:36:10 UTC (rev 17668)
@@ -25,6 +25,13 @@
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
+ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_0)),y)
+BUSYBOX_VER:=1.4.0
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
+BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
+BUSYBOX_SITE:=http://www.busybox.net/downloads
+endif
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
@@ -51,7 +58,7 @@
$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
endif
# Allow busybox patches.
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox\*.patch
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)\*.patch
touch $(BUSYBOX_DIR)/.unpacked
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-12-13 6:58 andersen at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: andersen at uclibc.org @ 2006-12-13 6:58 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-12-12 22:58:14 -0800 (Tue, 12 Dec 2006)
New Revision: 16870
Log:
let people select different versions of busybox to suit their needs
Added:
trunk/buildroot/package/busybox/busybox-1.0.1.config
trunk/buildroot/package/busybox/busybox-1.1.3.config
trunk/buildroot/package/busybox/busybox-1.2.2.1.config
Removed:
trunk/buildroot/package/busybox/busybox.config
Modified:
trunk/buildroot/package/busybox/Config.in
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Sorry, the patch is too large to include (2034 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=16870
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-12-13 6:18 andersen at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: andersen at uclibc.org @ 2006-12-13 6:18 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-12-12 22:18:41 -0800 (Tue, 12 Dec 2006)
New Revision: 16868
Log:
Use a stable version of busybox by default. The daily snapshot of
busybox tends to break often and is thus not a great default.
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2006-12-13 04:26:28 UTC (rev 16867)
+++ trunk/buildroot/package/busybox/Config.in 2006-12-13 06:18:41 UTC (rev 16868)
@@ -12,7 +12,7 @@
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "Use the daily snapshot of BusyBox?"
depends BR2_PACKAGE_BUSYBOX
- default y
+ default n
help
Use the latest BusyBox daily snapshot instead of release.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-12-07 16:31 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-12-07 16:31 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-07 08:31:21 -0800 (Thu, 07 Dec 2006)
New Revision: 16799
Log:
- pass the target (kernel-) arch in.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-12-07 12:25:17 UTC (rev 16798)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-12-07 16:31:21 UTC (rev 16799)
@@ -18,7 +18,7 @@
BUSYBOX_UNZIP=$(BZCAT)
BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
-#"
+#")
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -59,12 +59,14 @@
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
else
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-12-02 19:36 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-12-02 19:36 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-02 11:36:29 -0800 (Sat, 02 Dec 2006)
New Revision: 16769
Log:
- provide default config for busybox for a generic i386 target.
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2006-12-02 19:34:17 UTC (rev 16768)
+++ trunk/buildroot/package/busybox/Config.in 2006-12-02 19:36:29 UTC (rev 16769)
@@ -34,7 +34,8 @@
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
depends BR2_PACKAGE_BUSYBOX
- default "package/busybox/busybox.config"
+ default "package/busybox/busybox.config" if !BR2_i386
+ default "target/device/x86/i386/busybox.config" if BR2_i386
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-12-02 18:36 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-12-02 18:36 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-02 10:36:04 -0800 (Sat, 02 Dec 2006)
New Revision: 16761
Log:
- adjust busybox-source dependencies
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-12-02 18:34:32 UTC (rev 16760)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-12-02 18:36:04 UTC (rev 16761)
@@ -23,7 +23,7 @@
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) dirs host-sed
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) dependencies
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-12-02 17:03 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-12-02 17:03 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-02 09:03:38 -0800 (Sat, 02 Dec 2006)
New Revision: 16753
Log:
- name the default busybox config-file.
Modified:
trunk/buildroot/package/busybox/Config.in
Changeset:
Modified: trunk/buildroot/package/busybox/Config.in
===================================================================
--- trunk/buildroot/package/busybox/Config.in 2006-12-02 06:48:22 UTC (rev 16752)
+++ trunk/buildroot/package/busybox/Config.in 2006-12-02 17:03:38 UTC (rev 16753)
@@ -39,4 +39,5 @@
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.
+ The default is "package/busybox/busybox.config".
Most people will just use the default BusyBox configuration file.
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-11-17 12:57 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-11-17 12:57 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-17 04:57:21 -0800 (Fri, 17 Nov 2006)
New Revision: 16561
Log:
- Adjust the install prefix for current busybox.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-11-17 12:47:50 UTC (rev 16560)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-11-17 12:57:21 UTC (rev 16561)
@@ -40,6 +40,11 @@
if [ -f $(BUSYBOX_DIR)/Rules.mak ]; then \
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak ; \
+ else \
+ $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ; \
+ $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ; \
fi
ifeq ($(BR2_LARGEFILE),y)
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-11-17 11:37 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-11-17 11:37 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-17 03:37:47 -0800 (Fri, 17 Nov 2006)
New Revision: 16553
Log:
- newer busyboxen want CROSS_COMPILE rather than the old CROSS.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-11-17 11:28:00 UTC (rev 16552)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-11-17 11:37:47 UTC (rev 16553)
@@ -47,16 +47,19 @@
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
endif
- yes "" | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
+ yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
touch $(BUSYBOX_DIR)/.configured
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
- $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
else
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-10-25 8:10 jacmet at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: jacmet at uclibc.org @ 2006-10-25 8:10 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2006-10-25 01:10:26 -0700 (Wed, 25 Oct 2006)
New Revision: 16434
Log:
Bump to upstream v1.2.2
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-10-25 00:33:44 UTC (rev 16433)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-10-25 08:10:26 UTC (rev 16434)
@@ -10,7 +10,7 @@
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_VER:=1.2.1
+BUSYBOX_VER:=1.2.2
BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-08-29 16:45 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-08-29 16:45 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-08-29 09:45:47 -0700 (Tue, 29 Aug 2006)
New Revision: 16014
Log:
- repair deps.
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-08-29 16:41:55 UTC (rev 16013)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-08-29 16:45:47 UTC (rev 16014)
@@ -23,9 +23,9 @@
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) $(BUILD_DIR) host-sed
-$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUILD_DIR) host-sed
+$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
# if we have external syslogd, force busybox to use it
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-08-24 19:48 aldot at uclibc.org
0 siblings, 0 replies; 161+ messages in thread
From: aldot at uclibc.org @ 2006-08-24 19:48 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-08-24 12:48:31 -0700 (Thu, 24 Aug 2006)
New Revision: 15983
Log:
- make sure that the prerequisites of 'make busybox-menuconfig' are met
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-08-24 19:47:34 UTC (rev 15982)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-08-24 19:48:31 UTC (rev 15983)
@@ -25,7 +25,7 @@
busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
-$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
+$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUILD_DIR) host-sed
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
# if we have external syslogd, force busybox to use it
^ permalink raw reply [flat|nested] 161+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/busybox
@ 2006-07-31 9:01 jacmet
0 siblings, 0 replies; 161+ messages in thread
From: jacmet @ 2006-07-31 9:01 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2006-07-31 09:01:15 -0700 (Mon, 31 Jul 2006)
New Revision: 15757
Log:
Bump to upstream v1.2.1
Modified:
trunk/buildroot/package/busybox/busybox.mk
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2006-07-30 18:56:29 UTC (rev 15756)
+++ trunk/buildroot/package/busybox/busybox.mk 2006-07-31 16:01:15 UTC (rev 15757)
@@ -10,7 +10,7 @@
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_VER:=1.1.3
+BUSYBOX_VER:=1.2.1
BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
^ permalink raw reply [flat|nested] 161+ messages in thread
end of thread, other threads:[~2009-03-02 15:33 UTC | newest]
Thread overview: 161+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-06 16:20 [Buildroot] svn commit: trunk/buildroot/package/busybox jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-03-02 15:33 jacmet at uclibc.org
2009-02-18 14:16 jacmet at uclibc.org
2009-02-01 19:36 jacmet at uclibc.org
2009-01-29 11:29 jacmet at uclibc.org
2009-01-29 11:27 jacmet at uclibc.org
2009-01-20 19:26 jacmet at uclibc.org
2009-01-19 12:34 jacmet at uclibc.org
2009-01-12 9:36 jacmet at uclibc.org
2008-12-31 9:35 jacmet at uclibc.org
2008-12-30 19:15 jacmet at uclibc.org
2008-12-29 10:09 jacmet at uclibc.org
2008-12-11 9:35 jacmet at uclibc.org
2008-12-10 13:46 jacmet at uclibc.org
2008-12-07 21:22 jacmet at uclibc.org
2008-12-04 13:21 jacmet at uclibc.org
2008-11-29 20:12 jacmet at uclibc.org
2008-11-28 8:19 jacmet at uclibc.org
2008-11-22 6:49 jacmet at uclibc.org
2008-11-21 14:36 jacmet at uclibc.org
2008-11-21 10:59 jacmet at uclibc.org
2008-11-20 6:49 jacmet at uclibc.org
2008-11-17 7:40 jacmet at uclibc.org
2008-11-16 17:22 jacmet at uclibc.org
2008-11-16 23:46 ` Hamish Moffatt
2008-11-17 7:13 ` Peter Korsgaard
2008-11-17 12:38 ` Hamish Moffatt
2008-11-17 12:45 ` Peter Korsgaard
2008-11-15 21:25 jacmet at uclibc.org
2008-11-13 16:32 jacmet at uclibc.org
2008-11-14 16:42 ` hartleys
2008-11-15 21:29 ` Peter Korsgaard
2008-11-16 23:42 ` Hamish Moffatt
2008-11-17 7:13 ` Peter Korsgaard
2008-11-13 16:32 jacmet at uclibc.org
2008-11-07 10:16 jacmet at uclibc.org
2008-11-02 13:06 jacmet at uclibc.org
2008-10-13 12:42 jacmet at uclibc.org
2008-10-06 18:52 jacmet at uclibc.org
2008-09-28 19:28 jacmet at uclibc.org
2008-09-22 11:54 jacmet at uclibc.org
2008-09-09 8:50 jacmet at uclibc.org
2008-09-09 8:50 jacmet at uclibc.org
2008-09-10 1:32 ` Hamish Moffatt
2008-09-10 6:57 ` Peter Korsgaard
2008-08-31 21:45 jacmet at uclibc.org
2008-08-28 4:57 jacmet at uclibc.org
2008-08-26 1:05 hamish at uclibc.org
2008-08-21 5:08 jacmet at uclibc.org
2008-08-06 12:56 jacmet at uclibc.org
2008-08-06 6:37 jacmet at uclibc.org
2008-08-04 19:06 jacmet at uclibc.org
2008-07-23 6:01 jacmet at uclibc.org
2008-07-22 11:19 jacmet at uclibc.org
2008-07-11 22:19 jacmet at uclibc.org
2008-07-06 13:55 jacmet at uclibc.org
2008-07-01 14:04 jacmet at uclibc.org
2008-07-01 13:37 jacmet at uclibc.org
2008-06-28 20:53 jacmet at uclibc.org
2008-06-26 6:51 jacmet at uclibc.org
2008-06-26 6:51 jacmet at uclibc.org
2008-06-26 6:58 ` Peter Korsgaard
2008-06-27 9:05 ` Daniel Laird
2008-06-27 9:20 ` Peter Korsgaard
2008-06-27 12:00 ` Bernhard Fischer
2008-06-27 12:46 ` sjhill at realitydiluted.com
2008-06-27 12:53 ` Bernhard Fischer
2008-06-27 14:07 ` Peter Korsgaard
2008-06-27 12:49 ` Daniel Laird
2008-06-27 13:19 ` Peter Korsgaard
2008-06-26 6:51 jacmet at uclibc.org
2008-06-20 18:38 jacmet at uclibc.org
2008-06-13 20:49 jacmet at uclibc.org
2008-06-07 7:46 jacmet at uclibc.org
2008-05-31 12:58 jacmet at uclibc.org
2008-05-31 7:28 jacmet at uclibc.org
2008-05-31 7:39 ` Cristian Ionescu-Idbohrn
2008-05-31 12:59 ` Peter Korsgaard
2008-05-09 10:01 jacmet at uclibc.org
2008-05-05 17:17 jacmet at uclibc.org
2008-04-29 6:53 jacmet at uclibc.org
2008-04-22 9:37 jacmet at uclibc.org
2008-04-04 7:17 jacmet at uclibc.org
2008-04-01 10:00 jacmet at uclibc.org
2008-03-30 14:37 jacmet at uclibc.org
2008-03-26 21:53 jacmet at uclibc.org
2008-03-26 21:49 jacmet at uclibc.org
2008-03-25 14:38 jacmet at uclibc.org
2008-03-21 17:56 ninevoltz at uclibc.org
2008-03-21 10:14 jacmet at uclibc.org
2008-03-17 19:44 jacmet at uclibc.org
2008-03-11 8:17 jacmet at uclibc.org
2008-02-28 14:38 jacmet at uclibc.org
2008-02-14 15:49 jacmet at uclibc.org
2008-02-14 14:45 jacmet at uclibc.org
2008-02-02 21:49 jacmet at uclibc.org
2008-01-08 12:51 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:33 jacmet at uclibc.org
2008-01-03 13:31 jacmet at uclibc.org
2007-09-30 12:50 aldot at uclibc.org
2007-09-30 12:48 aldot at uclibc.org
2007-09-22 17:29 aldot at uclibc.org
2007-09-22 10:25 aldot at uclibc.org
2007-09-20 16:58 aldot at uclibc.org
2007-09-15 18:14 aldot at uclibc.org
2007-09-10 7:38 jacmet at uclibc.org
2007-09-02 22:09 aldot at uclibc.org
2007-09-02 14:56 aldot at uclibc.org
2007-09-01 17:33 aldot at uclibc.org
2007-08-24 14:23 aldot at uclibc.org
2007-07-08 12:10 aldot at uclibc.org
2007-07-08 12:04 aldot at uclibc.org
2007-07-08 11:56 aldot at uclibc.org
2007-07-02 15:20 aldot at uclibc.org
2007-07-02 9:54 aldot at uclibc.org
2007-06-27 21:07 aldot at uclibc.org
2007-06-25 11:07 aldot at uclibc.org
2007-06-14 13:09 jacmet at uclibc.org
2007-06-02 13:13 aldot at uclibc.org
2007-05-15 9:34 aldot at uclibc.org
2007-05-07 4:07 sjhill at uclibc.org
2007-05-07 4:04 sjhill at uclibc.org
2007-04-25 7:11 jacmet at uclibc.org
2007-04-05 7:04 jacmet at uclibc.org
2007-03-24 12:09 aldot at uclibc.org
2007-03-23 13:26 aldot at uclibc.org
2007-03-23 13:24 aldot at uclibc.org
2007-03-20 9:51 aldot at uclibc.org
2007-03-20 8:53 aldot at uclibc.org
2007-03-15 8:36 jacmet at uclibc.org
2007-03-14 13:02 aldot at uclibc.org
2007-02-27 9:04 jacmet at uclibc.org
2007-02-23 11:55 jacmet at uclibc.org
2007-02-16 15:19 aldot at uclibc.org
2007-02-12 14:43 jacmet at uclibc.org
2007-02-06 16:34 jacmet at uclibc.org
2007-02-06 16:31 jacmet at uclibc.org
2007-02-06 16:23 jacmet at uclibc.org
2007-02-06 16:18 jacmet at uclibc.org
2007-02-02 16:15 aldot at uclibc.org
2007-02-01 12:30 aldot at uclibc.org
2007-01-31 14:21 aldot at uclibc.org
2007-01-30 16:47 jacmet at uclibc.org
2007-01-30 13:37 jacmet at uclibc.org
2007-01-30 13:36 jacmet at uclibc.org
2006-12-13 6:58 andersen at uclibc.org
2006-12-13 6:18 andersen at uclibc.org
2006-12-07 16:31 aldot at uclibc.org
2006-12-02 19:36 aldot at uclibc.org
2006-12-02 18:36 aldot at uclibc.org
2006-12-02 17:03 aldot at uclibc.org
2006-11-17 12:57 aldot at uclibc.org
2006-11-17 11:37 aldot at uclibc.org
2006-10-25 8:10 jacmet at uclibc.org
2006-08-29 16:45 aldot at uclibc.org
2006-08-24 19:48 aldot at uclibc.org
2006-07-31 9:01 jacmet
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.