[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: kernel-package sparc confusion



On Mon, Nov 10, 2003 at 08:49:59PM -0600, Manoj Srivastava wrote:
> 	OK. This is going into the new version.

I'm not sure what's in 8.069, but the attached patch against 8.068 adds
back in setting KPKG_SUBARCH if it's not set, and also sets KERNEL_ARCH
properly (without an extra endif).

Regards,
Rob Radez

--- kernel-package-8.068/kernel/rules.orig	2003-11-12 10:11:40.000000000 -0500
+++ kernel-package-8.068/kernel/rules	2003-11-12 10:11:46.000000000 -0500
@@ -355,15 +355,22 @@
 DEBCONFIG = $(CONFDIR)/config.sparc
 ARCH_IN_NAME = YES
 
-  ifneq (,$(filter sparc64%,$(KPKG_SUBARCH)))
-    KERNEL_ARCH = sparc64
-  else
-    ifneq (,$(filter sparc%,$(KPKG_SUBARCH)))
-      KERNEL_ARCH = sparc
-    else
-      KERNEL_ARCH = $(strip $(shell uname -m))
-    endif
-  endif
+ifeq (,$(KPKG_SUBARCH))
+ ifeq (sparc64,$(strip $(shell uname -m)))
+  KPKG_SUBARCH = sparc64
+ else
+  KPKG_SUBARCH = sparc32
+ endif
+endif
+
+ifneq (,$(filter sparc64%,$(KPKG_SUBARCH)))
+ KERNEL_ARCH = sparc64
+else
+ ifneq (,$(filter sparc%,$(KPKG_SUBARCH)))
+  KERNEL_ARCH = sparc
+ else
+  KERNEL_ARCH = $(strip $(shell uname -m))
+ endif
 endif
 
 ifneq ($(shell if [ $(VERSION) -ge 2 -a $(PATCHLEVEL) -ge 5 -a  \



Reply to: