SOURCES: busybox.config, busybox-LFS.patch, busybox-force-dietlibc...

areq areq at pld-linux.org
Sat Sep 3 21:09:55 CEST 2005


Author: areq                         Date: Sat Sep  3 19:09:55 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 1.01

---- Files affected:
SOURCES:
   busybox.config (1.13 -> 1.14) , busybox-LFS.patch (1.7 -> 1.8) , busybox-force-dietlibc.patch (1.1 -> 1.2) , busybox-logconsole.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/busybox.config
diff -u SOURCES/busybox.config:1.13 SOURCES/busybox.config:1.14
--- SOURCES/busybox.config:1.13	Sun Jun  5 16:50:25 2005
+++ SOURCES/busybox.config	Sat Sep  3 21:09:50 2005
@@ -275,6 +275,7 @@
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_INITRD=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INIT_SWAPON is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_HALT=y
 CONFIG_POWEROFF=y

================================================================
Index: SOURCES/busybox-LFS.patch
diff -u SOURCES/busybox-LFS.patch:1.7 SOURCES/busybox-LFS.patch:1.8
--- SOURCES/busybox-LFS.patch:1.7	Tue Aug  2 12:24:05 2005
+++ SOURCES/busybox-LFS.patch	Sat Sep  3 21:09:50 2005
@@ -2,9 +2,9 @@
 --- busybox-1.00/include/libbb.h.orig	2005-02-15 16:48:07.491412688 +0100
 +++ busybox-1.00/include/libbb.h	2005-02-15 16:40:15.000000000 +0100
 @@ -138,8 +138,8 @@
+ extern char *find_real_root_device_name(void);
  extern char *bb_get_line_from_file(FILE *file);
  extern char *bb_get_chomped_line_from_file(FILE *file);
- extern char *bb_get_chunk_from_file(FILE *file);
 -extern int bb_copyfd_size(int fd1, int fd2, const off_t size);
 -extern int bb_copyfd_eof(int fd1, int fd2);
 +extern off_t bb_copyfd_size(int fd1, int fd2, const off_t size);

================================================================
Index: SOURCES/busybox-force-dietlibc.patch
diff -u SOURCES/busybox-force-dietlibc.patch:1.1 SOURCES/busybox-force-dietlibc.patch:1.2
--- SOURCES/busybox-force-dietlibc.patch:1.1	Thu Aug  7 23:19:44 2003
+++ SOURCES/busybox-force-dietlibc.patch	Sat Sep  3 21:09:50 2005
@@ -1,15 +1,15 @@
 diff -urN busybox-1.00-pre2.org/libbb/printf.c busybox-1.00-pre2/libbb/printf.c
 --- busybox-1.00-pre2.org/libbb/printf.c	2003-08-02 23:46:49.000000000 +0200
 +++ busybox-1.00-pre2/libbb/printf.c	2003-08-05 00:19:57.000000000 +0200
-@@ -116,7 +116,10 @@
+@@ -120,7 +120,10 @@
   * you can extract the information you need from dietstdio.h.  See the
   * other library implementations for examples.
   */
--#error dietlibc is currently not supported.  Please see the commented source.
+-# error dietlibc is currently not supported.  Please see the commented source.
 +#warning dietlibc is currently not supported.  Please see the commented source.
 +#warning FORCED BUILD BY PLD PATCH.
 +
 +#define SET_FERROR_UNLOCKED(S) //    ((S)->flags |= 1)
  
  #else /* some other lib */
- /* Please see the comments for the above supported libaries for examples
+ /* Please see the comments for the above supported libraries for examples

================================================================
Index: SOURCES/busybox-logconsole.patch
diff -u SOURCES/busybox-logconsole.patch:1.4 SOURCES/busybox-logconsole.patch:1.5
--- SOURCES/busybox-logconsole.patch:1.4	Sat Aug  2 23:43:53 2003
+++ SOURCES/busybox-logconsole.patch	Sat Sep  3 21:09:50 2005
@@ -22,12 +22,12 @@
 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 @@
+@@ -155,7 +155,7 @@
  static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
  
  #ifndef CONFIG_SYSLOGD
--static char *log = VC_5;
-+static char *log = VC_12;
+-static char *log_console = VC_5;
++static char *log_console = VC_12;
  #endif
  static sig_atomic_t got_cont = 0;
  static const int LOG = 0x1;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/busybox.config?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SOURCES/busybox-LFS.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/busybox-force-dietlibc.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/busybox-logconsole.patch?r1=1.4&r2=1.5&f=u




More information about the pld-cvs-commit mailing list