From 228aea3e187d384df07a7b045fcc4a913fd6a32f Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 12 May 2008 09:58:02 +0000 Subject: [PATCH] Clifford Wolf: Updated linux (2.6.25) [2008042323465522322] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9020 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.conf | 34 ++++++++++++------- package/base/linux/linux.desc | 4 +-- .../base/linux/linux26/12-conf-hacks.patch | 9 +++++ .../base/linux/linux26/80-ext23-suiddir.patch | 9 ----- .../arch-sparc-asm_byteorder-ansi-c.patch | 34 ------------------- .../linux/linux26/arch-sparc64-use-KCC.patch | 30 ---------------- 6 files changed, 32 insertions(+), 88 deletions(-) delete mode 100644 package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch delete mode 100644 package/base/linux/linux26/arch-sparc64-use-KCC.patch diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index 46661eb6c..838682a85 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -32,21 +32,26 @@ forcefpic=0 prefix=usr set_confopt -case "$xpkg-" in - *-source-*) +case "$xpkg" in + linux2[46]) + ;; + linux2[46]-source) unset splitdesc_dev - pkg_linux_mode=source ;; - *-src-*) - abort "If you want to build a source package, use '${xpkg//src/source}'.";; - *-headers-cross-*) + pkg_linux_mode=source + ;; + linux2[46]-headers-cross-*) pkg_linux_mode=headers pkg_linux_cross="${xpkg#*-cross-}" - echo_status "Preparing to build a cross-binutils package for $pkg_binutils_cross." + echo_status "Preparing to build a cross-kernel-headers package for $pkg_linux_cross." prefix="$prefix/${pkg_linux_cross}-unknown-linux-gnu" set_confopt ;; - *-headers-*) - pkg_linux_mode=headers ;; + linux2[46]-headers) + pkg_linux_mode=headers + ;; + *) + abort "Unsupported linux kernel package name: $xpkg" + ;; esac echo_status "Preparing to build a linux kernel $pkg_linux_mode package." @@ -527,13 +532,13 @@ main_lx() { main_lx_headers() { lx_source - versionhotfix 2.6.24.4 + versionhotfix 2.6.25 find include/ -type f | xargs -r sed -i "/include/ s, for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done diff --git a/package/base/linux/linux26/12-conf-hacks.patch b/package/base/linux/linux26/12-conf-hacks.patch index 4f64bb374..acc35a834 100644 --- a/package/base/linux/linux26/12-conf-hacks.patch +++ b/package/base/linux/linux26/12-conf-hacks.patch @@ -33,6 +33,15 @@ diff -dur linux-2.6.17-orig/scripts/kconfig/conf.c linux-2.6.17/scripts/kconfig/ case ask_all: fflush(stdout); fgets(line, 128, stdin); +@@ -504,7 +515,7 @@ + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + +- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) { ++ while ((opt = getopt(ac, av, "osdD:nmMyrh")) != -1) { + switch (opt) { + case 'o': + input_mode = ask_new; @@ -523,6 +534,9 @@ case 'm': input_mode = set_mod; diff --git a/package/base/linux/linux26/80-ext23-suiddir.patch b/package/base/linux/linux26/80-ext23-suiddir.patch index f741601e3..572796cb4 100644 --- a/package/base/linux/linux26/80-ext23-suiddir.patch +++ b/package/base/linux/linux26/80-ext23-suiddir.patch @@ -134,12 +134,3 @@ config JBD # CONFIG_JBD could be its own option (even modular), but until there are # other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS -@@ -1289,8 +1347,6 @@ - It's currently broken, so for now: - answer N. - -- -- - config SYSV_FS - tristate "System V/Xenix/V7/Coherent file system support" - help diff --git a/package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch b/package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch deleted file mode 100644 index d5ce8ba5b..000000000 --- a/package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch +++ /dev/null @@ -1,34 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./include/asm-sparc/byteorder.h.orig 2004-11-21 14:52:27.000000000 +0100 -+++ ./include/asm-sparc/byteorder.h 2004-12-02 22:37:37.459072968 +0100 -@@ -4,10 +4,8 @@ - - #include - --#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) --# define __BYTEORDER_HAS_U64__ --# define __SWAB_64_THRU_32__ --#endif -+#define __BYTEORDER_HAS_U64__ -+#define __SWAB_64_THRU_32__ - - #include - diff --git a/package/base/linux/linux26/arch-sparc64-use-KCC.patch b/package/base/linux/linux26/arch-sparc64-use-KCC.patch deleted file mode 100644 index 64a6f1d34..000000000 --- a/package/base/linux/linux26/arch-sparc64-use-KCC.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/linux/linux26/arch-sparc64-use-KCC.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./arch/sparc64/Makefile.orig 2004-09-18 07:51:04.000000000 +0200 -+++ ./arch/sparc64/Makefile 2004-09-18 07:51:32.000000000 +0200 -@@ -12,7 +12,7 @@ - - AFLAGS_vmlinux.lds.o += -Usparc - --CC := $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo $(CC); else echo sparc64-linux-gcc; fi ) -+CC := $(KCC) - - NEW_GCC := $(shell if $(CC) -m64 -mcmodel=medlow -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; ) - NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)