changeset 1231:0a1a177d0e28

Long overdue upgrade to 2.6.35, I'll fix the architectures this breaks later.
author Rob Landley <rob@landley.net>
date Tue, 31 Aug 2010 18:25:34 -0500
parents 50015325b804
children e93f17722cdf
files download.sh sources/patches/linux-2.6.28-perl2.patch sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch sources/patches/linux-dnsdomainname.patch sources/patches/linux-fixsparc.patch
diffstat 5 files changed, 56 insertions(+), 92 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Tue Aug 31 18:22:57 2010 -0500
+++ b/download.sh	Tue Aug 31 18:25:34 2010 -0500
@@ -21,8 +21,8 @@
 # Building a cross compile toolchain requires linux headers, uClibc,
 # binutils, and gcc.
 
-URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.33.tar.bz2 \
-SHA1=acc8db00f30c7dfb4f04183a88ba35a32b6f8e8d \
+URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.tar.bz2 \
+SHA1=4cb1fbfbeedcd658ca37739679c65dfaa136bf4e \
 #UNSTABLE=http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.32-rc7.tar.bz2 \
 maybe_fork "download || dienow"
 
--- a/sources/patches/linux-2.6.28-perl2.patch	Tue Aug 31 18:22:57 2010 -0500
+++ b/sources/patches/linux-2.6.28-perl2.patch	Tue Aug 31 18:25:34 2010 -0500
@@ -13,59 +13,6 @@
  scripts/headers_install.sh   |   39 ++++++++++++++++++++++++++
  3 files changed, 42 insertions(+), 52 deletions(-)
 
-diff -ruN linux-2.6.30.old/scripts/headers_install.pl linux-2.6.30/scripts/headers_install.pl
---- linux-2.6.30.old/scripts/headers_install.pl	2009-06-09 22:05:27.000000000 -0500
-+++ linux-2.6.30/scripts/headers_install.pl	1969-12-31 18:00:00.000000000 -0600
-@@ -1,49 +0,0 @@
--#!/usr/bin/perl -w
--#
--# headers_install prepare the listed header files for use in
--# user space and copy the files to their destination.
--#
--# Usage: headers_install.pl readdir installdir arch [files...]
--# readdir:    dir to open files
--# installdir: dir to install the files
--# arch:       current architecture
--#             arch is used to force a reinstallation when the arch
--#             changes because kbuild then detect a command line change.
--# files:      list of files to check
--#
--# Step in preparation for users space:
--# 1) Drop all use of compiler.h definitions
--# 2) Drop include of compiler.h
--# 3) Drop all sections defined out by __KERNEL__ (using unifdef)
--
--use strict;
--
--my ($readdir, $installdir, $arch, @files) = @ARGV;
--
--my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
--
--foreach my $file (@files) {
--	local *INFILE;
--	local *OUTFILE;
--	my $tmpfile = "$installdir/$file.tmp";
--	open(INFILE, "<$readdir/$file")
--		or die "$readdir/$file: $!\n";
--	open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n";
--	while (my $line = <INFILE>) {
--		$line =~ s/([\s(])__user\s/$1/g;
--		$line =~ s/([\s(])__force\s/$1/g;
--		$line =~ s/([\s(])__iomem\s/$1/g;
--		$line =~ s/\s__attribute_const__\s/ /g;
--		$line =~ s/\s__attribute_const__$//g;
--		$line =~ s/^#include <linux\/compiler.h>//;
--		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
--		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
--		$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
--		printf OUTFILE "%s", $line;
--	}
--	close OUTFILE;
--	close INFILE;
--	system $unifdef . " $tmpfile > $installdir/$file";
--	unlink $tmpfile;
--}
--exit 0;
 diff -ruN linux-2.6.30.old/scripts/headers_install.sh linux-2.6.30/scripts/headers_install.sh
 --- linux-2.6.30.old/scripts/headers_install.sh	1969-12-31 18:00:00.000000000 -0600
 +++ linux-2.6.30/scripts/headers_install.sh	2009-06-22 16:21:23.000000000 -0500
@@ -132,3 +79,56 @@
  	$(if $(unwanted),$(call cmd,remove),)
  	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
  	$(call if_changed,install)
+--- linux/scripts/headers_install.pl	2010-08-01 17:11:14.000000000 -0500
++++ /dev/null	2010-07-26 16:01:48.630190848 -0500
+@@ -1,50 +0,0 @@
+-#!/usr/bin/perl -w
+-#
+-# headers_install prepare the listed header files for use in
+-# user space and copy the files to their destination.
+-#
+-# Usage: headers_install.pl readdir installdir arch [files...]
+-# readdir:    dir to open files
+-# installdir: dir to install the files
+-# arch:       current architecture
+-#             arch is used to force a reinstallation when the arch
+-#             changes because kbuild then detect a command line change.
+-# files:      list of files to check
+-#
+-# Step in preparation for users space:
+-# 1) Drop all use of compiler.h definitions
+-# 2) Drop include of compiler.h
+-# 3) Drop all sections defined out by __KERNEL__ (using unifdef)
+-
+-use strict;
+-
+-my ($readdir, $installdir, $arch, @files) = @ARGV;
+-
+-my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
+-
+-foreach my $file (@files) {
+-	my $tmpfile = "$installdir/$file.tmp";
+-
+-	open(my $in, '<', "$readdir/$file")
+-	    or die "$readdir/$file: $!\n";
+-	open(my $out, '>', $tmpfile)
+-	    or die "$tmpfile: $!\n";
+-	while (my $line = <$in>) {
+-		$line =~ s/([\s(])__user\s/$1/g;
+-		$line =~ s/([\s(])__force\s/$1/g;
+-		$line =~ s/([\s(])__iomem\s/$1/g;
+-		$line =~ s/\s__attribute_const__\s/ /g;
+-		$line =~ s/\s__attribute_const__$//g;
+-		$line =~ s/^#include <linux\/compiler.h>//;
+-		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
+-		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
+-		$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
+-		printf {$out} "%s", $line;
+-	}
+-	close $out;
+-	close $in;
+-
+-	system $unifdef . " $tmpfile > $installdir/$file";
+-	unlink $tmpfile;
+-}
+-exit 0;
--- a/sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch	Tue Aug 31 18:22:57 2010 -0500
+++ b/sources/patches/linux-2.6.29-armv6-armv7-for-versatilepb.patch	Tue Aug 31 18:25:34 2010 -0500
@@ -69,6 +69,6 @@
  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
+ 	select CPU_32v6K if !ARCH_OMAP2
  	select CPU_32v7
  	select CPU_ABRT_EV7
--- a/sources/patches/linux-dnsdomainname.patch	Tue Aug 31 18:22:57 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# Trivial little patch to silence a build warning.  The Linux kernel searches
-# for a command at an absolute path, then runs it out of $PATH, but for us
-# /bin isn't necessarily in $PATH.
-
-diff -ru linux.bak/scripts/mkcompile_h linux/scripts/mkcompile_h
---- linux.bak/scripts/mkcompile_h	2009-12-05 15:06:52.000000000 -0600
-+++ linux/scripts/mkcompile_h	2009-12-05 15:15:37.000000000 -0600
-@@ -67,9 +67,9 @@
-   echo \#define LINUX_COMPILE_BY \"`whoami`\"
-   echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
- 
--  if [ -x /bin/dnsdomainname ]; then
-+  if [ ! -z "$(which dnsdomainname)" ]; then
-     domain=`dnsdomainname 2> /dev/null`
--  elif [ -x /bin/domainname ]; then
-+  elif [ ! -z "$(which domainname)" ]; then
-     domain=`domainname 2> /dev/null`
-   fi
- 
--- a/sources/patches/linux-fixsparc.patch	Tue Aug 31 18:22:57 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-The strace build can't find definitions of uid16_t and gid16_t becuase they're
-both behind #ifdef KERNEL and get cleaned out by the header export.  Just use
-the actual types.
-
---- a/arch/sparc/include/asm/stat.h
-+++ b/arch/sparc/include/asm/stat.h
-@@ -53,8 +53,8 @@ struct stat {
- 	ino_t		st_ino;
- 	mode_t		st_mode;
- 	short		st_nlink;
--	uid16_t		st_uid;
--	gid16_t		st_gid;
-+	unsigned short	st_uid;
-+	unsigned short	st_gid;
- 	unsigned short	st_rdev;
- 	off_t		st_size;
- 	time_t		st_atime;