package: kernel-package
version: 11.001
tags: patch
severity: wishlist

n.b.: This patch needs to add a check for when the x86 architecture
merger happened (i.e., if it's after 2.6.24, we need to use
KERNEL_ARCH=x86, before that, i386 or x86_64).  This was a quick kludge
that I threw together so make-kpkg would still be useful on modern
kernels.

Index: kernel-package/ruleset/misc/kernel_arch.mk
===================================================================
--- kernel-package.orig/ruleset/misc/kernel_arch.mk
+++ kernel-package/ruleset/misc/kernel_arch.mk
@@ -38,8 +38,11 @@
 # Apparently, DEB_HOST_ARCH_CPU does not match what the kernel calls this. 
 # However, DEB_HOST_GNU_CPU does. Anyway, we have to hack around it
 KERNEL_ARCH:=$(architecture)
+ifeq ($(architecture), i386)
+  KERNEL_ARCH:=x86
+endif
 ifeq ($(architecture), amd64)
-  KERNEL_ARCH:=x86_64
+  KERNEL_ARCH:=x86
 endif
 ifeq ($(architecture), mipsel)
   KERNEL_ARCH:=mips
Index: kernel-package/ruleset/targets/headers.mk
===================================================================
--- kernel-package.orig/ruleset/targets/headers.mk
+++ kernel-package/ruleset/targets/headers.mk
@@ -76,6 +76,9 @@ install/$(h_package):
        test ! -e arch/$(KERNEL_ARCH)/Makefile.cpu ||                           
  \
                                 $(install_file) 
arch/$(KERNEL_ARCH)/Makefile.cpu  \
                                                      
$(SRCDIR)/arch/$(KERNEL_ARCH)
+       test ! -e arch/$(KERNEL_ARCH)/Makefile_32.cpu ||                        
  \
+                                $(install_file) 
arch/$(KERNEL_ARCH)/Makefile_32.cpu \
+                                                     
$(SRCDIR)/arch/$(KERNEL_ARCH)
        test ! -e Rules.make     || $(install_file) Rules.make     $(SRCDIR)
        test ! -e Module.symvers || $(install_file) Module.symvers $(SRCDIR)
 ifneq ($(strip $(int_follow_symlinks_in_src)),)



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to