Update for 2009.05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,17 @@
+2009.05, Released June 1st, 2009:
+
+	Fixes for dropbear & diffutils, bump linux-advanced 2.6.29.x
+	version and marked ubifsroot as broken.
+
+2009.05-rc3, Released May 27th, 2009:
+
+	Fixes for toolchain (gcc arm pr37436), stable kernel versions,
+	busybox, curl, libusb, readline, python and strace.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#345: libcurl package needs a urandom fix
+
 2009.05-rc2, Released May 19th, 2009:
 
 	Fixes for toolchain (gcc w/softfloat on ppc, 3.4.6 buildfix

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2009.05-rc2"
+	default "2009.05"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"

docs/news.html

@@ -5,6 +5,31 @@
 <p>
 
 <ul>
+  <li><b>27 May 2009 -- 2009.05-rc3 released</b>
+
+    <p>We had a number of fixes post-RC2, so RC3 is out (see <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.05_rc3">CHANGES</a>
+    for details). Now is the moment to test and verify that everything
+    is working for your favorite config - Expect a final 2009.05 very soon.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.05-rc3.tar.bz2">2009.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>19 May 2009 -- 2009.05-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bug fixes (see <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.05_rc2">CHANGES</a>).
+    Unless big issues are found, expect this to be the last release
+    candidate before the release - So give it a good test.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.05-rc2.tar.bz2">2009.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
 
   <li><b>14 May 2009 -- Buildroot.org</b>
 

package/busybox/Config.in

@@ -36,7 +36,7 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X
 	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
-	default "1.14.0"	if BR2_BUSYBOX_VERSION_1_14_X
+	default "1.14.1"	if BR2_BUSYBOX_VERSION_1_14_X
 
 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"

package/busybox/busybox-1.14.0-acpid.patch

@@ -1,13 +0,0 @@
---- busybox-1.14.0/util-linux/acpid.c	Tue Apr 14 01:43:11 2009
-+++ busybox-1.14.0-acpid/util-linux/acpid.c	Sat Apr 18 13:33:19 2009
-@@ -78,8 +78,8 @@
- 	// goto configuration directory
- 	xchdir(opt_conf);
- 
--//	// setup signals
--//	bb_signals(BB_FATAL_SIGS, record_signo);
-+	// prevent zombies
-+	signal(SIGCHLD, SIG_IGN);
- 
- 	// no explicit evdev files given? -> use proc event interface
- 	if (!*argv) {

package/busybox/busybox-1.14.0-awk.patch

@@ -1,21 +0,0 @@
---- busybox-1.14.0/editors/awk.c	Tue Apr 14 01:43:09 2009
-+++ busybox-1.14.0-awk/editors/awk.c	Mon May 18 23:49:29 2009
-@@ -1571,13 +1571,14 @@
- 				n++; /* we saw yet another delimiter */
- 			} else {
- 				pmatch[0].rm_eo = l;
--				if (s[l]) pmatch[0].rm_eo++;
-+				if (s[l])
-+					pmatch[0].rm_eo++;
- 			}
- 			memcpy(s1, s, l);
- 			/* make sure we remove *all* of the separator chars */
--			while (l < pmatch[0].rm_eo) {
--				s1[l++] = '\0';
--			}
-+			do {
-+				s1[l] = '\0';
-+			} while (++l < pmatch[0].rm_eo);
- 			nextword(&s1);
- 			s += pmatch[0].rm_eo;
- 		} while (*s);

package/busybox/busybox-1.14.0-defconfig.patch

@@ -1,11 +0,0 @@
---- busybox-1.14.0/scripts/defconfig	Tue Apr 14 01:42:52 2009
-+++ busybox-1.14.0-defconfig/scripts/defconfig	Fri Apr 17 01:08:24 2009
-@@ -579,7 +579,7 @@
- CONFIG_EJECT=y
- CONFIG_FEATURE_EJECT_SCSI=y
- CONFIG_FBSPLASH=y
--CONFIG_FLASH_ERASEALL=y
-+# CONFIG_FLASH_ERASEALL is not set
- CONFIG_IONICE=y
- # CONFIG_INOTIFYD is not set
- CONFIG_LAST=y

package/busybox/busybox-1.14.0-depmod.patch

@@ -1,90 +0,0 @@
---- busybox-1.14.0/modutils/depmod.c	Tue Apr 14 01:42:55 2009
-+++ busybox-1.14.0-depmod/modutils/depmod.c	Mon May 18 22:37:14 2009
-@@ -40,26 +40,28 @@
- 	ARG_r = (1<<6)  /* Compat dummy. Linux Makefile uses it */
- };
- 
--static int FAST_FUNC parse_module(const char *fname, struct stat *sb,
--				  void *data, int UNUSED_PARAM depth)
-+static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
-+				  void *data, int depth UNUSED_PARAM)
- {
-+	char modname[MODULE_NAME_LEN];
- 	module_info **first = (module_info **) data;
- 	char *image, *ptr;
- 	module_info *info;
--	size_t len = sb->st_size;
-+	/* Arbitrary. Was sb->st_size, but that breaks .gz etc */
-+	size_t len = (64*1024*1024 - 4096);
- 
- 	if (strrstr(fname, ".ko") == NULL)
- 		return TRUE;
- 
- 	image = xmalloc_open_zipped_read_close(fname, &len);
--	info = xzalloc(sizeof(module_info));
-+	info = xzalloc(sizeof(*info));
- 
- 	info->next = *first;
- 	*first = info;
- 
- 	info->dnext = info->dprev = info;
- 	info->name = xasprintf("/%s", fname);
--	info->modname = filename2modname(fname, NULL);
-+	info->modname = xstrdup(filename2modname(fname, modname));
- 	for (ptr = image; ptr < image + len - 10; ptr++) {
- 		if (strncmp(ptr, "depends=", 8) == 0) {
- 			char *u;
-@@ -69,12 +71,14 @@
- 				if (*u == '-')
- 					*u = '_';
- 			ptr += string_to_llist(ptr, &info->dependencies, ",");
--		} else if (ENABLE_FEATURE_MODUTILS_ALIAS &&
--			   strncmp(ptr, "alias=", 6) == 0) {
-+		} else if (ENABLE_FEATURE_MODUTILS_ALIAS
-+		 && strncmp(ptr, "alias=", 6) == 0
-+		) {
- 			llist_add_to(&info->aliases, xstrdup(ptr + 6));
- 			ptr += strlen(ptr);
--		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS &&
--			   strncmp(ptr, "__ksymtab_", 10) == 0) {
-+		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
-+		 && strncmp(ptr, "__ksymtab_", 10) == 0
-+		) {
- 			ptr += 10;
- 			if (strncmp(ptr, "gpl", 3) == 0 ||
- 			    strcmp(ptr, "strings") == 0)
-@@ -199,10 +203,17 @@
- 	if (!(option_mask32 & ARG_n))
- 		xfreopen_write("modules.alias", stdout);
- 	for (m = modules; m != NULL; m = m->next) {
-+		const char *fname = bb_basename(m->name);
-+		int fnlen = strchrnul(fname, '.') - fname;
- 		while (m->aliases) {
--			printf("alias %s %s\n",
-+			/* Last word can well be m->modname instead,
-+			 * but depmod from module-init-tools 3.4
-+			 * uses module basename, i.e., no s/-/_/g.
-+			 * (pathname and .ko.* are still stripped)
-+			 * Mimicking that... */
-+			printf("alias %s %.*s\n",
- 				(char*)llist_pop(&m->aliases),
--				m->modname);
-+				fnlen, fname);
- 		}
- 	}
- #endif
-@@ -210,10 +221,12 @@
- 	if (!(option_mask32 & ARG_n))
- 		xfreopen_write("modules.symbols", stdout);
- 	for (m = modules; m != NULL; m = m->next) {
-+		const char *fname = bb_basename(m->name);
-+		int fnlen = strchrnul(fname, '.') - fname;
- 		while (m->symbols) {
--			printf("alias symbol:%s %s\n",
-+			printf("alias symbol:%s %.*s\n",
- 				(char*)llist_pop(&m->symbols),
--				m->modname);
-+				fnlen, fname);
- 		}
- 	}
- #endif

package/busybox/busybox-1.14.0-des.patch

@@ -1,14 +0,0 @@
---- busybox-1.14.0/libbb/pw_encrypt_des.c	Tue Apr 14 01:43:00 2009
-+++ busybox-1.14.0-des/libbb/pw_encrypt_des.c	Fri May  1 03:40:16 2009
-@@ -778,8 +778,10 @@
- 	to64_msb_first(output + 2, (r0 >> 8));
- 	/* bits 7..0 of r0 and 31..16 of r1 */
- 	to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16));
--	/* (bits 15..0 of r1 + 00) and NUL byte */
-+	/* bits 15..0 of r1 and two zero bits (plus extra zero byte) */
- 	to64_msb_first(output + 10, (r1 << 8));
-+	/* extra zero byte is encoded as '.', fixing it */
-+	output[13] = '\0';
- #endif
- 
- 	return output;

package/busybox/busybox-1.14.0-dhcp_hostname.patch

@@ -1,12 +0,0 @@
---- busybox-1.14.0/networking/udhcp/leases.c	Tue Apr 14 01:42:51 2009
-+++ busybox-1.14.0-dhcp_hostname/networking/udhcp/leases.c	Tue Apr 21 02:41:22 2009
-@@ -63,7 +63,8 @@
- 	if (oldest) {
- 		oldest->hostname[0] = '\0';
- 		if (hostname) {
--        		hostname_length = hostname[-1]; /* look at option size byte */
-+			/* option size byte, + 1 for NUL */
-+        		hostname_length = hostname[-1] + 1;
- 			if (hostname_length > sizeof(oldest->hostname))
- 				hostname_length = sizeof(oldest->hostname);
-             		hostname = (uint8_t*) safe_strncpy((char*)oldest->hostname, (char*)hostname, hostname_length);

package/busybox/busybox-1.14.0-gzip.patch

@@ -1,91 +0,0 @@
---- busybox-1.14.0/archival/gzip.c	Tue Apr 14 01:42:55 2009
-+++ busybox-1.14.0-gzip/archival/gzip.c	Mon May 18 22:36:12 2009
-@@ -389,19 +389,6 @@
- }
- 
- /* ===========================================================================
-- * Clear input and output buffers
-- */
--static void clear_bufs(void)
--{
--	G1.outcnt = 0;
--#ifdef DEBUG
--	G1.insize = 0;
--#endif
--	G1.isize = 0;
--}
--
--
--/* ===========================================================================
-  * Run a set of bytes through the crc shift register.  If s is a NULL
-  * pointer, then initialize the crc shift register contents instead.
-  * Return the current crc in either case.
-@@ -2019,7 +2006,37 @@
- {
- 	struct stat s;
- 
--	clear_bufs();
-+	/* Clear input and output buffers */
-+	G1.outcnt = 0;
-+#ifdef DEBUG
-+	G1.insize = 0;
-+#endif
-+	G1.isize = 0;
-+
-+	/* Reinit G2.xxx */
-+	memset(&G2, 0, sizeof(G2));
-+	G2.l_desc.dyn_tree     = G2.dyn_ltree;
-+	G2.l_desc.static_tree  = G2.static_ltree;
-+	G2.l_desc.extra_bits   = extra_lbits;
-+	G2.l_desc.extra_base   = LITERALS + 1;
-+	G2.l_desc.elems        = L_CODES;
-+	G2.l_desc.max_length   = MAX_BITS;
-+	//G2.l_desc.max_code     = 0;
-+	G2.d_desc.dyn_tree     = G2.dyn_dtree;
-+	G2.d_desc.static_tree  = G2.static_dtree;
-+	G2.d_desc.extra_bits   = extra_dbits;
-+	//G2.d_desc.extra_base   = 0;
-+	G2.d_desc.elems        = D_CODES;
-+	G2.d_desc.max_length   = MAX_BITS;
-+	//G2.d_desc.max_code     = 0;
-+	G2.bl_desc.dyn_tree    = G2.bl_tree;
-+	//G2.bl_desc.static_tree = NULL;
-+	G2.bl_desc.extra_bits  = extra_blbits,
-+	//G2.bl_desc.extra_base  = 0;
-+	G2.bl_desc.elems       = BL_CODES;
-+	G2.bl_desc.max_length  = MAX_BL_BITS;
-+	//G2.bl_desc.max_code    = 0;
-+
- 	s.st_ctime = 0;
- 	fstat(STDIN_FILENO, &s);
- 	zip(s.st_ctime);
-@@ -2064,29 +2081,6 @@
- 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2))
- 			+ sizeof(struct globals));
- 	barrier();
--	G2.l_desc.dyn_tree    = G2.dyn_ltree;
--	G2.l_desc.static_tree = G2.static_ltree;
--	G2.l_desc.extra_bits  = extra_lbits;
--	G2.l_desc.extra_base  = LITERALS + 1;
--	G2.l_desc.elems       = L_CODES;
--	G2.l_desc.max_length  = MAX_BITS;
--	//G2.l_desc.max_code    = 0;
--
--	G2.d_desc.dyn_tree    = G2.dyn_dtree;
--	G2.d_desc.static_tree = G2.static_dtree;
--	G2.d_desc.extra_bits  = extra_dbits;
--	//G2.d_desc.extra_base  = 0;
--	G2.d_desc.elems       = D_CODES;
--	G2.d_desc.max_length  = MAX_BITS;
--	//G2.d_desc.max_code    = 0;
--
--	G2.bl_desc.dyn_tree    = G2.bl_tree;
--	//G2.bl_desc.static_tree = NULL;
--	G2.bl_desc.extra_bits  = extra_blbits,
--	//G2.bl_desc.extra_base  = 0;
--	G2.bl_desc.elems       = BL_CODES;
--	G2.bl_desc.max_length  = MAX_BL_BITS;
--	//G2.bl_desc.max_code    = 0;
- 
- 	/* Allocate all global buffers (for DYN_ALLOC option) */
- 	ALLOC(uch, G1.l_buf, INBUFSIZ);

package/busybox/busybox-1.14.0-libbb.patch

@@ -1,35 +0,0 @@
---- busybox-1.14.0/include/libbb.h	Tue Apr 14 02:50:20 2009
-+++ busybox-1.14.0-libbb/include/libbb.h	Fri May 15 23:22:02 2009
-@@ -965,6 +965,12 @@
- 	/* How long the longest ESC sequence we know? */
- 	KEYCODE_BUFFER_SIZE = 4
- };
-+/* Note: fd may be in blocking or non-blocking mode, both make sense.
-+ * For one, less uses non-blocking mode.
-+ * Only the first read syscall inside read_key may block indefinitely
-+ * (unless fd is in non-blocking mode),
-+ * subsequent reads will time out after a few milliseconds.
-+ */
- int read_key(int fd, smalluint *nbuffered, char *buffer) FAST_FUNC;
- 
- 
---- busybox-1.14.0/libbb/read.c	Tue Apr 14 01:43:00 2009
-+++ busybox-1.14.0-libbb/libbb/read.c	Fri May 15 23:22:02 2009
-@@ -229,7 +229,7 @@
- 		if (size > 64*1024)
- 			size = 64*1024;
- 	}
--	xrealloc(buf, total + 1);
-+	buf = xrealloc(buf, total + 1);
- 	buf[total] = '\0';
- 
- 	if (maxsz_p)
-@@ -273,7 +273,7 @@
- 		free(buf);
- 		return NULL;
- 	}
--	xrealloc(buf, size + 1);
-+	buf = xrealloc(buf, size + 1);
- 	buf[size] = '\0';
- 
- 	if (maxsz_p)

package/busybox/busybox-1.14.0-mdev.patch

@@ -1,12 +0,0 @@
---- busybox-1.14.0/util-linux/mdev.c	Tue Apr 14 23:23:04 2009
-+++ busybox-1.14.0-mdev/util-linux/mdev.c	Mon May  4 19:58:47 2009
-@@ -181,7 +181,8 @@
- 		 * the rest of fields unless keep_matching == 1 */
- 
- 		/* 2nd field: uid:gid - device ownership */
--		parse_chown_usergroup_or_die(&ugid, tokens[1]);
-+		if (get_uidgid(&ugid, tokens[1], 1) == 0)
-+			bb_error_msg("unknown user/group %s", tokens[1]);
- 
- 		/* 3rd field: mode - device permissions */
- 		mode = strtoul(tokens[2], NULL, 8);

package/busybox/busybox-1.14.0-sysctl.patch

@@ -1,18 +0,0 @@
---- busybox-1.14.0/procps/sysctl.c	Tue Apr 14 01:43:09 2009
-+++ busybox-1.14.0-sysctl/procps/sysctl.c	Sun May 10 23:40:52 2009
-@@ -214,11 +214,11 @@
- // (but _whitespace_ from ends should be trimmed first (and we do it right))
- //TODO: "var==1" is mishandled (must use "=1" as a value, but uses "1")
- 	while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) {
-+		char *tp;
- 		sysctl_dots_to_slashes(token[0]);
--		/* Save ~4 bytes by using parser internals */
--		/* parser->line is big enough for sprintf */
--		sprintf(parser->line, "%s=%s", token[0], token[1]);
--		sysctl_act_recursive(parser->line);
-+		tp = xasprintf("%s=%s", token[0], token[1]);
-+		sysctl_act_recursive(tp);
-+		free(tp);
- 	}
- 	if (ENABLE_FEATURE_CLEAN_UP)
- 		config_close(parser);

package/busybox/busybox-1.14.0-unaligned.patch

@@ -1,14 +0,0 @@
---- busybox-1.14.0/include/platform.h	Tue Apr 14 01:43:05 2009
-+++ busybox-1.14.0-unaligned/include/platform.h	Sat Apr 18 00:14:34 2009
-@@ -173,7 +173,10 @@
- /* performs reasonably well (gcc usually inlines memcpy here) */
- #define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
- #define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
--#define move_to_unaligned32(u32p, v)   (memcpy((u32p), &(v), 4))
-+#define move_to_unaligned32(u32p, v) do { \
-+	uint32_t __t = (v); \
-+	memcpy((u32p), &__t, 4); \
-+} while (0)
- #endif
- 
- /* ---- Networking ------------------------------------------ */

package/busybox/busybox.mk

@@ -92,7 +92,7 @@ endif
 
 
 $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
-q	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)

package/diffutils/diffutils.mk

@@ -94,7 +94,8 @@ $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY): $(DIFFUTILS_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR)
 
 $(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY): $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY)
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR) install-strip
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR) \
+		$(if $(BR2_STRIP_none),install,install-strip)
 ifneq ($(BR2_HAVE_INFOPAGES),y)
 	rm -rf $(TARGET_DIR)/usr/share/info
 endif

package/dropbear/dropbear.mk

@@ -28,7 +28,7 @@ $(DROPBEAR_TARGET_INSTALL_TARGET):
 	ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp
 	ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh
 	if [ ! -f $(TARGET_DIR)/etc/init.d/S50dropbear ]; then \
-		$(INSTALL) -m 0755 -D package/dropbear/S50dropbear $(TARGET_DIR)/etc/init.d; \
+		$(INSTALL) -m 0755 -D package/dropbear/S50dropbear $(TARGET_DIR)/etc/init.d/S50dropbear; \
 	fi
 	touch $@
 

package/libcurl/libcurl.mk

@@ -19,6 +19,8 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
 LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
+else
+LIBCURL_CONF_ENV += --without-ssl
 endif
 
 $(eval $(call AUTOTARGETS,package,libcurl))

package/libusb/libusb.mk

@@ -23,7 +23,7 @@ $(DL_DIR)/$(LIBUSB_SOURCE): $(LIBUSB_PATCH)
 libusb-source: $(DL_DIR)/$(LIBUSB_SOURCE) $(LIBUSB_PATCH)
 
 libusb-unpacked: $(LIBUSB_DIR)/.unpacked
-$(LIBUSB_DIR)/.unpacked: $(AUTOCONF) $(AUTOMAKE) $(LIBTOOL) $(DL_DIR)/$(LIBUSB_SOURCE)
+$(LIBUSB_DIR)/.unpacked: $(STAMP_DIR)/host_autoconf_installed $(STAMP_DIR)/host_automake_installed $(LIBTOOL) $(DL_DIR)/$(LIBUSB_SOURCE)
 	$(LIBUSB_CAT) $(DL_DIR)/$(LIBUSB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifneq ($(LIBUSB_PATCH_FILE),)
 	(cd $(LIBUSB_DIR) && $(LIBUSB_CAT) $(LIBUSB_PATCH) | patch -p1)

package/python/Config.in

@@ -35,6 +35,7 @@ comment "The following modules are unusual or require extra libraries"
 
 config BR2_PACKAGE_PYTHON_BSDDB
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_BERKELEYDB
 	bool "bsddb module"
 	help
 	  bsddb module for Python.
@@ -48,30 +49,33 @@ config BR2_PACKAGE_PYTHON_CODECSCJK
 
 config BR2_PACKAGE_PYTHON_CURSES
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_NCURSES
 	bool "curses module"
 	help
 	  curses module for Python.
 
-config BR2_PACKAGE_PYTHON_GDBM
-	depends on BR2_PACKAGE_PYTHON
-	bool "gdbm module"
-	help
-	  gdbm module for Python.
+# config BR2_PACKAGE_PYTHON_GDBM
+# 	depends on BR2_PACKAGE_PYTHON
+# 	bool "gdbm module"
+# 	help
+# 	  gdbm module for Python.
 
-config BR2_PACKAGE_PYTHON_NIS
-	depends on BR2_PACKAGE_PYTHON
-	bool "nis module"
-	help
-	  nis module for Python.
+# config BR2_PACKAGE_PYTHON_NIS
+# 	depends on BR2_PACKAGE_PYTHON
+# 	bool "nis module"
+# 	help
+# 	  nis module for Python.
 
 config BR2_PACKAGE_PYTHON_PYEXPAT
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_EXPAT
 	bool "pyexpat"
 	help
 	  pyexpat module for Python.
 
 config BR2_PACKAGE_PYTHON_READLINE
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_READLINE
 	bool "readline"
 	help
 	  readline module for Python (required for command-line
@@ -79,12 +83,14 @@ config BR2_PACKAGE_PYTHON_READLINE
 
 config BR2_PACKAGE_PYTHON_SSL
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_OPENSSL
 	bool "ssl"
 	help
 	  _ssl module for Python (required for https in urllib etc).
 
 config BR2_PACKAGE_PYTHON_TKINTER
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_TCL
 	bool "tkinter module"
 	help
 	  tkinter module for Python.
@@ -95,4 +101,3 @@ config BR2_PACKAGE_PYTHON_UNICODEDATA
 	default y
 	help
 	  Unicode character database (used by stringprep module) (large).
-

package/readline/Config.in

@@ -1,5 +1,5 @@
-#
 config BR2_PACKAGE_READLINE
 	bool "readline"
+	select BR2_PACKAGE_NCURSES
 	help
 	    Enable GNU readline support?

package/strace/strace-arm-eabi-fix.patch

@@ -0,0 +1,27 @@
+From f5da8d0c38ea0eb660cb17de7aa62cda6899eb75 Mon Sep 17 00:00:00 2001
+From: ldv <ldv>
+Date: Thu, 1 Jan 2009 23:20:38 +0000
+Subject: [PATCH] 2008-11-13  Kirill A. Shutemov  <kirill@shutemov.name>
+
+	* linux/arm/syscallent.h: Fix build on ARM EABI which does not
+	provide syscalls socketcall and ipc.
+
+diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
+index 5ccef2f..edc3641 100644
+--- a/linux/arm/syscallent.h
++++ b/linux/arm/syscallent.h
+@@ -431,6 +431,7 @@
+ 	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
+ 	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+ 
++#ifndef __ARM_EABI__
+ #if SYS_socket_subcall != 400
+  #error fix me
+ #endif
+@@ -481,3 +482,4 @@
+ 	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
+ 	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+ 	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
++#endif
+-- 
+1.6.1.3

target/linux/Config.in.advanced

@@ -128,7 +128,7 @@ choice
 	  Select the specific Linux version you want to use
 
 config BR2_LINUX_2_6_STABLE
-	bool "The latest stable Linux kernel (2.6.29.2)"
+	bool "The latest stable Linux kernel (2.6.29.4)"
 
 config BR2_LINUX_2_6_29
 	bool "Linux 2.6.29"

target/linux/Config.in.versions

@@ -19,13 +19,13 @@ config LINUX26_LATEST_MM_VERSION
 
 config BR2_KERNEL_CURRENT_VERSION
 	string
-	default "2.6.29.2"
+	default "2.6.29.4"
 	help
 	  This is the latest stable kernel (including minor version)
 
 config BR2_KERNEL_LATEST_2_6_29
 	string
-	default "2"
+	default "4"
 
 config BR2_KERNEL_LATEST_2_6_28
 	string

target/ubifs/Config.in

@@ -1,5 +1,6 @@
 config BR2_TARGET_ROOTFS_UBIFS
 	bool "ubifs root filesystem"
+	depends on BROKEN # upstream git gone, should use mtd-utils
 	select BR2_HOST_FAKEROOT
 	help
 	  Build a ubifs root filesystem

target/ubifs/ubifsroot.mk

@@ -13,7 +13,7 @@ MKFS_UBIFS_CAT:=$(ZCAT)
 MKFS_UBIFS_NAME:=mkfs.ubifs
 
 $(DL_DIR)/$(MKFS_UBIFS_SOURCE):
-	$(call DOWNLOAD,"$(MKFS_UBIFS_URL)")
+	$(WGET) -O $(DL_DIR)/$(MKFS_UBIFS_SOURCE) "$(MKFS_UBIFS_URL)"
 
 $(MKFS_UBIFS_DIR)/.unpacked: $(DL_DIR)/$(MKFS_UBIFS_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(MKFS_UBIFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
@@ -108,7 +108,7 @@ ifneq ($(UBIFS_COPYTO),)
 	@cp -f $(UBIFS_TARGET) $(UBIFS_COPYTO)
 endif
 
-ubifsroot-source: $(DL_DIR)/$(GENUBIFS_SOURCE)
+ubifsroot-source: $(DL_DIR)/$(MKFS_UBIFS_SOURCE)
 
 ubifsroot-clean:
 	-$(MAKE) -C $(MKFS_UBIFS_DIR) clean

toolchain/gcc/4.3.2/999-4.3.2-arm-fix-for-bug-37436.patch

@@ -0,0 +1,86 @@
+gcc svn 142778:
+
+PR target/37436
+* arm.c (arm_legitimate_index): Only accept addresses that are in
+canonical form.
+* predicates.md (arm_reg_or_extendqisi_mem_op): New predicate.
+* arm.md (extendqihi2): Use arm_reg_or_extendqisi_mem_op predicate
+for operand1.
+(extendqisi2): Likewise.
+(arm_extendqisi, arm_extendqisi_v6): Use arm_extendqisi_mem_op
+predicate for operand1.
+
+diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.c gcc-4.3.3/gcc/config/arm/arm.c
+--- gcc-4.3.3.orig/gcc/config/arm/arm.c	2008-06-11 07:52:55.000000000 -0300
++++ gcc-4.3.3/gcc/config/arm/arm.c	2009-05-21 16:06:45.000000000 -0300
+@@ -3769,6 +3769,7 @@
+       rtx xop1 = XEXP (x, 1);
+ 
+       return ((arm_address_register_rtx_p (xop0, strict_p)
++	       && GET_CODE(xop1) == CONST_INT
+ 	       && arm_legitimate_index_p (mode, xop1, outer, strict_p))
+ 	      || (arm_address_register_rtx_p (xop1, strict_p)
+ 		  && arm_legitimate_index_p (mode, xop0, outer, strict_p)));
+diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.md gcc-4.3.3/gcc/config/arm/arm.md
+--- gcc-4.3.3.orig/gcc/config/arm/arm.md	2007-09-04 01:44:47.000000000 -0300
++++ gcc-4.3.3/gcc/config/arm/arm.md	2009-05-21 16:06:45.000000000 -0300
+@@ -4199,7 +4199,7 @@
+ 
+ (define_expand "extendqihi2"
+   [(set (match_dup 2)
+-	(ashift:SI (match_operand:QI 1 "general_operand" "")
++	(ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
+ 		   (const_int 24)))
+    (set (match_operand:HI 0 "s_register_operand" "")
+ 	(ashiftrt:SI (match_dup 2)
+@@ -4224,7 +4224,7 @@
+ 
+ (define_insn "*arm_extendqihi_insn"
+   [(set (match_operand:HI 0 "s_register_operand" "=r")
+-	(sign_extend:HI (match_operand:QI 1 "memory_operand" "Uq")))]
++	(sign_extend:HI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
+   "TARGET_ARM && arm_arch4"
+   "ldr%(sb%)\\t%0, %1"
+   [(set_attr "type" "load_byte")
+@@ -4235,7 +4235,7 @@
+ 
+ (define_expand "extendqisi2"
+   [(set (match_dup 2)
+-	(ashift:SI (match_operand:QI 1 "general_operand" "")
++	(ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
+ 		   (const_int 24)))
+    (set (match_operand:SI 0 "s_register_operand" "")
+ 	(ashiftrt:SI (match_dup 2)
+@@ -4267,7 +4267,7 @@
+ 
+ (define_insn "*arm_extendqisi"
+   [(set (match_operand:SI 0 "s_register_operand" "=r")
+-	(sign_extend:SI (match_operand:QI 1 "memory_operand" "Uq")))]
++	(sign_extend:SI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
+   "TARGET_ARM && arm_arch4 && !arm_arch6"
+   "ldr%(sb%)\\t%0, %1"
+   [(set_attr "type" "load_byte")
+@@ -4278,7 +4278,8 @@
+ 
+ (define_insn "*arm_extendqisi_v6"
+   [(set (match_operand:SI 0 "s_register_operand" "=r,r")
+-	(sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,Uq")))]
++	(sign_extend:SI
++	 (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "r,Uq")))]
+   "TARGET_ARM && arm_arch6"
+   "@
+    sxtb%?\\t%0, %1
+diff -Nura gcc-4.3.3.orig/gcc/config/arm/predicates.md gcc-4.3.3/gcc/config/arm/predicates.md
+--- gcc-4.3.3.orig/gcc/config/arm/predicates.md	2007-08-02 07:49:31.000000000 -0300
++++ gcc-4.3.3/gcc/config/arm/predicates.md	2009-05-21 16:06:45.000000000 -0300
+@@ -234,6 +234,10 @@
+        (match_test "arm_legitimate_address_p (mode, XEXP (op, 0), SIGN_EXTEND,
+ 					      0)")))
+ 
++(define_special_predicate "arm_reg_or_extendqisi_mem_op"
++  (ior (match_operand 0 "arm_extendqisi_mem_op")
++       (match_operand 0 "s_register_operand")))
++
+ (define_predicate "power_of_two_operand"
+   (match_code "const_int")
+ {

toolchain/gcc/4.3.3/999-4.3.3-arm-fix-for-bug-37436.patch

@@ -0,0 +1,86 @@
+gcc svn 142778:
+
+PR target/37436
+* arm.c (arm_legitimate_index): Only accept addresses that are in
+canonical form.
+* predicates.md (arm_reg_or_extendqisi_mem_op): New predicate.
+* arm.md (extendqihi2): Use arm_reg_or_extendqisi_mem_op predicate
+for operand1.
+(extendqisi2): Likewise.
+(arm_extendqisi, arm_extendqisi_v6): Use arm_extendqisi_mem_op
+predicate for operand1.
+
+diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.c gcc-4.3.3/gcc/config/arm/arm.c
+--- gcc-4.3.3.orig/gcc/config/arm/arm.c	2008-06-11 07:52:55.000000000 -0300
++++ gcc-4.3.3/gcc/config/arm/arm.c	2009-05-21 16:06:45.000000000 -0300
+@@ -3769,6 +3769,7 @@
+       rtx xop1 = XEXP (x, 1);
+ 
+       return ((arm_address_register_rtx_p (xop0, strict_p)
++	       && GET_CODE(xop1) == CONST_INT
+ 	       && arm_legitimate_index_p (mode, xop1, outer, strict_p))
+ 	      || (arm_address_register_rtx_p (xop1, strict_p)
+ 		  && arm_legitimate_index_p (mode, xop0, outer, strict_p)));
+diff -Nura gcc-4.3.3.orig/gcc/config/arm/arm.md gcc-4.3.3/gcc/config/arm/arm.md
+--- gcc-4.3.3.orig/gcc/config/arm/arm.md	2007-09-04 01:44:47.000000000 -0300
++++ gcc-4.3.3/gcc/config/arm/arm.md	2009-05-21 16:06:45.000000000 -0300
+@@ -4199,7 +4199,7 @@
+ 
+ (define_expand "extendqihi2"
+   [(set (match_dup 2)
+-	(ashift:SI (match_operand:QI 1 "general_operand" "")
++	(ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
+ 		   (const_int 24)))
+    (set (match_operand:HI 0 "s_register_operand" "")
+ 	(ashiftrt:SI (match_dup 2)
+@@ -4224,7 +4224,7 @@
+ 
+ (define_insn "*arm_extendqihi_insn"
+   [(set (match_operand:HI 0 "s_register_operand" "=r")
+-	(sign_extend:HI (match_operand:QI 1 "memory_operand" "Uq")))]
++	(sign_extend:HI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
+   "TARGET_ARM && arm_arch4"
+   "ldr%(sb%)\\t%0, %1"
+   [(set_attr "type" "load_byte")
+@@ -4235,7 +4235,7 @@
+ 
+ (define_expand "extendqisi2"
+   [(set (match_dup 2)
+-	(ashift:SI (match_operand:QI 1 "general_operand" "")
++	(ashift:SI (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "")
+ 		   (const_int 24)))
+    (set (match_operand:SI 0 "s_register_operand" "")
+ 	(ashiftrt:SI (match_dup 2)
+@@ -4267,7 +4267,7 @@
+ 
+ (define_insn "*arm_extendqisi"
+   [(set (match_operand:SI 0 "s_register_operand" "=r")
+-	(sign_extend:SI (match_operand:QI 1 "memory_operand" "Uq")))]
++	(sign_extend:SI (match_operand:QI 1 "arm_extendqisi_mem_op" "Uq")))]
+   "TARGET_ARM && arm_arch4 && !arm_arch6"
+   "ldr%(sb%)\\t%0, %1"
+   [(set_attr "type" "load_byte")
+@@ -4278,7 +4278,8 @@
+ 
+ (define_insn "*arm_extendqisi_v6"
+   [(set (match_operand:SI 0 "s_register_operand" "=r,r")
+-	(sign_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,Uq")))]
++	(sign_extend:SI
++	 (match_operand:QI 1 "arm_reg_or_extendqisi_mem_op" "r,Uq")))]
+   "TARGET_ARM && arm_arch6"
+   "@
+    sxtb%?\\t%0, %1
+diff -Nura gcc-4.3.3.orig/gcc/config/arm/predicates.md gcc-4.3.3/gcc/config/arm/predicates.md
+--- gcc-4.3.3.orig/gcc/config/arm/predicates.md	2007-08-02 07:49:31.000000000 -0300
++++ gcc-4.3.3/gcc/config/arm/predicates.md	2009-05-21 16:06:45.000000000 -0300
+@@ -234,6 +234,10 @@
+        (match_test "arm_legitimate_address_p (mode, XEXP (op, 0), SIGN_EXTEND,
+ 					      0)")))
+ 
++(define_special_predicate "arm_reg_or_extendqisi_mem_op"
++  (ior (match_operand 0 "arm_extendqisi_mem_op")
++       (match_operand 0 "s_register_operand")))
++
+ (define_predicate "power_of_two_operand"
+   (match_code "const_int")
+ {

toolchain/kernel-headers/Config.in

@@ -60,8 +60,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.24.7"	if BR2_KERNEL_HEADERS_2_6_24
 	default "2.6.25.19"	if BR2_KERNEL_HEADERS_2_6_25
 	default "2.6.26.8"	if BR2_KERNEL_HEADERS_2_6_26
-	default "2.6.27.23"	if BR2_KERNEL_HEADERS_2_6_27
+	default "2.6.27.24"	if BR2_KERNEL_HEADERS_2_6_27
 	default "2.6.28.10"	if BR2_KERNEL_HEADERS_2_6_28
-	default "2.6.29.3"	if BR2_KERNEL_HEADERS_2_6_29
+	default "2.6.29.4"	if BR2_KERNEL_HEADERS_2_6_29
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP