diff --git a/package/alessandro/busybox/busybox.desc b/package/alessandro/busybox/busybox.desc index 0ef4b7e93..7d3901a0d 100644 --- a/package/alessandro/busybox/busybox.desc +++ b/package/alessandro/busybox/busybox.desc @@ -35,7 +35,7 @@ [L] GPL [S] Stable -[V] 1.00 +[V] 1.01 [P] X -?---5---9 163.100 -[D] 605550868 busybox-1.00.tar.bz2 http://busybox.net/downloads/ +[D] 1248303990 busybox-1.01.tar.bz2 http://busybox.net/downloads/ diff --git a/package/alessandro/busybox/lxconfig.patch b/package/alessandro/busybox/lxconfig.patch new file mode 100644 index 000000000..71d3d67c7 --- /dev/null +++ b/package/alessandro/busybox/lxconfig.patch @@ -0,0 +1,90 @@ +--- ./miscutils/time.c.orig 2005-11-04 13:26:21.000000000 +0100 ++++ ./miscutils/time.c 2005-11-04 13:26:28.000000000 +0100 +@@ -21,6 +21,7 @@ + Heavily modified for busybox by Erik Andersen + */ + ++#include "busybox.h" + #include + #include + #include +@@ -36,7 +37,6 @@ + + #define TV_MSEC tv_usec / 1000 + #include +-#include "busybox.h" + + /* Information on the resources used by a child process. */ + typedef struct +--- ./shell/ash.c.orig 2005-11-04 13:27:12.000000000 +0100 ++++ ./shell/ash.c 2005-11-04 13:27:21.000000000 +0100 +@@ -65,6 +65,7 @@ + #define _GNU_SOURCE + #endif + ++#include "busybox.h" + #include + #include + #include +@@ -96,7 +97,6 @@ + #include + + +-#include "busybox.h" + #include "pwd_.h" + + #ifdef CONFIG_ASH_JOB_CONTROL +--- ./sysklogd/syslogd.c.orig 2005-11-04 13:27:36.000000000 +0100 ++++ ./sysklogd/syslogd.c 2005-11-04 13:27:43.000000000 +0100 +@@ -26,6 +26,8 @@ + * + */ + ++#include "busybox.h" ++ + #include + #include + #include +@@ -45,8 +47,6 @@ + #include + #include + +-#include "busybox.h" +- + /* SYSLOG_NAMES defined to pull some extra junk from syslog.h */ + #define SYSLOG_NAMES + #include +--- ./networking/ping.c.orig 2005-11-04 13:26:37.000000000 +0100 ++++ ./networking/ping.c 2005-11-04 13:26:45.000000000 +0100 +@@ -31,6 +31,7 @@ + * Original copyright notice is retained at the end of this file. + */ + ++#include "busybox.h" + #include + #include + #include +@@ -49,7 +50,6 @@ + #include + #include + #include +-#include "busybox.h" + + + static const int DEFDATALEN = 56; +--- ./include/busybox.h.orig 2005-11-04 13:21:57.000000000 +0100 ++++ ./include/busybox.h 2005-11-04 13:30:10.000000000 +0100 +@@ -24,6 +24,13 @@ + #ifndef _BB_INTERNAL_H_ + #define _BB_INTERNAL_H_ 1 + ++// never include the linux kernel config setting. They use the same ++// namespace as the busybox config flags. -- Clifford Wolf ++#ifdef _LINUX_CONFIG_H ++# error Linux kernel config included before busybox.h ++#endif ++#define _LINUX_CONFIG_H ++ + #include "config.h" + + #include