changeset 1329:c52b7a665f31

Update busybox, and update uClibc and linux to test versions that should ship soon. Update patches directory to match.
author Rob Landley <rob@landley.net>
date Wed, 09 Feb 2011 20:58:33 -0600
parents 08d92a215472
children a40fc7f7a778
files download.sh sources/patches/busybox-1.18.0-buildsys.patch sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch sources/patches/linux-arm-versatile-big-endian.patch sources/patches/linux-arm.patch sources/patches/uClibc-ruserpass.patch
diffstat 6 files changed, 98 insertions(+), 147 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Tue Feb 08 12:11:04 2011 -0600
+++ b/download.sh	Wed Feb 09 20:58:33 2011 -0600
@@ -21,13 +21,16 @@
 # Building a cross compile toolchain requires linux headers, uClibc,
 # binutils, and gcc.
 
-URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.37.tar.bz2 \
-SHA1=eba83c89e71a86060ef6ff76aefff660aef819e2 \
+#URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.37.tar.bz2 \
+URL=http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.38-rc4.tar.bz2 \
+SHA1=98b9cd4e7aaefa3e3e32a58a813b79b08c5d6ac5 \
 #UNSTABLE=http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.32-rc7.tar.bz2 \
 maybe_fork "download || dienow"
 
-URL=http://uclibc.org/downloads/uClibc-0.9.31.tar.bz2 \
-SHA1=f25f70534594dffdb6b9008799a1532271178338 \
+URL=http://uclibc.org/downloads/uClibc-0.9.32-rc2.tar.bz2 \
+SHA1=a9d942d01f2f494f9a981ff9c4297d598264268a \
+#URL=http://uclibc.org/downloads/uClibc-0.9.31.tar.bz2 \
+#SHA1= \
 #UNSTABLE=http://uclibc.org/downloads/uClibc-snapshot.tar.bz2 \
 maybe_fork "download || dienow"
 
@@ -56,8 +59,8 @@
 # BusyBox.  Adding a native toolchain requires binutils and gcc (above) plus
 # make and bash.
 
-URL=http://www.busybox.net/downloads/busybox-1.18.0.tar.bz2 \
-SHA1=8498770c5fdd8ab8d11a5ec34063d80695ed1ef8 \
+URL=http://www.busybox.net/downloads/busybox-1.18.3.tar.bz2 \
+SHA1=4debdbdf8abb7ae54e0c0e2650cb03d957400533 \
 #UNSTABLE=http://busybox.net/downloads/busybox-snapshot.tar.bz2 \
 maybe_fork "download || dienow"
 
--- a/sources/patches/busybox-1.18.0-buildsys.patch	Tue Feb 08 12:11:04 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-diff -urpN busybox-1.18.0/Config.in busybox-1.18.0-buildsys/Config.in
---- busybox-1.18.0/Config.in	2010-11-22 21:43:21.000000000 +0100
-+++ busybox-1.18.0-buildsys/Config.in	2010-12-05 23:14:04.173614427 +0100
-@@ -128,8 +128,9 @@ config INSTALL_NO_USR
- 	default n
- 	depends on FEATURE_INSTALLER
- 	help
--	  Disable use of /usr. busybox --install will install applets
--	  only to /bin and /sbin, never to /usr/bin or /usr/sbin.
-+	  Disable use of /usr. busybox --install and "make install"
-+	  will install applets only to /bin and /sbin,
-+	  never to /usr/bin or /usr/sbin.
- 
- config LOCALE_SUPPORT
- 	bool "Enable locale support (system needs locale for this to work)"
-diff -urpN busybox-1.18.0/include/applets.src.h busybox-1.18.0-buildsys/include/applets.src.h
---- busybox-1.18.0/include/applets.src.h	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-buildsys/include/applets.src.h	2010-12-05 23:14:04.174614202 +0100
-@@ -56,6 +56,11 @@ s     - suid type:
- # define APPLET_NOFORK(name,main,l,s,name2)  { #name, #main, l, s, 1, 1 },
- #endif
- 
-+#if ENABLE_INSTALL_NO_USR
-+# define _BB_DIR_USR_BIN _BB_DIR_BIN
-+# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
-+#endif
-+
- 
- INSERT
- IF_TEST(APPLET_NOFORK([,  test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
-diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh
---- busybox-1.18.0/scripts/gen_build_files.sh	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh	2010-11-24 14:59:47.732712663 +0100
-@@ -18,14 +18,14 @@ generate()
- 	local src="$1" dst="$2" header="$3" insert="$4"
- 	#chk "${dst}"
- 	(
--		echo "${header}"
-+		printf "%s\n" "${header}"
- 		if grep -qs '^INSERT$' "${src}"; then
- 			sed -n '1,/^INSERT$/p' "${src}"
--			echo "${insert}"
-+			printf "%s\n" "${insert}"
- 			sed -n '/^INSERT$/,$p' "${src}"
- 		else
- 			if [ -n "${insert}" ]; then
--				echo "ERROR: INSERT line missing in: ${src}" 1>&2
-+				printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
- 			fi
- 			cat "${src}"
- 		fi
--- a/sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch	Tue Feb 08 12:11:04 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-diff -ru linux/arch/arm/mach-versatile/Kconfig linux2/arch/arm/mach-versatile/Kconfig
---- linux/arch/arm/mach-versatile/Kconfig	2009-12-02 21:51:21.000000000 -0600
-+++ linux2/arch/arm/mach-versatile/Kconfig	2009-12-08 04:29:50.000000000 -0600
-@@ -3,14 +3,12 @@
- 
- config ARCH_VERSATILE_PB
- 	bool "Support Versatile/PB platform"
--	select CPU_ARM926T
- 	default y
- 	help
- 	  Include support for the ARM(R) Versatile/PB platform.
- 
- config MACH_VERSATILE_AB
- 	bool "Support Versatile/AB platform"
--	select CPU_ARM926T
- 	help
- 	  Include support for the ARM(R) Versatile/AP platform.
- 
-diff -ru linux/arch/arm/mm/Kconfig linux2/arch/arm/mm/Kconfig
---- linux/arch/arm/mm/Kconfig	2009-12-02 21:51:21.000000000 -0600
-+++ linux2/arch/arm/mm/Kconfig	2009-12-08 04:29:50.000000000 -0600
-@@ -111,7 +111,7 @@
- 
- # ARM920T
- config CPU_ARM920T
--	bool "Support ARM920T processor" if ARCH_INTEGRATOR
-+	bool "Support ARM920T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
- 	select CPU_32v4T
- 	select CPU_ABRT_EV4T
- 	select CPU_PABRT_LEGACY
-@@ -129,7 +129,7 @@
- 
- # ARM922T
- config CPU_ARM922T
--	bool "Support ARM922T processor" if ARCH_INTEGRATOR
-+	bool "Support ARM922T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
- 	select CPU_32v4T
- 	select CPU_ABRT_EV4T
- 	select CPU_PABRT_LEGACY
-@@ -167,7 +167,7 @@
- 
- # ARM926T
- config CPU_ARM926T
--	bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
-+	bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
- 	select CPU_32v5
- 	select CPU_ABRT_EV5TJ
- 	select CPU_PABRT_LEGACY
-@@ -175,6 +175,7 @@
- 	select CPU_CP15_MMU
- 	select CPU_COPY_V4WB if MMU
- 	select CPU_TLB_V4WBI if MMU
-+	depends on !CPU_V6 && !CPU_V7
- 	help
- 	  This is a variant of the ARM920.  It has slightly different
- 	  instruction sequences for cache and TLB operations.  Curiously,
-@@ -388,7 +389,7 @@
- 
- # ARMv6
- config CPU_V6
--	bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_DOVE
-+	bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_DOVE || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
- 	select CPU_32v6
- 	select CPU_ABRT_EV6
- 	select CPU_PABRT_V6
-@@ -413,7 +414,7 @@
- 
- # ARMv7
- config CPU_V7
--	bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
-+	bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
- 	select CPU_32v6K if !ARCH_OMAP2
- 	select CPU_32v7
- 	select CPU_ABRT_EV7
--- a/sources/patches/linux-arm-versatile-big-endian.patch	Tue Feb 08 12:11:04 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- linux/arch/arm/mach-versatile/Kconfig	2010-05-29 18:44:21.000000000 -0500
-+++ linx/arch/arm/mach-versatile/Kconfig	2010-05-29 19:19:38.000000000 -0500
-@@ -12,4 +12,12 @@
- 	help
- 	  Include support for the ARM(R) Versatile/AP platform.
- 
-+if ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
-+
-+config ARCH_SUPPORTS_BIG_ENDIAN
-+        bool
-+        default y
-+
-+endif
-+
- endmenu
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/linux-arm.patch	Wed Feb 09 20:58:33 2011 -0600
@@ -0,0 +1,88 @@
+Make the "Arm Versatile" board even more versatile, for QEMU, which can
+stick weird processors into things that were never rmeant to receive them.
+
+diff -ru linux/arch/arm/mm/Kconfig linux2/arch/arm/mm/Kconfig
+--- linux/arch/arm/mm/Kconfig	2009-12-02 21:51:21.000000000 -0600
++++ linux2/arch/arm/mm/Kconfig	2009-12-08 04:29:50.000000000 -0600
+@@ -111,7 +111,7 @@
+ 
+ # ARM920T
+ config CPU_ARM920T
+-	bool "Support ARM920T processor" if ARCH_INTEGRATOR
++	bool "Support ARM920T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
+ 	select CPU_32v4T
+ 	select CPU_ABRT_EV4T
+ 	select CPU_PABRT_LEGACY
+@@ -129,7 +129,7 @@
+ 
+ # ARM922T
+ config CPU_ARM922T
+-	bool "Support ARM922T processor" if ARCH_INTEGRATOR
++	bool "Support ARM922T processor" if ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
+ 	select CPU_32v4T
+ 	select CPU_ABRT_EV4T
+ 	select CPU_PABRT_LEGACY
+@@ -167,7 +167,7 @@
+ 
+ # ARM926T
+ config CPU_ARM926T
+-	bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
++	bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
+ 	select CPU_32v5
+ 	select CPU_ABRT_EV5TJ
+ 	select CPU_PABRT_LEGACY
+@@ -175,6 +175,7 @@
+ 	select CPU_CP15_MMU
+ 	select CPU_COPY_V4WB if MMU
+ 	select CPU_TLB_V4WBI if MMU
++	depends on !CPU_V6 && !CPU_V7
+ 	help
+ 	  This is a variant of the ARM920.  It has slightly different
+ 	  instruction sequences for cache and TLB operations.  Curiously,
+@@ -388,7 +389,7 @@
+ 
+ # ARMv6
+ config CPU_V6
+-	bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_DOVE
++	bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_DOVE || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
+ 	select CPU_32v6
+ 	select CPU_ABRT_EV6
+ 	select CPU_PABRT_V6
+@@ -413,7 +414,7 @@
+ 
+ # ARMv7
+ config CPU_V7
+-	bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
++	bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
+ 	select CPU_32v6K if !ARCH_OMAP2
+ 	select CPU_32v7
+ 	select CPU_ABRT_EV7
+diff -ruN linux/arch/arm/mach-versatile/Kconfig linux.bak/arch/arm/mach-versatile/Kconfig
+--- linux/arch/arm/mach-versatile/Kconfig	2011-02-07 18:03:55.000000000 -0600
++++ linux.bak/arch/arm/mach-versatile/Kconfig	2011-02-09 20:50:14.095413003 -0600
+@@ -3,7 +3,6 @@
+ 
+ config ARCH_VERSATILE_PB
+ 	bool "Support Versatile Platform Baseboard for ARM926EJ-S"
+-	select CPU_ARM926T
+ 	select MIGHT_HAVE_PCI
+ 	default y
+ 	help
+@@ -12,9 +11,16 @@
+ 
+ config MACH_VERSATILE_AB
+ 	bool "Support Versatile Application Baseboard for ARM926EJ-S"
+-	select CPU_ARM926T
+ 	help
+ 	  Include support for the ARM(R) Versatile Application Baseboard
+ 	  for the ARM926EJ-S.
+ 
++if ARCH_VERSATILE_PB || ARCH_VERSATILE_AB
++
++config ARCH_SUPPORTS_BIG_ENDIAN
++	bool
++	default y
++
++endif
++
+ endmenu
--- a/sources/patches/uClibc-ruserpass.patch	Tue Feb 08 12:11:04 2011 -0600
+++ b/sources/patches/uClibc-ruserpass.patch	Wed Feb 09 20:58:33 2011 -0600
@@ -37,4 +37,4 @@
 +libc_hidden_proto(ruserpass)
  
  static int
- token()
+ token(void)