Mercurial > hg > aboriginal
changeset 1463:b499073fe1b2
Update to 3.1 kernel.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 24 Oct 2011 22:57:58 -0500 |
parents | 61b784a003c3 |
children | 58bd855892c3 |
files | download.sh sources/baseconfig-linux sources/patches/linux-noperl-capflags.patch sources/patches/linux-noperl-headers.patch |
diffstat | 4 files changed, 26 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/download.sh Sat Oct 22 19:38:29 2011 -0500 +++ b/download.sh Mon Oct 24 22:57:58 2011 -0500 @@ -21,8 +21,8 @@ # Building a cross compile toolchain requires linux headers, uClibc, # binutils, and gcc. -URL=http://www.kernel.org/pub/linux/kernel/v3.0/linux-3.0.tar.bz2 \ -SHA1=45b64bffc860f70ab7956da4493c488010714650 \ +URL=http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.1.tar.bz2 \ +SHA1=ac792701561b1cd4279302b8bb8f474731762ad1 \ ALT=http://kernel.org/pub/linux/kernel/v3.0/testing/linux-3.0-rc1.tar.bz2 \ maybe_fork "download || dienow"
--- a/sources/baseconfig-linux Sat Oct 22 19:38:29 2011 -0500 +++ b/sources/baseconfig-linux Mon Oct 24 22:57:58 2011 -0500 @@ -35,6 +35,7 @@ CONFIG_TMPFS=y CONFIG_MISC_FILESYSTEMS=y CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_ZLIB=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEVTMPFS=y
--- a/sources/patches/linux-noperl-capflags.patch Sat Oct 22 19:38:29 2011 -0500 +++ b/sources/patches/linux-noperl-capflags.patch Mon Oct 24 22:57:58 2011 -0500 @@ -1,53 +1,8 @@ -X-Mozilla-Status: 0001 -X-Mozilla-Status2: 00000000 -Delivered-To: rob@landley.net -Received: by 10.223.124.142 with SMTP id u14cs100561far; - Sun, 16 Jan 2011 12:00:04 -0800 (PST) -Received: by 10.231.145.68 with SMTP id c4mr3277484ibv.47.1295208003912; - Sun, 16 Jan 2011 12:00:03 -0800 (PST) -Return-Path: <linux-kernel-owner@vger.kernel.org> -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mx.google.com with ESMTP id u12si9169065ibe.45.2011.01.16.12.00.03; - Sun, 16 Jan 2011 12:00:03 -0800 (PST) -Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; -Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1753900Ab1APT7y (ORCPT <rfc822;rob@landley.net>); - Sun, 16 Jan 2011 14:59:54 -0500 -Received: from mx2.parallels.com ([64.131.90.16]:40919 "EHLO mx2.parallels.com" - rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP - id S1752978Ab1APT7u (ORCPT <rfc822;linux-kernel@vger.kernel.org>); - Sun, 16 Jan 2011 14:59:50 -0500 -Received: from rr-ah-dc.swsoft.net ([96.31.168.200] helo=mail.parallels.com) - by mx2.parallels.com with esmtps (TLSv1:AES128-SHA:128) - (Exim 4.72) - (envelope-from <rlandley@parallels.com>) - id 1PeYlF-0007jN-AX; Sun, 16 Jan 2011 14:59:37 -0500 -Received: from [192.168.5.91] (64.134.26.60) by mail.parallels.com - (10.255.249.32) with Microsoft SMTP Server (TLS) id 14.0.702.0; Sun, 16 Jan - 2011 11:59:35 -0800 -Message-ID: <4D334E1E.7090708@parallels.com> -Date: Sun, 16 Jan 2011 13:59:26 -0600 -From: Rob Landley <rlandley@parallels.com> -User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 -MIME-Version: 1.0 -To: <linux-kernel@vger.kernel.org>, <tglx@linuxtronix.de>, - <mingo@redhat.com>, <hpa@zytor.com>, <x86@kernel.org>, - "K. Y. Srinivasan" <ksrinivasan@novell.com>, - Greg Kroah-Hartman <gregkh@suse.de> -Subject: [PATCH] Use sed instead of perl to generate x86/kernel/cpu/capflags.c. -Content-Type: text/plain; charset="ISO-8859-1" -Content-Transfer-Encoding: 7bit -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-kernel.vger.kernel.org> -X-Mailing-List: linux-kernel@vger.kernel.org - -From: Rob Landley <rlandley@parallels.com> +From: Rob Landley <rob@landley.net> Generate capflags.c with sed (POSIX 2008) instead of perl. -Signed-off-by: Rob Landley <rlandley@parallels.com> +Signed-off-by: Rob Landley <rob@landley.net> --- This patch hasn't changed since 2009. @@ -141,9 +96,3 @@ + done + echo "};" +) > $OUT --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ -
--- a/sources/patches/linux-noperl-headers.patch Sat Oct 22 19:38:29 2011 -0500 +++ b/sources/patches/linux-noperl-headers.patch Mon Oct 24 22:57:58 2011 -0500 @@ -1,31 +1,28 @@ -Message-ID: <4D359E5C.1070002@parallels.com> -Date: Tue, 18 Jan 2011 08:06:20 -0600 -From: Rob Landley <rlandley@parallels.com> Subject: [PATCH] Replace scripts/headers_install.pl with a shell script. From: Rob Landley <rob@landley.net> Remove perl from make headers_install by replacing a perl script (doing -a simple regex search and replace) with a smaller and faster shell script -implementation. The new shell script is a single for loop calling sed and -piping its output through unifdef to produce the target file. +a simple regex search and replace) with a smaller, faster, simpler, +POSIX-2008 shell script implementation. The new shell script is a single +for loop calling sed and piping its output through unifdef to produce the +target file. -Change from last time: better error handling. Split "sed | unifdef" into -two stages with a temp file because dash hasn't got PIPEFAIL. Add check -for exit code, add trap handler to delete output when exiting prematurely. +Previous submission: Tuesday Jan 18, 2011 +Message-ID: <4D359E5C.1070002@parallels.com> -Signed-off-by: Rob Landley <rlandley@parallels.com> +Signed-off-by: Rob Landley <rob@landley.net> --- - scripts/Makefile.headersinst | 6 ++-- - scripts/headers_install.pl | 49 --------------------------------- - scripts/headers_install.sh | 39 ++++++++++++++++++++++++++ - 3 files changed, 42 insertions(+), 52 deletions(-) + scripts/Makefile.headersinst | 6 +-- + scripts/headers_install.pl | 58 --------------------------------- + scripts/headers_install.sh | 43 ++++++++++++++++++++++++ + 3 files changed, 46 insertions(+), 61 deletions(-) -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 -@@ -0,0 +1,42 @@ +diff -ruN linux-3.1/scripts/headers_install.sh linux-2.6.30/scripts/headers_install.sh +--- linux-3.1/scripts/headers_install.sh ++++ linux/scripts/headers_install.sh +@@ -0,0 +1,43 @@ +#!/bin/sh + +if [ $# -lt 2 ] @@ -60,6 +57,7 @@ + -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \ + -e 's/__attribute_const__([ \t]|$)/\1/g' \ + -e 's@^#include <linux/compiler.h>@@' \ ++ -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ + -e 's/(^|[ \t])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \ + "$INDIR/$i" > "$OUTDIR/$i.sed" || exit 1 + scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$i.sed" \ @@ -68,9 +66,9 @@ + rm -f "$OUTDIR/$i.sed" +done +trap - EXIT -diff -ruN linux-2.6.30.old/scripts/Makefile.headersinst linux-2.6.30/scripts/Makefile.headersinst ---- linux-2.6.30.old/scripts/Makefile.headersinst 2009-06-09 22:05:27.000000000 -0500 -+++ linux-2.6.30/scripts/Makefile.headersinst 2009-06-22 16:21:23.000000000 -0500 +diff -ruN linux-3.1/scripts/Makefile.headersinst +--- linux-3.1/scripts/Makefile.headersinst ++++ linux/scripts/Makefile.headersinst @@ -50,8 +50,8 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) @@ -93,7 +91,7 @@ $(call if_changed,install) --- a/scripts/headers_install.pl +++ /dev/null -@@ -1,57 +0,0 @@ +@@ -1,58 +0,0 @@ -#!/usr/bin/perl -w -# -# headers_install prepare the listed header files for use in @@ -131,6 +129,7 @@ - $line =~ s/([\s(])__iomem\s/$1/g; - $line =~ s/\s__attribute_const__\s/ /g; - $line =~ s/\s__attribute_const__$//g; +- $line =~ s/\b__packed\b/__attribute__((packed))/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; @@ -151,9 +150,3 @@ - unlink $tmpfile; -} -exit 0; --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ -