[Pkg-mol-commits] r161 - in mol/trunk/debian: . patches
gaudenz at alioth.debian.org
gaudenz at alioth.debian.org
Wed Aug 6 15:36:32 UTC 2008
Author: gaudenz
Date: 2008-08-06 15:36:31 +0000 (Wed, 06 Aug 2008)
New Revision: 161
Added:
mol/trunk/debian/patches/Makefile_2.6.26.dpatch
mol/trunk/debian/patches/kmod_2.6.26.dpatch
mol/trunk/debian/patches/sheep_2.6.26.dpatch
Removed:
mol/trunk/debian/patches/Makefile_kmod.dpatch
Modified:
mol/trunk/debian/changelog
mol/trunk/debian/patches/00list
Log:
fix FTBFS of mol-source with kernel >= 2.6.24 by applying patches from the
upstream SVN repository (Closes: #445359)
Modified: mol/trunk/debian/changelog
===================================================================
--- mol/trunk/debian/changelog 2007-10-02 14:44:53 UTC (rev 160)
+++ mol/trunk/debian/changelog 2008-08-06 15:36:31 UTC (rev 161)
@@ -9,6 +9,8 @@
- list individual copyright holders
- add instructions on how to build the repackaged debian source tarball
(previously in REDAME.Debian-source)
+ * fix FTBFS of mol-source with kernel >= 2.6.24 by applying patches from the
+ upstream SVN repository (Closes: #445359)
[Jörg Sommer]
* debian/rules:
@@ -34,7 +36,7 @@
+ Removed the kdist_changes, source and diff targets. They are
obsoleted.
- -- Gaudenz Steinlin <gaudenz at debian.org> Mon, 1 Oct 2007 17:39:22 +0200
+ -- Gaudenz Steinlin <gaudenz at debian.org> Wed, 06 Aug 2008 17:32:46 +0200
mol (0.9.72.1~dfsg-1) unstable; urgency=low
Modified: mol/trunk/debian/patches/00list
===================================================================
--- mol/trunk/debian/patches/00list 2007-10-02 14:44:53 UTC (rev 160)
+++ mol/trunk/debian/patches/00list 2008-08-06 15:36:31 UTC (rev 161)
@@ -2,6 +2,8 @@
Makefile
modload
if-tap
-Makefile_kmod
blk_dmg_compile_fix
fix-manpages
+kmod_2.6.26
+sheep_2.6.26
+Makefile_2.6.26
Added: mol/trunk/debian/patches/Makefile_2.6.26.dpatch
===================================================================
--- mol/trunk/debian/patches/Makefile_2.6.26.dpatch (rev 0)
+++ mol/trunk/debian/patches/Makefile_2.6.26.dpatch 2008-08-06 15:36:31 UTC (rev 161)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_2.6.26.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefile fix for for kernel 2.6.26 because of obscure
+## DP: LDFLAGS_MODULE setting
+
+ at DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 2008-08-06 16:26:18.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26 2008-08-06 16:28:23.000000000 +0200
+@@ -12,6 +12,7 @@
+ K_FLAGS = -Iinclude -include include/linux/autoconf.h -Iarch/ppc -Iarch/ppc/include \
+ -I$(src) -I$(src)/../../../include $(INCLUDES) -D__KERNEL__
+ MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(K_FLAGS) -D__ASSEMBLY__
++LDFLAGS_MODULE = $(LDFLAGS_BUILD_ID)
+
+ ### This is ugly, but it should fix the issues people have building as a user
+ T = $(src)
+diff -urNad mol-0.9.72.1~dfsg~/src/netdriver/Makefile.26 mol-0.9.72.1~dfsg/src/netdriver/Makefile.26
+--- mol-0.9.72.1~dfsg~/src/netdriver/Makefile.26 2007-06-25 19:52:17.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/netdriver/Makefile.26 2008-08-06 16:28:36.000000000 +0200
+@@ -1,5 +1,7 @@
+ # -*- makefile -*-
+
++LDFLAGS_MODULE = $(LDFLAGS_BUILD_ID)
++
+ obj-$(BUILD_SHEEP) += sheep.o
+ obj-$(BUILD_TAP) += ethertap.o
+ obj-$(BUILD_TUN) += tun.o
Property changes on: mol/trunk/debian/patches/Makefile_2.6.26.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: mol/trunk/debian/patches/Makefile_kmod.dpatch
===================================================================
--- mol/trunk/debian/patches/Makefile_kmod.dpatch 2007-10-02 14:44:53 UTC (rev 160)
+++ mol/trunk/debian/patches/Makefile_kmod.dpatch 2008-08-06 15:36:31 UTC (rev 161)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile-kmod.dpatch by <gaudenz at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Define variable T in kmod Makefile if not defined
-
- at DPATCH@
-diff -urNad mol-0.9.71~pre8~/src/kmod/Linux/Makefile.26 mol-0.9.71~pre8/src/kmod/Linux/Makefile.26
---- mol-0.9.71~pre8~/src/kmod/Linux/Makefile.26 2005-10-10 03:22:50.000000000 +0200
-+++ mol-0.9.71~pre8/src/kmod/Linux/Makefile.26 2006-08-19 17:56:49.000000000 +0200
-@@ -11,6 +11,7 @@
- PERFOBJS = $(addprefix $(obj)/, $(PERFOBJS_))
- MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
-
-+T ?= /tmp
-
- $(obj)/_traps.o: $(src)/asm_offsets.h $(src)/traps.S $(src)/*.S $(src)/*.h
-
Added: mol/trunk/debian/patches/kmod_2.6.26.dpatch
===================================================================
--- mol/trunk/debian/patches/kmod_2.6.26.dpatch (rev 0)
+++ mol/trunk/debian/patches/kmod_2.6.26.dpatch 2008-08-06 15:36:31 UTC (rev 161)
@@ -0,0 +1,105 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kmod_2.6.26.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes to build the kernel module with linux 2.6.26
+
+ at DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/Makefile.26 2007-06-25 19:52:19.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/Makefile.26 2008-08-06 14:08:07.000000000 +0200
+@@ -9,11 +9,12 @@
+ obj-m := _kuname.o mol.o
+
+ PERFOBJS = $(addprefix $(obj)/, $(PERFOBJS_))
+-MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(INCLUDES) -D__ASSEMBLY__
++K_FLAGS = -Iinclude -include include/linux/autoconf.h -Iarch/ppc -Iarch/ppc/include \
++ -I$(src) -I$(src)/../../../include $(INCLUDES) -D__KERNEL__
++MOL_ASMFLAGS = $(CPPFLAGS) $(ASMFLAGS) $(K_FLAGS) -D__ASSEMBLY__
+
+ ### This is ugly, but it should fix the issues people have building as a user
+-T = "/tmp"
+-
++T = $(src)
+
+ $(obj)/_traps.o: $(src)/asm_offsets.h $(src)/traps.S $(src)/*.S $(src)/*.h
+
+@@ -29,7 +30,7 @@
+ $(obj)/_%.o: $(src)/%.S
+ @echo " AS [x] $@"
+ @rm -f $@ $@.s
+- @$(CPP) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
++ @$(CPP) $(M_INC) $(MOL_ASMFLAGS) $< | m4 -s > $@.m4
+ @ASFILTER="./asfilter" ; test -x $$ASFILTER || ASFILTER="tr ';' '\n'" ; \
+ cat $@.m4 | $$ASFILTER > $@.s
+ @$(AS) $@.s $(AS_FLAGS) -o $@
+@@ -39,7 +40,7 @@
+ $(src)/asm_offsets.h: $(src)/archinclude.h $(src)/kernel_vars.h $(src)/mac_registers.h
+ $(src)/asm_offsets.h: $(src)/asm_offsets.c $(src)/asm_offsets.inc
+ @rm -f ${T}/tmp-offsets.c $@ ; cat $^ > ${T}/tmp-offsets.c
+- @$(CC) $(CPPFLAGS) $(CFLAGS) -I$(src) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
++ @$(CC) $(CPPFLAGS) $(CFLAGS) $(K_FLAGS) -Wall -S ${T}/tmp-offsets.c -o ${T}/tmp-offsets.s
+ @echo "/* WARNING! Automatically generated from 'shared/asm_offsets.c' - DO NOT EDIT! */" > $@
+ @grep '^#' ${T}/tmp-offsets.s >> $@
+ @rm -f ${T}/tmp-offsets.*
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/dev.c mol-0.9.72.1~dfsg/src/kmod/Linux/dev.c
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/dev.c 2007-06-25 19:52:19.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/dev.c 2008-08-06 14:08:07.000000000 +0200
+@@ -85,7 +85,11 @@
+ }
+ #endif /* < Linux 2.6.21 */
+ do {
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
++ if( !(p=(int*)of_get_property(dn, "reg", &len)) || len != sizeof(int[2]) ) {
++#else
+ if( !(p=(int*)get_property(dn, "reg", &len)) || len != sizeof(int[2]) ) {
++#endif
+ of_node_put(dn);
+ return 0;
+ }
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/misc.c mol-0.9.72.1~dfsg/src/kmod/Linux/misc.c
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/misc.c 2007-06-25 19:52:19.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/misc.c 2008-08-06 14:08:07.000000000 +0200
+@@ -26,6 +26,7 @@
+
+ #define MMU kv->mmu
+
++/* Is there a better way to share between User and Kernel? */
+ kernel_vars_t *
+ alloc_kvar_pages( void )
+ {
+@@ -48,6 +49,7 @@
+ return kv;
+ }
+
++/* Releases the memory we allocated before */
+ void
+ free_kvar_pages( kernel_vars_t *kv )
+ {
+diff -urNad mol-0.9.72.1~dfsg~/src/kmod/Linux/mmu.c mol-0.9.72.1~dfsg/src/kmod/Linux/mmu.c
+--- mol-0.9.72.1~dfsg~/src/kmod/Linux/mmu.c 2007-06-25 19:52:19.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/kmod/Linux/mmu.c 2008-08-06 14:08:07.000000000 +0200
+@@ -29,6 +29,8 @@
+ void (*xx_store_pte_lowmem)( ulong *slot, int pte0, int pte1 );
+ #endif
+
++
++/* Makes a copy of the mmu context for MOL */
+ int
+ arch_mmu_init( kernel_vars_t *kv )
+ {
+
+Index: src/shared/mol-ioctl.h
+===================================================================
+--- src/shared/mol-ioctl.h (Revision 143)
++++ src/shared/mol-ioctl.h (Revision 144)
+@@ -18,6 +18,9 @@
+ #define _H_MOL_IOCTL
+
+ #ifndef __ASSEMBLY__
++#ifdef __linux__
++#include <linux/ioctl.h>
++#endif /* __linux__ */
+ #include "mmutypes.h"
+
+ typedef struct {
Property changes on: mol/trunk/debian/patches/kmod_2.6.26.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mol/trunk/debian/patches/sheep_2.6.26.dpatch
===================================================================
--- mol/trunk/debian/patches/sheep_2.6.26.dpatch (rev 0)
+++ mol/trunk/debian/patches/sheep_2.6.26.dpatch 2008-08-06 15:36:31 UTC (rev 161)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## sheep_2.6.26.dpatch by <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build fix for the sheep net driver for kernel 2.6.26, taken from SuSE (schwab at suse.de)
+
+ at DPATCH@
+diff -urNad mol-0.9.72.1~dfsg~/src/netdriver/sheep.c mol-0.9.72.1~dfsg/src/netdriver/sheep.c
+--- mol-0.9.72.1~dfsg~/src/netdriver/sheep.c 2007-06-25 19:52:17.000000000 +0200
++++ mol-0.9.72.1~dfsg/src/netdriver/sheep.c 2008-08-06 16:24:01.000000000 +0200
+@@ -82,7 +82,7 @@
+ #ifdef LINUX_26
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
+-#define compat_sk_alloc(a,b,c) sk_alloc( (a), (b), &mol_proto, 1 )
++#define compat_sk_alloc(a,b,c) sk_alloc(&init_net, (a), (b), &mol_proto)
+ #else
+ #define compat_sk_alloc(a,b,c) sk_alloc( (a), (b), (c), NULL )
+ #endif
+@@ -558,7 +558,7 @@
+ name[19] = 0;
+
+ // Find card
+- if( !(v->ether=dev_get_by_name(name)) )
++ if( !(v->ether=dev_get_by_name(&init_net, name)) )
+ return -ENODEV;
+
+ // Is it Ethernet?
Property changes on: mol/trunk/debian/patches/sheep_2.6.26.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-mol-commits
mailing list