From: Simon Schubert <corecode@dragonflybsd.org>
Date: Mon, 14 Sep 2009 22:47:58 +0000 (+0200)
Subject: buildkernel, nrelease: use AMD64_GENERIC as kernel default config
X-Git-Url: https://gitweb.dragonflybsd.org/~syl/dragonfly.git/commitdiff_plain/702a95cc5a96bcc8b869d9c49c8c2b61292b94cd

buildkernel, nrelease: use AMD64_GENERIC as kernel default config

buildkernel and nrelease both defaulted to GENERIC as kernel.  This does
not work for amd64 builds, since GENERIC is i386.

Add a makeshift hack by selecting AMD64_GENERIC if we're buildin for/on
amd64.  This needs to go away and be solved in a more sensible way.

Ok: dillon@
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 656dbc3a8b..9e5aed0374 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -481,7 +481,13 @@ reinstall:
 KERNCONF=	${KERNEL}
 KERNWARN=	yes
 .else
+# XXX makeshift fix to build the right kernel for the (target) architecture
+# We should configure this in the platform files somehow
+.if ${TARGET_ARCH} == "i386"
 KERNCONF?=	GENERIC
+.else
+KERNCONF?=	AMD64_GENERIC
+.endif
 .endif
 INSTKERNNAME?=	kernel
 
diff --git a/nrelease/Makefile b/nrelease/Makefile
index 91ed68b49f..534d19ac1e 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -24,7 +24,13 @@ MAKE_JOBS?=	$$(sysctl -n hw.ncpu)
 .if make(gui)
 KERNCONF ?= DFLYLIVE VKERNEL DFLYLIVE-SMP DFLYLIVE-SMP-NOAPIC
 .else
+# XXX makeshift fix to build the right kernel for the (target) architecture
+# We should configure this in the platform files somehow
+.if ${MACHINE_ARCH} == "i386"
 KERNCONF ?= GENERIC VKERNEL
+.else
+KERNCONF ?= AMD64_GENERIC
+.endif
 .endif
 
 PKGSRC_PREFIX?=		/usr/pkg