Re: kernel-package sparc confusion
On Tue, Oct 07, 2003 at 01:53:48PM -0400, Ben Collins wrote:
> The logic I wanted was, if KPKG_SUBARCH is set, leave it. If it is
> unset, set it according to "uname -m" (that is sparc32 for "uname ==
> sparc" and sparc64 for "uname == sparc64").
In my limited amount of testing, the attached patch seems to be doing the
right thing on sparc32 and sparc64. By limited, I mean I've tried not
setting subarch, setting it to foo, sparc64-foo, sparc64, sparc32-foo,
and sparc32. It's a simple patch; it just breaks up setting
KPKG_SUBARCH, if necessary, into a separate operation than setting
KERNEL_ARCH. Ben, if you wouldn't mind testing to make sure it doesn't
break anything for you, I would really appreciate it.
Regards,
Rob Radez
(patch is against /usr/share/kernel-package/rules, kernel-package 8.066)
--- rules.orig 2003-11-01 10:34:51.000000000 -0500
+++ rules 2003-11-01 10:42:02.000000000 -0500
@@ -348,19 +348,31 @@
DEBCONFIG = $(CONFDIR)/config.sparc
ARCH_IN_NAME = YES
+ifeq (,$(KPKG_SUBARCH))
+ TMP = $(strip $(shell uname -m))
+ ifeq (sparc64,$(TMP))
+ KPKG_SUBARCH = sparc64
+ else
+ KPKG_SUBARCH = sparc32
+ endif
+endif
+
ifneq (,$(filter sparc64%,$(KPKG_SUBARCH)))
-KERNEL_ARCH = sparc64
+ KERNEL_ARCH = sparc64
else
- ifeq ($(KPKG_SUBARCH),sparc64)
- KERNEL_ARCH = sparc64
+ ifeq ($(KPKG_SUBARCH),sparc64)
+ KERNEL_ARCH = sparc64
+ else
+ ifneq (,$(filter sparc32%,$(KPKG_SUBARCH)))
+ KERNEL_ARCH = sparc
else
+ ifeq ($(KPKG_SUBARCH),sparc32)
+ KERNEL_ARCH = sparc
+ else
KERNEL_ARCH = $(strip $(shell uname -m))
- ifneq (,$(filter sparc%,$(KPKG_SUBARCH)))
- KERNEL_ARCH = sparc
- else
- KPKG_SUBARCH = sparc64
- endif
+ endif
endif
+ endif
endif
ifneq ($(shell if [ $(VERSION) -ge 2 -a $(PATCHLEVEL) -ge 5 -a \
Reply to: