busybox v1.19.2 update

and clean the libreboot hack and busybox libs in .mk

Change-Id: If24a26331199ff592eabb67b4a2ea684a4376ac8

.config-full

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.19.1-cm71
-# Thu Sep  1 04:24:42 2011
+# Busybox version: 1.19.2-cm71
+# Thu Oct  6 22:08:45 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -100,8 +100,8 @@ CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
 CONFIG_FEATURE_EDITING_HISTORY=256
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -275,7 +275,7 @@ CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
 CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TRUE=y
-CONFIG_TTY=y
+# CONFIG_TTY is not set
 CONFIG_UNAME=y
 CONFIG_UNEXPAND=y
 CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y

.config-minimal

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.19.1-cm71
-# Sun Aug 28 22:40:40 2011
+# Busybox version: 1.19.2-cm71
+# Thu Oct  6 22:09:10 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -275,7 +275,7 @@ CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
 CONFIG_TRUE=y
-CONFIG_TTY=y
+# CONFIG_TTY is not set
 CONFIG_UNAME=y
 CONFIG_UNEXPAND=y
 CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
@@ -705,7 +705,7 @@ CONFIG_STRINGS=y
 # CONFIG_FEATURE_TASKSET_FANCY is not set
 CONFIG_TIME=y
 # CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
+CONFIG_TTYSIZE=y
 # CONFIG_VOLNAME is not set
 # CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set

Android.mk

@@ -26,7 +26,6 @@ $(BUSYBOX_CONFIG):
 	cp $(LOCAL_PATH)/include/*.h $(LOCAL_PATH)/include-$@/
 	@rm $(LOCAL_PATH)/include/usage_compressed.h
 	@rm -f $(LOCAL_PATH)/.config-old
-	@cp $(ANDROID_BUILD_TOP)/system/core/toolbox/reboot.c $(LOCAL_PATH)/android/reboot.c
 
 busybox_prepare: $(BUSYBOX_CONFIG)
 LOCAL_MODULE := busybox_prepare
@@ -99,9 +98,9 @@ LOCAL_CFLAGS += \
   -Dgetmntent_r=busybox_getmntent_r \
   -Dgenerate_uuid=busybox_generate_uuid
 LOCAL_MODULE := libbusybox
-$(LOCAL_MODULE): busybox_prepare
 LOCAL_MODULE_TAGS := eng
-LOCAL_STATIC_LIBRARIES += libclearsilverregex libcutils libc libm
+LOCAL_STATIC_LIBRARIES := libclearsilverregex libcutils libc libm
+$(LOCAL_MODULE): busybox_prepare
 include $(BUILD_STATIC_LIBRARY)
 
 
@@ -114,12 +113,10 @@ LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES)
 LOCAL_C_INCLUDES := $(BUSYBOX_C_INCLUDES)
 LOCAL_CFLAGS := $(BUSYBOX_CFLAGS)
 LOCAL_MODULE := busybox
-$(LOCAL_MODULE): busybox_prepare
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_STATIC_LIBRARIES += libclearsilverregex
-LOCAL_STATIC_LIBRARIES += libreboot
-LOCAL_CFLAGS += -DCYANOGEN_LIBREBOOT
+LOCAL_STATIC_LIBRARIES := libclearsilverregex
+$(LOCAL_MODULE): busybox_prepare
 include $(BUILD_EXECUTABLE)
 
 BUSYBOX_LINKS := $(shell cat $(LOCAL_PATH)/busybox-$(BUSYBOX_CONFIG).links)
@@ -158,11 +155,12 @@ LOCAL_CFLAGS += \
   -Dgetmntent_r=busybox_getmntent_r \
   -Dgenerate_uuid=busybox_generate_uuid
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_MODULE := bootmenu_busybox
+LOCAL_MODULE := static_busybox
 LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_LIBRARIES += libclearsilverregex libcutils libc libm
+LOCAL_STATIC_LIBRARIES := libclearsilverregex libcutils libc libm
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
 LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
 LOCAL_MODULE_STEM := busybox
+$(LOCAL_MODULE): busybox_prepare
 include $(BUILD_EXECUTABLE)

CleanSpec.mk

@@ -42,8 +42,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/busybox_prepar
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/busybox_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libbusybox_intermediates)
-
-# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/UTILITY_EXECUTABLES/bootmenu_busybox_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/UTILITY_EXECUTABLES/static_busybox_intermediates)
 
 $(call add-clean-step, rm $(PRODUCT_OUT)/symbols/system/xbin/busybox)
 

Makefile

@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 19
-SUBLEVEL = 1
+SUBLEVEL = 2
 EXTRAVERSION = -cm71
 NAME = bionic
 

busybox-full.links

@@ -178,7 +178,6 @@
 /bin/tr
 /bin/traceroute
 /bin/true
-/bin/tty
 /bin/ttysize
 /sbin/tune2fs
 /bin/umount

busybox-full.sources

@@ -4,7 +4,7 @@ archival/libarchive/data_align.c archival/libarchive/data_extract_all.c archival
 
 console-tools/clear.c console-tools/reset.c console-tools/resize.c console-tools/setconsole.c
 
-coreutils/basename.c coreutils/cal.c coreutils/cat.c coreutils/catv.c coreutils/chgrp.c coreutils/chmod.c coreutils/chown.c coreutils/chroot.c coreutils/cp.c coreutils/cut.c coreutils/date.c coreutils/dd.c coreutils/df.c coreutils/dirname.c coreutils/dos2unix.c coreutils/du.c coreutils/echo.c coreutils/env.c coreutils/expr.c coreutils/false.c coreutils/fold.c coreutils/head.c coreutils/id.c coreutils/install.c coreutils/ln.c coreutils/ls.c coreutils/md5_sha1_sum.c coreutils/mkdir.c coreutils/mkfifo.c coreutils/mknod.c coreutils/mv.c coreutils/nice.c coreutils/nohup.c coreutils/od.c coreutils/printenv.c coreutils/printf.c coreutils/pwd.c coreutils/readlink.c coreutils/realpath.c coreutils/rm.c coreutils/rmdir.c coreutils/seq.c coreutils/sleep.c coreutils/sort.c coreutils/split.c coreutils/stat.c coreutils/stty.c coreutils/sync.c coreutils/tac.c coreutils/tail.c coreutils/tee.c coreutils/test.c coreutils/test_ptr_hack.c coreutils/touch.c coreutils/tr.c coreutils/true.c coreutils/tty.c coreutils/uname.c coreutils/uniq.c coreutils/usleep.c coreutils/uudecode.c coreutils/uuencode.c coreutils/wc.c coreutils/whoami.c coreutils/yes.c
+coreutils/basename.c coreutils/cal.c coreutils/cat.c coreutils/catv.c coreutils/chgrp.c coreutils/chmod.c coreutils/chown.c coreutils/chroot.c coreutils/cp.c coreutils/cut.c coreutils/date.c coreutils/dd.c coreutils/df.c coreutils/dirname.c coreutils/dos2unix.c coreutils/du.c coreutils/echo.c coreutils/env.c coreutils/expr.c coreutils/false.c coreutils/fold.c coreutils/head.c coreutils/id.c coreutils/install.c coreutils/ln.c coreutils/ls.c coreutils/md5_sha1_sum.c coreutils/mkdir.c coreutils/mkfifo.c coreutils/mknod.c coreutils/mv.c coreutils/nice.c coreutils/nohup.c coreutils/od.c coreutils/printenv.c coreutils/printf.c coreutils/pwd.c coreutils/readlink.c coreutils/realpath.c coreutils/rm.c coreutils/rmdir.c coreutils/seq.c coreutils/sleep.c coreutils/sort.c coreutils/split.c coreutils/stat.c coreutils/stty.c coreutils/sync.c coreutils/tac.c coreutils/tail.c coreutils/tee.c coreutils/test.c coreutils/test_ptr_hack.c coreutils/touch.c coreutils/tr.c coreutils/true.c coreutils/uname.c coreutils/uniq.c coreutils/usleep.c coreutils/uudecode.c coreutils/uuencode.c coreutils/wc.c coreutils/whoami.c coreutils/yes.c
 coreutils/libcoreutils/cp_mv_stat.c coreutils/libcoreutils/getopt_mk_fifo_nod.c
 coreutils/comm.c coreutils/expand.c coreutils/sum.c coreutils/fsync.c
 

busybox-minimal.links

@@ -139,7 +139,7 @@
 /bin/touch
 /bin/tr
 /bin/true
-/bin/tty
+/bin/ttysize
 /bin/umount
 /bin/uname
 /bin/unexpand

busybox-minimal.sources

@@ -4,7 +4,7 @@ archival/libarchive/data_align.c archival/libarchive/data_extract_all.c archival
 
 console-tools/clear.c console-tools/reset.c console-tools/resize.c console-tools/setconsole.c
 
-coreutils/basename.c coreutils/cal.c coreutils/cat.c coreutils/catv.c coreutils/chgrp.c coreutils/chmod.c coreutils/chown.c coreutils/chroot.c coreutils/cp.c coreutils/cut.c coreutils/date.c coreutils/dd.c coreutils/df.c coreutils/dirname.c coreutils/dos2unix.c coreutils/du.c coreutils/echo.c coreutils/expand.c coreutils/env.c coreutils/expr.c coreutils/false.c coreutils/fold.c coreutils/head.c coreutils/id.c coreutils/install.c coreutils/ln.c coreutils/ls.c coreutils/md5_sha1_sum.c coreutils/mkdir.c coreutils/mkfifo.c coreutils/mknod.c coreutils/mv.c coreutils/nice.c coreutils/nohup.c coreutils/od.c coreutils/printenv.c coreutils/printf.c coreutils/pwd.c coreutils/readlink.c coreutils/realpath.c coreutils/rm.c coreutils/rmdir.c coreutils/seq.c coreutils/sleep.c coreutils/sort.c coreutils/split.c coreutils/stat.c coreutils/stty.c coreutils/sync.c coreutils/tac.c coreutils/tail.c coreutils/tee.c coreutils/test.c coreutils/test_ptr_hack.c coreutils/touch.c coreutils/tr.c coreutils/true.c coreutils/tty.c coreutils/uname.c coreutils/uniq.c coreutils/usleep.c coreutils/uudecode.c coreutils/uuencode.c coreutils/wc.c coreutils/whoami.c coreutils/yes.c
+coreutils/basename.c coreutils/cal.c coreutils/cat.c coreutils/catv.c coreutils/chgrp.c coreutils/chmod.c coreutils/chown.c coreutils/chroot.c coreutils/cp.c coreutils/cut.c coreutils/date.c coreutils/dd.c coreutils/df.c coreutils/dirname.c coreutils/dos2unix.c coreutils/du.c coreutils/echo.c coreutils/expand.c coreutils/env.c coreutils/expr.c coreutils/false.c coreutils/fold.c coreutils/head.c coreutils/id.c coreutils/install.c coreutils/ln.c coreutils/ls.c coreutils/md5_sha1_sum.c coreutils/mkdir.c coreutils/mkfifo.c coreutils/mknod.c coreutils/mv.c coreutils/nice.c coreutils/nohup.c coreutils/od.c coreutils/printenv.c coreutils/printf.c coreutils/pwd.c coreutils/readlink.c coreutils/realpath.c coreutils/rm.c coreutils/rmdir.c coreutils/seq.c coreutils/sleep.c coreutils/sort.c coreutils/split.c coreutils/stat.c coreutils/stty.c coreutils/sync.c coreutils/tac.c coreutils/tail.c coreutils/tee.c coreutils/test.c coreutils/test_ptr_hack.c coreutils/touch.c coreutils/tr.c coreutils/true.c coreutils/uname.c coreutils/uniq.c coreutils/usleep.c coreutils/uudecode.c coreutils/uuencode.c coreutils/wc.c coreutils/whoami.c coreutils/yes.c
 coreutils/libcoreutils/cp_mv_stat.c coreutils/libcoreutils/getopt_mk_fifo_nod.c
 debianutils/mktemp.c debianutils/run_parts.c debianutils/which.c
 
@@ -18,7 +18,7 @@ libpwdgrp/uidgid_get.c
 
 
 miscutils/bbconfig.c miscutils/dc.c miscutils/devmem.c miscutils/less.c miscutils/makedevs.c miscutils/mountpoint.c miscutils/nandwrite.c
-miscutils/setserial.c miscutils/setsid.c miscutils/strings.c miscutils/time.c
+miscutils/setserial.c miscutils/setsid.c miscutils/strings.c miscutils/time.c miscutils/ttysize.c
 modutils/modinfo.c modutils/modprobe-small.c modutils/modutils.c
 
 

e2fsprogs/tune2fs.c

@@ -44,22 +44,22 @@ do { \
 //usage:       "Adjust filesystem options on ext[23] filesystems"
 
 enum {
-	OPT_C = 1 << 0, // current mount count
-	OPT_L = 1 << 1, // label
-	OPT_c = 1 << 2, // max mount count
-	OPT_i = 1 << 3, // check interval
+	OPT_L = 1 << 0, // label
+	OPT_c = 1 << 1, // max mount count
+	OPT_i = 1 << 2, // check interval
+	OPT_C = 1 << 3, // current mount count
 };
 
 int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tune2fs_main(int argc UNUSED_PARAM, char **argv)
 {
 	unsigned opts;
-	const char *label, *str_c, *str_i;
+	const char *label, *str_c, *str_i, *str_C;
 	struct ext2_super_block *sb;
-	int fd, n;
+	int fd;
 
 	opt_complementary = "=1";
-	opts = getopt32(argv, "C:L:c:i:", &label, &str_c, &str_i);
+	opts = getopt32(argv, "L:c:i:C:", &label, &str_c, &str_i, &str_C);
 	if (!opts)
 		bb_show_usage();
 	argv += optind; // argv[0] -- device
@@ -74,9 +74,8 @@ int tune2fs_main(int argc UNUSED_PARAM, char **argv)
 	//STORE_LE(sb->s_wtime, time(NULL)); - why bother?
 
 	if (opts & OPT_C) {
-		n = xatoi_range(str_c, 1, 0xfffe);
-		if (n == 0)
-			n = 1;
+		int n = xatoi_range(str_C, 1, 0xfffe);
+		if (n == 0) n = 1;
 		STORE_LE(sb->s_mnt_count, (unsigned)n);
 	}
 
@@ -85,15 +84,15 @@ int tune2fs_main(int argc UNUSED_PARAM, char **argv)
 		safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name));
 
 	if (opts & OPT_c) {
-		n = xatoi_range(str_c, -1, 0xfffe);
+		int n = xatoi_range(str_c, -1, 0xfffe);
 		if (n == 0)
 			n = -1;
 		STORE_LE(sb->s_max_mnt_count, (unsigned)n);
 	}
 
 	if (opts & OPT_i) {
-		unsigned u = xatou_range(str_i, 0, (unsigned)0xffffffff / (24*60*60)) * 24*60*60;
-		STORE_LE(sb->s_checkinterval, u);
+		unsigned n = xatou_range(str_i, 0, (unsigned)0xffffffff / (24*60*60)) * 24*60*60;
+		STORE_LE(sb->s_checkinterval, n);
 	}
 
 	// write superblock

editors/patch.c

@@ -70,8 +70,7 @@ struct double_list {
 
 // Free all the elements of a linked list
 // Call freeit() on each element before freeing it.
-static
-void dlist_free(struct double_list *list, void (*freeit)(void *data))
+static void dlist_free(struct double_list *list, void (*freeit)(void *data))
 {
 	while (list) {
 		void *pop = list;
@@ -83,8 +82,7 @@ void dlist_free(struct double_list *list, void (*freeit)(void *data))
 }
 
 // Add an entry before "list" element in (circular) doubly linked list
-static
-struct double_list *dlist_add(struct double_list **list, char *data)
+static struct double_list *dlist_add(struct double_list **list, char *data)
 {
 	struct double_list *llist;
 	struct double_list *line = xmalloc(sizeof(*line));
@@ -232,7 +230,7 @@ static int apply_one_hunk(void)
 		else matcheof = 0;
 		if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
 	}
-	matcheof = matcheof < TT.context;
+	matcheof = !matcheof || matcheof < TT.context;
 
 	if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
 

include-full/NUM_APPLETS.h

@@ -1 +1 @@
-#define NUM_APPLETS 211
+#define NUM_APPLETS 210

include-full/applet_tables.h

@@ -1,6 +1,6 @@
 /* This is a generated file, don't edit */
 
-#define NUM_APPLETS 211
+#define NUM_APPLETS 210
 
 const char applet_names[] ALIGN1 = ""
 "[" "\0"
@@ -186,7 +186,6 @@ const char applet_names[] ALIGN1 = ""
 "tr" "\0"
 "traceroute" "\0"
 "true" "\0"
-"tty" "\0"
 "ttysize" "\0"
 "tune2fs" "\0"
 "umount" "\0"
@@ -401,7 +400,6 @@ touch_main,
 tr_main,
 traceroute_main,
 true_main,
-tty_main,
 ttysize_main,
 tune2fs_main,
 umount_main,
@@ -617,33 +615,32 @@ const uint16_t applet_nameofs[] ALIGN2 = {
 0x4465,
 0x0470,
 0x0475,
-0x0479,
-0x0481,
-0x0489,
-0x0490,
-0x0496,
-0x04a1,
-0x04aa,
-0x04af,
-0x04b8,
-0x04bf,
-0x04c6,
-0x04cb,
-0x04d1,
-0x04d8,
-0x04df,
-0x04e8,
-0x04f1,
-0x04f4,
-0x04fa,
-0x04fd,
-0x0502,
-0x0508,
-0x050f,
-0x0515,
-0x0518,
+0x047d,
+0x0485,
+0x048c,
+0x0492,
+0x049d,
+0x04a6,
+0x04ab,
+0x04b4,
+0x04bb,
+0x04c2,
+0x04c7,
+0x04cd,
+0x04d4,
+0x04db,
+0x04e4,
+0x04ed,
+0x04f0,
+0x04f6,
+0x04f9,
+0x04fe,
+0x0504,
+0x050b,
+0x0511,
+0x0514,
+0x051a,
 0x051e,
-0x0522,
 };
 
 

include-full/autoconf.h

@@ -1,8 +1,8 @@
 /*
  * Automatically generated C config: don't edit
- * Busybox version: 1.19.1-cm71
+ * Busybox version: 1.19.2-cm71
  */
-#define AUTOCONF_TIMESTAMP "2011-09-01 04:24 +0200"
+#define AUTOCONF_TIMESTAMP "2011-10-06 22:08 +0200"
 
 #define CONFIG_HAVE_DOT_CONFIG 1
 #define ENABLE_HAVE_DOT_CONFIG 1
@@ -320,14 +320,14 @@
 #define ENABLE_FEATURE_EDITING_HISTORY 1
 #define IF_FEATURE_EDITING_HISTORY(...) __VA_ARGS__
 #define IF_NOT_FEATURE_EDITING_HISTORY(...)
-#undef CONFIG_FEATURE_EDITING_SAVEHISTORY
-#define ENABLE_FEATURE_EDITING_SAVEHISTORY 0
-#define IF_FEATURE_EDITING_SAVEHISTORY(...)
-#define IF_NOT_FEATURE_EDITING_SAVEHISTORY(...) __VA_ARGS__
-#undef CONFIG_FEATURE_REVERSE_SEARCH
-#define ENABLE_FEATURE_REVERSE_SEARCH 0
-#define IF_FEATURE_REVERSE_SEARCH(...)
-#define IF_NOT_FEATURE_REVERSE_SEARCH(...) __VA_ARGS__
+#define CONFIG_FEATURE_EDITING_SAVEHISTORY 1
+#define ENABLE_FEATURE_EDITING_SAVEHISTORY 1
+#define IF_FEATURE_EDITING_SAVEHISTORY(...) __VA_ARGS__
+#define IF_NOT_FEATURE_EDITING_SAVEHISTORY(...)
+#define CONFIG_FEATURE_REVERSE_SEARCH 1
+#define ENABLE_FEATURE_REVERSE_SEARCH 1
+#define IF_FEATURE_REVERSE_SEARCH(...) __VA_ARGS__
+#define IF_NOT_FEATURE_REVERSE_SEARCH(...)
 #define CONFIG_FEATURE_TAB_COMPLETION 1
 #define ENABLE_FEATURE_TAB_COMPLETION 1
 #define IF_FEATURE_TAB_COMPLETION(...) __VA_ARGS__
@@ -984,10 +984,10 @@
 #define ENABLE_TRUE 1
 #define IF_TRUE(...) __VA_ARGS__
 #define IF_NOT_TRUE(...)
-#define CONFIG_TTY 1
-#define ENABLE_TTY 1
-#define IF_TTY(...) __VA_ARGS__
-#define IF_NOT_TTY(...)
+#undef CONFIG_TTY
+#define ENABLE_TTY 0
+#define IF_TTY(...)
+#define IF_NOT_TTY(...) __VA_ARGS__
 #define CONFIG_UNAME 1
 #define ENABLE_UNAME 1
 #define IF_UNAME(...) __VA_ARGS__