diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-09-16 11:29:17 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-09-17 07:59:10 +0200 |
| commit | fa7e6507101f95950c66ef776ed12c30d135b8ca (patch) | |
| tree | ba7ba1699291a0e4d0aa18e1bfb45b79eb34411c /package/busybox/busybox-1.19.2 | |
| parent | 27b58e3972e287374259532e09a0ef4761b4270f (diff) | |
| download | buildroot-novena-fa7e6507101f95950c66ef776ed12c30d135b8ca.tar.gz buildroot-novena-fa7e6507101f95950c66ef776ed12c30d135b8ca.zip | |
busybox: add new 1.19.2 fixes and drop stale config
Drop stale config file for busybox 1.13.x
Add build system and syslogd fixes for 1.19.2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox/busybox-1.19.2')
| -rw-r--r-- | package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch | 19 | ||||
| -rw-r--r-- | package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch | 20 |
2 files changed, 39 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch new file mode 100644 index 000000000..8e0c4c33e --- /dev/null +++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch @@ -0,0 +1,19 @@ +--- busybox-1.19.2/applets/applet_tables.c ++++ busybox-1.19.2-buildsys/applets/applet_tables.c +@@ -80,8 +80,15 @@ int main(int argc, char **argv) + + printf("#define NUM_APPLETS %u\n", NUM_APPLETS); + if (NUM_APPLETS == 1) { ++ char *dash_to_underscore, *p; + printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name); +- printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name); ++ /* Example: "ether-wake" -> "ether_wake" */ ++ p = dash_to_underscore = strdup(applets[0].name); ++ p--; ++ while (*++p) ++ if (*p == '-') ++ *p = '_'; ++ printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore); + } + printf("\n"); + diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch new file mode 100644 index 000000000..d54f5d430 --- /dev/null +++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch @@ -0,0 +1,20 @@ +--- busybox-1.19.2/sysklogd/syslogd.c ++++ busybox-1.19.2-syslogd/sysklogd/syslogd.c +@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char + parser_t *parser; + + parser = config_open2(file ? file : "/etc/syslog.conf", +- file ? xfopen_for_read : fopen_or_warn_stdin); ++ file ? xfopen_for_read : fopen_for_read); + if (!parser) + /* didn't find default /etc/syslog.conf */ + /* proceed as if we built busybox without config support */ +@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c + if (LOG_PRI(pri) < G.logLevel) { + #if ENABLE_FEATURE_IPC_SYSLOG + if ((option_mask32 & OPT_circularlog) && G.shbuf) { +- log_to_shmem(msg); ++ log_to_shmem(G.printbuf); + return; + } + #endif |