Page MenuHomeFreeBSD

D42444.diff
No OneTemporary

D42444.diff

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1677,15 +1677,10 @@
KERNCONF=${KERNFAST}
.endif
.endif
-.if ${TARGET_ARCH} == "powerpc64"
-KERNCONF?= GENERIC64
-.elif ${TARGET_ARCH} == "powerpc64le"
-KERNCONF?= GENERIC64LE
-.elif ${TARGET_ARCH} == "powerpcspe"
-KERNCONF?= MPC85XXSPE
-.else
-KERNCONF?= GENERIC
-.endif
+GENERIC_KERNCONF_SUFX_powerpc64= 64
+GENERIC_KERNCONF_SUFX_powerpc64le= 64LE
+GENERIC_KERNCONF_powerpcspe= MPC85XXSPE
+GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}}
INSTKERNNAME?= kernel
KERNSRCDIR?= ${.CURDIR}/sys
@@ -1693,6 +1688,23 @@
KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,}
KERNCONFDIR?= ${KRNLCONFDIR}
+.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM
+.if exists(${KERNCONFDIR}/${_k})
+PKG_KERNCONF+= ${_k}
+.for _dbg in NODEBUG DEBUG
+.if exists(${KERNCONFDIR}/${_k}-${_dbg})
+PKG_KERNCONF+= ${_k}-${_dbg}
+.endif
+.endfor
+.endif
+.endfor
+
+.if defined(PACKAGE_BUILDING)
+KERNCONF?= ${PKG_KERNCONF}
+.else
+KERNCONF?= ${GENERIC_KERNCONF}
+.endif
+
BUILDKERNELS=
INSTALLKERNEL=
.if defined(NO_INSTALLKERNEL)

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 8:43 AM (9 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25540488
Default Alt Text
D42444.diff (1 KB)

Event Timeline