summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-07-30 07:40:45 +0000
committerru <ru@FreeBSD.org>2003-07-30 07:40:45 +0000
commit3d0b5cd4b5800ca7741652f6f1a9ad5474456c8e (patch)
treef6c5102eb88028df85d074fce96660c1c99c62fe
parent83d78951a724300dbcaf55f425a2b25bc1109472 (diff)
downloadFreeBSD-src-3d0b5cd4b5800ca7741652f6f1a9ad5474456c8e.zip
FreeBSD-src-3d0b5cd4b5800ca7741652f6f1a9ad5474456c8e.tar.gz
Embed a simplistic version of the dokern.sh script directly into
release/Makefile. Reviewed by: marcel The original patch also removed ia64/dokern.sh, but this was OBE.
-rw-r--r--release/Makefile10
-rw-r--r--release/sparc64/dokern.sh6
2 files changed, 7 insertions, 9 deletions
diff --git a/release/Makefile b/release/Makefile
index 92a6888..703848b 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1029,9 +1029,13 @@ installCRUNCH:
doMFSKERN:
@echo "Running ${.TARGET} for ${FSIMAGE}"
@rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
- @cd ${.CURDIR}/../sys/${TARGET}/conf && \
- sh ${.CURDIR}/${TARGET}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \
- [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints
+ @cd ${.CURDIR}/../sys/${TARGET}/conf; \
+ if [ -r ${.CURDIR}/${TARGET}/dokern.sh ]; then \
+ sh ${.CURDIR}/${TARGET}/dokern.sh ${FDSIZE}; \
+ else \
+ sed -e 's/ident.*GENERIC/ident BOOTMFS/g'; \
+ fi < GENERIC > BOOTMFS; \
+ [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints
.if defined(FDSIZE) && ${FDSIZE} == "SMALL" && \
exists(${.CURDIR}/${TARGET}/drivers-small.conf)
@awk -f ${.CURDIR}/scripts/driver-remove.awk \
diff --git a/release/sparc64/dokern.sh b/release/sparc64/dokern.sh
deleted file mode 100644
index 5882014..0000000
--- a/release/sparc64/dokern.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-sed -e 's/ident.*GENERIC/ident BOOTMFS/g'
OpenPOWER on IntegriCloud