Followup-For: Bug #445430 Package: et131x-source Version: 1.2.3-5 *** Please type your report below this line *** Hi
The recent upload of et131x 1.2.3-5 adapted for new API changes in kernel
2.6.24, the API differences caused by kernel 2.6.23 (which are still valid
for 2.6.24) are causing build failures against kernel 2.6.23 and 2.6.24.
The attached "debdiff_bts445430_bts445431.diff", contains the difference to
a working and tested package[1] building against (at least) kernel 2.6.22,
2.6.23 and 2.6.24 (broken out in
"03_et131x-1.2.3-2.6.23.kmem_cache_create.patch"), furthermore it fixes
the $(MAKE) invocation of the binary-modules target in debian/rules
(#445431) with kernel-package/ make-kpkg and module-assistant (which
currently only succeeds if the modules are to be built against the
currently running kernel, in all other cases it silently builds against the
running kernel sources/ header while it claims to build against the
specified kernel version).
Proposed changelog entries:
* add kernel 2.6.23 compatibility (Closes: #445430).
* fix module build against correct kernel sources/ header (Closes: #445431).
Regards
Stefan Lippers-Hollmann
[1]
http://sidux.com/debian/pool/fix.main/e/et131x/et131x_1.2.3-5+c0.sidux.2.dsc
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-rc5-git3-slh64-smp-1 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages et131x-source depends on:
ii bzip2 1.0.3-7 high-quality block-sorting file co
ii debhelper 5.0.62 helper programs for debian/rules
ii make 3.81-3 The GNU version of the "make" util
ii module-assistant 0.10.11 tool to make module package creati
ii quilt 0.46-4 Tool to work with series of patche
et131x-source recommends no packages.
-- no debconf information
diff -u et131x-1.2.3/debian/patches/series et131x-1.2.3/debian/patches/series --- et131x-1.2.3/debian/patches/series +++ et131x-1.2.3/debian/patches/series @@ -2,2 +2,3 @@ 02_et131x-1.2.3-2.6.21.kmem.patch -p0 +03_et131x-1.2.3-2.6.23.kmem_cache_create.patch -p0 03_et131x-1.2.3-2.6.24_by_slh.patch -p0 --- et131x-1.2.3.orig/debian/patches/03_et131x-1.2.3-2.6.23.kmem_cache_create.patch +++ et131x-1.2.3/debian/patches/03_et131x-1.2.3-2.6.23.kmem_cache_create.patch @@ -0,0 +1,12 @@ +--- ET1310_rx.c 2007-02-27 15:13:07.000000000 +0100 ++++ ../../ET1310_rx.c 2007-09-03 23:08:27.000000000 +0200 +@@ -532,7 +532,9 @@ int et131x_rx_dma_memory_alloc( ET131X_A + 0, + SLAB_CACHE_DMA | + SLAB_HWCACHE_ALIGN, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) + NULL, ++#endif + NULL ); + + diff -u et131x-1.2.3/debian/rules et131x-1.2.3/debian/rules --- et131x-1.2.3/debian/rules +++ et131x-1.2.3/debian/rules @@ -97,7 +97,7 @@ dh_clean -k dh_installdirs lib/modules/$(KVERS)/extra # Build the module - $(MAKE) KERNEL_SRC=$(KSRC) KVERS=$(KVERS) + $(MAKE) KERNEL_SRC=$(KSRC) KERNEL_VER=$(KVERS) KERNEL_DIR=$(KSRC) # Install the module cp et131x.$ko debian/$(PKGNAME)/lib/modules/$(KVERS)/extra
--- ET1310_rx.c 2007-02-27 15:13:07.000000000 +0100
+++ ../../ET1310_rx.c 2007-09-03 23:08:27.000000000 +0200
@@ -532,7 +532,9 @@ int et131x_rx_dma_memory_alloc( ET131X_A
0,
SLAB_CACHE_DMA |
SLAB_HWCACHE_ALIGN,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23))
NULL,
+#endif
NULL );
signature.asc
Description: This is a digitally signed message part.
