From 30acfee4ef7b7055d967261d68fa5b2239929052 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Mon, 11 Jul 2005 16:57:19 +0000 Subject: [PATCH] Andreas V. Meier: update linux26(2.6.12) linux26: now exports INSTALL_PATH=/boot by default linux26: 2.6.12 is already fixed for new binutils [2005062311433128633] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6196 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.desc | 6 +- .../linux/linux26/15-install-in-boot.patch | 35 ------ .../linux/linux26/83-linux-2.6-seg-5.patch | 102 ------------------ 3 files changed, 3 insertions(+), 140 deletions(-) delete mode 100644 package/base/linux/linux26/15-install-in-boot.patch delete mode 100644 package/base/linux/linux26/83-linux-2.6-seg-5.patch diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 47cab6542..c24374ae1 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -51,9 +51,9 @@ #endif #if xpkg == linux26.* -[V] 2.6.11.9 -[D] 456157144 linux-2.6.11.9.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ -[D] 1282187532 patch-2.6.11-pa4.gz http://cvs.parisc-linux.org/download/linux-2.6/ +[V] 2.6.12 +[D] 2030351311 linux-2.6.12.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +[D] 1034274479 patch-2.6.12-pa1.gz 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/15-install-in-boot.patch b/package/base/linux/linux26/15-install-in-boot.patch deleted file mode 100644 index f433efc2c..000000000 --- a/package/base/linux/linux26/15-install-in-boot.patch +++ /dev/null @@ -1,35 +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/15-install-in-boot.patch -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - - -This Patch is specific to ROCK Linux and not available as stand-alone patch. - - - Clifford Wolf - ---- linux/Makefile -+++ linux/Makefile -@@ -70,7 +70,7 @@ - # images. Uncomment if you want to place them anywhere other than root. - # - --#export INSTALL_PATH=/boot -+export INSTALL_PATH=/boot - - # - # INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory diff --git a/package/base/linux/linux26/83-linux-2.6-seg-5.patch b/package/base/linux/linux26/83-linux-2.6-seg-5.patch deleted file mode 100644 index 5c2e7dc82..000000000 --- a/package/base/linux/linux26/83-linux-2.6-seg-5.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- linux/arch/i386/kernel/process.c.seg 2005-03-27 13:07:14.000000000 -0800 -+++ linux/arch/i386/kernel/process.c 2005-03-28 10:28:47.000000000 -0800 -@@ -597,8 +597,8 @@ struct task_struct fastcall * __switch_t - * Save away %fs and %gs. No need to save %es and %ds, as - * those are always kernel segments while inside the kernel. - */ -- asm volatile("movl %%fs,%0":"=m" (*(int *)&prev->fs)); -- asm volatile("movl %%gs,%0":"=m" (*(int *)&prev->gs)); -+ asm volatile("mov %%fs,%0":"=m" (prev->fs)); -+ asm volatile("mov %%gs,%0":"=m" (prev->gs)); - - /* - * Restore %fs and %gs if needed. ---- linux/arch/i386/kernel/vm86.c.seg 2005-03-27 13:07:14.000000000 -0800 -+++ linux/arch/i386/kernel/vm86.c 2005-03-28 10:28:47.000000000 -0800 -@@ -294,8 +294,8 @@ static void do_sys_vm86(struct kernel_vm - */ - info->regs32->eax = 0; - tsk->thread.saved_esp0 = tsk->thread.esp0; -- asm volatile("movl %%fs,%0":"=m" (tsk->thread.saved_fs)); -- asm volatile("movl %%gs,%0":"=m" (tsk->thread.saved_gs)); -+ asm volatile("mov %%fs,%0":"=m" (tsk->thread.saved_fs)); -+ asm volatile("mov %%gs,%0":"=m" (tsk->thread.saved_gs)); - - tss = &per_cpu(init_tss, get_cpu()); - tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0; ---- linux/arch/x86_64/kernel/process.c.seg 2005-03-27 13:07:49.000000000 -0800 -+++ linux/arch/x86_64/kernel/process.c 2005-03-28 11:11:04.206766410 -0800 -@@ -391,10 +391,10 @@ int copy_thread(int nr, unsigned long cl - p->thread.fs = me->thread.fs; - p->thread.gs = me->thread.gs; - -- asm("movl %%gs,%0" : "=m" (p->thread.gsindex)); -- asm("movl %%fs,%0" : "=m" (p->thread.fsindex)); -- asm("movl %%es,%0" : "=m" (p->thread.es)); -- asm("movl %%ds,%0" : "=m" (p->thread.ds)); -+ asm("mov %%gs,%0" : "=m" (p->thread.gsindex)); -+ asm("mov %%fs,%0" : "=m" (p->thread.fsindex)); -+ asm("mov %%es,%0" : "=m" (p->thread.es)); -+ asm("mov %%ds,%0" : "=m" (p->thread.ds)); - - if (unlikely(me->thread.io_bitmap_ptr != NULL)) { - p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL); -@@ -457,11 +457,11 @@ struct task_struct *__switch_to(struct t - * Switch DS and ES. - * This won't pick up thread selector changes, but I guess that is ok. - */ -- asm volatile("movl %%es,%0" : "=m" (prev->es)); -+ asm volatile("mov %%es,%0" : "=m" (prev->es)); - if (unlikely(next->es | prev->es)) - loadsegment(es, next->es); - -- asm volatile ("movl %%ds,%0" : "=m" (prev->ds)); -+ asm volatile ("mov %%ds,%0" : "=m" (prev->ds)); - if (unlikely(next->ds | prev->ds)) - loadsegment(ds, next->ds); - -@@ -472,7 +472,7 @@ struct task_struct *__switch_to(struct t - */ - { - unsigned fsindex; -- asm volatile("movl %%fs,%0" : "=g" (fsindex)); -+ asm volatile("movl %%fs,%0" : "=r" (fsindex)); - /* segment register != 0 always requires a reload. - also reload when it has changed. - when prev process used 64bit base always reload -@@ -493,7 +493,7 @@ struct task_struct *__switch_to(struct t - } - { - unsigned gsindex; -- asm volatile("movl %%gs,%0" : "=g" (gsindex)); -+ asm volatile("movl %%gs,%0" : "=r" (gsindex)); - if (unlikely(gsindex | next->gsindex | prev->gs)) { - load_gs_index(next->gsindex); - if (gsindex) ---- linux/include/asm-i386/system.h.seg 2005-03-27 13:09:12.000000000 -0800 -+++ linux/include/asm-i386/system.h 2005-03-28 10:28:47.000000000 -0800 -@@ -81,7 +81,7 @@ static inline unsigned long _get_base(ch - #define loadsegment(seg,value) \ - asm volatile("\n" \ - "1:\t" \ -- "movl %0,%%" #seg "\n" \ -+ "mov %0,%%" #seg "\n" \ - "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3:\t" \ -@@ -93,13 +93,13 @@ static inline unsigned long _get_base(ch - ".align 4\n\t" \ - ".long 1b,3b\n" \ - ".previous" \ -- : :"m" (*(unsigned int *)&(value))) -+ : :"m" (value)) - - /* - * Save a segment register away - */ - #define savesegment(seg, value) \ -- asm volatile("movl %%" #seg ",%0":"=m" (*(int *)&(value))) -+ asm volatile("mov %%" #seg ",%0":"=m" (value)) - - /* - * Clear and set 'TS' bit respectively