diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 64d15d7e3..82aa22b01 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -50,10 +50,10 @@ #endif #if xpkg == linux26.* -[V] 2.6.16.26 1 -[D] 82985259 linux-2.6.16.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ -[D] 1521225251 patch-2.6.16.26.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ -[D] 4024976103 patch-2.6.16-pa11.gz http://cvs.parisc-linux.org/download/linux-2.6/ +[V] 2.6.17.7 +[D] 2805024457 linux-2.6.17.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +[D] 120128364 patch-2.6.17.7.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +[D] 2022887016 linux-2.6.17-pa6.tar.bz2 http://cvs.parisc-linux.org/download/linux-2.6/ #endif [CD] 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 4cee6fe5c..6f8eedbe2 100644 --- a/package/base/linux/linux26/12-conf-hacks.patch +++ b/package/base/linux/linux26/12-conf-hacks.patch @@ -1,31 +1,7 @@ -# --- 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/12-conf-hacks.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 --- - -Set all unset options to module. Needed by the ROCK Linux kernel -configuration. - -Initally written by Clifford Wolf and adapted -for various new 2.5/2.6 kernels by Rene Rebe . - ---- ./scripts/kconfig/conf.c.vanilla 2006-01-10 17:29:02.000000000 +0100 -+++ ./scripts/kconfig/conf.c 2006-01-10 17:33:34.000000000 +0100 -@@ -20,6 +20,7 @@ +diff -dur linux-2.6.17-orig/scripts/kconfig/conf.c linux-2.6.17/scripts/kconfig/conf.c +--- linux-2.6.17-orig/scripts/kconfig/conf.c 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17/scripts/kconfig/conf.c 2006-07-27 22:13:38.000000000 +0200 +@@ -21,6 +21,7 @@ ask_all, ask_new, ask_silent, @@ -33,7 +9,7 @@ for various new 2.5/2.6 kernels by Rene Rebe . set_default, set_yes, set_mod, -@@ -91,6 +92,15 @@ +@@ -92,6 +93,15 @@ return; } break; @@ -75,14 +51,15 @@ for various new 2.5/2.6 kernels by Rene Rebe . conf_read(NULL); break; case set_no: ---- ./scripts/kconfig/Makefile.vanilla 2006-01-10 17:29:25.000000000 +0100 -+++ ./scripts/kconfig/Makefile 2006-01-10 17:29:45.000000000 +0100 +diff -dur linux-2.6.17-orig/scripts/kconfig/Makefile linux-2.6.17/scripts/kconfig/Makefile +--- linux-2.6.17-orig/scripts/kconfig/Makefile 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17/scripts/kconfig/Makefile 2006-07-27 22:15:10.000000000 +0200 @@ -42,7 +42,7 @@ $(Q)rm -f arch/um/Kconfig_arch $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot --.PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig -+.PHONY: randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig +-PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig ++PHONY += randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig randconfig: $(obj)/conf $< -r arch/$(ARCH)/Kconfig @@ -102,5 +79,5 @@ for various new 2.5/2.6 kernels by Rene Rebe . @echo ' allmodconfig - New config selecting modules when possible' + @echo ' no2modconfig - New config selecting modules for disabled options' @echo ' allyesconfig - New config where all options are accepted with yes' - @echo ' allnoconfig - New minimal config' + @echo ' allnoconfig - New config where all options are answered with no'