dynamic configuration needs libtirpc-devel

[packages/busybox.git] / busybox-logconsole.patch

diff --git a/busybox-logconsole.patch b/busybox-logconsole.patch
index 5e330abf6768cf00600c3d3585bd2605b3f3bc5a..cb18d0ae2d71c8e091e3027660153ce51eb68125 100644 (file)
--- a/busybox-logconsole.patch
+++ b/busybox-logconsole.patch
@@ -1,33 +1,21 @@
-diff -urN busybox-1.00-pre2/include/libbb.h busybox-1.00-pre2.org/include/libbb.h
---- busybox-1.00-pre2/include/libbb.h  2003-08-02 23:40:57.000000000 +0200
-+++ busybox-1.00-pre2.org/include/libbb.h      2003-08-02 23:45:09.000000000 +0200
-@@ -346,7 +346,7 @@
- # define VC_2 "/dev/vc/2"
- # define VC_3 "/dev/vc/3"
- # define VC_4 "/dev/vc/4"
--# define VC_5 "/dev/vc/5"
-+# define VC_12 "/dev/vc/12"
- #if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
- /* Yes, this sucks, but both SH (including sh64) and H8 have a SCI(F) for their
-    respective serial ports .. as such, we can't use the common device paths for
-@@ -367,7 +367,7 @@
- # define VC_2 "/dev/tty2"
+--- busybox-1.29.3/include/libbb.h~    2018-12-16 11:20:56.000000000 +0100
++++ busybox-1.29.3/include/libbb.h     2018-12-16 11:22:32.895687694 +0100
+@@ -2095,6 +2095,7 @@ extern const char bb_default_login_shell
  # define VC_3 "/dev/tty3"
  # define VC_4 "/dev/tty4"
--# define VC_5 "/dev/tty5"
+ # define VC_5 "/dev/tty5"
 +# define VC_12 "/dev/tty12"
- #if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
- #  define SC_0 "/dev/ttySC0"
- #  define SC_1 "/dev/ttySC1"
-diff -urN busybox-1.00-pre2/init/init.c busybox-1.00-pre2.org/init/init.c
---- busybox-1.00-pre2/init/init.c      2003-08-02 23:40:57.000000000 +0200
-+++ busybox-1.00-pre2.org/init/init.c  2003-08-02 23:45:30.000000000 +0200
-@@ -157,7 +157,7 @@
- static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
+ # define VC_FORMAT "/dev/tty%d"
+ #elif ENABLE_FEATURE_DEVFS
+ /*Linux, obsolete devfs names */
+--- busybox-1.29.3/init/init.c~        2018-07-02 13:23:06.000000000 +0200
++++ busybox-1.29.3/init/init.c 2018-12-16 11:21:50.307764617 +0100
+@@ -221,7 +221,7 @@ struct globals {
+ #define G (*(struct globals*)bb_common_bufsiz1)
+ #define INIT_G() do { \
+       setup_common_bufsiz(); \
+-      IF_NOT_FEATURE_INIT_SYSLOG(G.log_console = VC_5;) \
++      IF_NOT_FEATURE_INIT_SYSLOG(G.log_console = VC_12;) \
+ } while (0)
  
- #ifndef CONFIG_SYSLOGD
--static char *log = VC_5;
-+static char *log = VC_12;
- #endif
- static sig_atomic_t got_cont = 0;
- static const int LOG = 0x1;
+ enum {