[Fai-commit] r3064 - in people/h01ger/fai-kernels: . debian
fai-repository at svn.debian.org
fai-repository at svn.debian.org
Fri Nov 18 20:49:15 UTC 2005
Author: h01ger-guest
Date: 2005-11-18 20:49:14 +0000 (Fri, 18 Nov 2005)
New Revision: 3064
Added:
people/h01ger/fai-kernels/328707.patch
Modified:
people/h01ger/fai-kernels/debian/changelog
people/h01ger/fai-kernels/debian/control
people/h01ger/fai-kernels/debian/rules
Log:
- builds 2.4.27 again
Added: people/h01ger/fai-kernels/328707.patch
===================================================================
--- people/h01ger/fai-kernels/328707.patch 2005-11-17 20:07:32 UTC (rev 3063)
+++ people/h01ger/fai-kernels/328707.patch 2005-11-18 20:49:14 UTC (rev 3064)
@@ -0,0 +1,111 @@
+--- linux/arch/i386/kernel/apm.c.seg 2005-03-27 13:10:45.000000000 -0800
++++ linux/arch/i386/kernel/apm.c 2005-03-28 10:30:24.000000000 -0800
+@@ -327,7 +327,7 @@ extern int (*console_blank_hook)(int);
+ * Save a segment register away
+ */
+ #define savesegment(seg, where) \
+- __asm__ __volatile__("movl %%" #seg ",%0" : "=m" (where))
++ __asm__ __volatile__("mov %%" #seg ",%0" : "=m" (where))
+
+ /*
+ * Maximum number of events stored
+@@ -553,7 +553,7 @@ static inline void apm_restore_cpus(unsi
+
+ #ifdef APM_ZERO_SEGS
+ # define APM_DECL_SEGS \
+- unsigned int saved_fs; unsigned int saved_gs;
++ unsigned short saved_fs; unsigned short saved_gs;
+ # define APM_DO_SAVE_SEGS \
+ savesegment(fs, saved_fs); savesegment(gs, saved_gs)
+ # define APM_DO_ZERO_SEGS \
+--- linux/arch/i386/kernel/process.c.seg 2005-03-27 13:10:45.000000000 -0800
++++ linux/arch/i386/kernel/process.c 2005-03-28 10:30:24.000000000 -0800
+@@ -544,7 +544,7 @@ void release_thread(struct task_struct *
+ * Save a segment.
+ */
+ #define savesegment(seg,value) \
+- asm volatile("movl %%" #seg ",%0":"=m" (*(int *)&(value)))
++ asm volatile("mov %%" #seg ",%0":"=m" (value))
+
+ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
+ unsigned long unused,
+@@ -661,8 +661,8 @@ void fastcall __switch_to(struct task_st
+ * 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.
+--- linux/arch/x86_64/kernel/process.c.seg 2005-03-27 13:10:51.000000000 -0800
++++ linux/arch/x86_64/kernel/process.c 2005-03-28 11:16:57.000000000 -0800
+@@ -527,10 +527,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));
+
+ unlazy_fpu(current);
+ p->thread.i387 = current->thread.i387;
+@@ -575,11 +575,11 @@ struct task_struct *__switch_to(struct t
+ /*
+ * Switch DS and ES.
+ */
+- 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);
+
+@@ -588,7 +588,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
+@@ -609,7 +609,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 15:33:12.000000000 -0800
++++ linux/include/asm-i386/system.h 2005-03-28 10:30:24.000000000 -0800
+@@ -84,7 +84,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" \
+@@ -96,7 +96,7 @@ static inline unsigned long _get_base(ch
+ ".align 4\n\t" \
+ ".long 1b,3b\n" \
+ ".previous" \
+- : :"m" (*(unsigned int *)&(value)))
++ : :"m" (value))
+
+ /*
+ * Clear and set 'TS' bit respectively
Modified: people/h01ger/fai-kernels/debian/changelog
===================================================================
--- people/h01ger/fai-kernels/debian/changelog 2005-11-17 20:07:32 UTC (rev 3063)
+++ people/h01ger/fai-kernels/debian/changelog 2005-11-18 20:49:14 UTC (rev 3064)
@@ -1,8 +1,9 @@
fai-kernels (1.10) unstable; urgency=low
* switched to linux-tree-2.6.14 now
- * disabled kernel 2.4 because of build problems, may be reenabled later
- it's still included in the depends...
+ * apply to the patch for #328707 to 2.4.27-11 during build to be able to
+ build the 2.4 kernel with the latest binutils. Therefore I've added the
+ versioned dependency on 2.4.27-11
* added support for amd64 and ppc
* dont merge kernel config snipplets, rather use one config file per arch
and kernel version (2.4/2.6)
@@ -16,7 +17,7 @@
* added myself to maintainers field
* NMU - as I'm no DD yet, uploaded by the old maintainer Thomas. Thanks!
- -- Holger Levsen <debian at layer-acht.org> Fri, 11 Nov 2005 10:50:50 +0100
+ -- Holger Levsen <debian at layer-acht.org> Fri, 18 Nov 2005 20:40:50 +0100
fai-kernels (1.9.1) unstable; urgency=high
Modified: people/h01ger/fai-kernels/debian/control
===================================================================
--- people/h01ger/fai-kernels/debian/control 2005-11-17 20:07:32 UTC (rev 3063)
+++ people/h01ger/fai-kernels/debian/control 2005-11-18 20:49:14 UTC (rev 3064)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Holger Levsen <debian at layer-acht.org>
Standards-Version: 3.6.2
-Build-Depends: linux-tree-2.6.14, modutils, kernel-package, debhelper (>=4), bin86, fakeroot
+Build-Depends: linux-tree-2.6.14, kernel-source-2.4.27 (=2.4.27-11), modutils, kernel-package, debhelper (>=4), bin86, fakeroot
Package: fai-kernels
Architecture: i386 powerpc amd64
Modified: people/h01ger/fai-kernels/debian/rules
===================================================================
--- people/h01ger/fai-kernels/debian/rules 2005-11-17 20:07:32 UTC (rev 3063)
+++ people/h01ger/fai-kernels/debian/rules 2005-11-18 20:49:14 UTC (rev 3064)
@@ -31,9 +31,9 @@
unpack24: unpack-stamp24
unpack-stamp24:
- # temp. disabled
- #bzcat /usr/src/$(kname24).tar.bz2 | tar -xf -
- #touch unpack-stamp24
+ bzcat /usr/src/$(kname24).tar.bz2 | tar -xf -
+ ln -s $(kname24) linux ; patch -p0 < 328707.patch ; rm linux
+ touch unpack-stamp24
# kernel 2.6
kernel: stamp-kernel
@@ -58,8 +58,7 @@
# build 2.4 and 2.6 only on i386
build:
ifeq ($(DEB_HOST_ARCH),i386)
- # temp. disabled
- #debian/rules kernel24
+ debian/rules kernel24
debian/rules kernel
else
debian/rules kernel
@@ -90,8 +89,7 @@
dh_testroot
dh_installdocs
ifeq ($(DEB_HOST_ARCH),i386)
- # temp. disabled
- #cp -p $(kname24)/.config `pwd`/debian/fai-kernels/usr/share/doc/fai-kernels/config-$(kversion24)
+ cp -p $(kname24)/.config `pwd`/debian/fai-kernels/usr/share/doc/fai-kernels/config-$(kversion24)
endif
cp -p $(kname)/.config `pwd`/debian/fai-kernels/usr/share/doc/fai-kernels/config-$(kversion)
dh_installchangelogs
More information about the Fai-commit
mailing list