diff options
| author | jhb <jhb@FreeBSD.org> | 2000-07-01 21:48:05 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-07-01 21:48:05 +0000 |
| commit | 25b55aa14916cf839d36c03f0be370ebe1876658 (patch) | |
| tree | 3632d15d5b2937ced43931ff9edbc0dfa10d1505 /release | |
| parent | 7f576169bf2d869115464b4fd28ae8c29723dcd4 (diff) | |
| download | FreeBSD-src-25b55aa14916cf839d36c03f0be370ebe1876658.zip FreeBSD-src-25b55aa14916cf839d36c03f0be370ebe1876658.tar.gz | |
- Build modules with world so that modules are back in the bin dist.
- Small cleanups to kernel installs.
- Don't install kernel.config and loader.config on the boot floppy since
they haven't been used in quite some time.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile index 5eff560..4713e38 100644 --- a/release/Makefile +++ b/release/Makefile @@ -253,6 +253,7 @@ rerelease release: echo "export BUILDNAME=${BUILDNAME}" >> ${CHROOTDIR}/mk echo "export VNDEVICE=${VNDEVICE}" >> ${CHROOTDIR}/mk echo "export OBJFORMAT=${OBJFORMAT}" >> ${CHROOTDIR}/mk + echo "export MODULES_WITH_WORLD=YES" >> ${CHROOTDIR}/mk .if defined(RELEASETAG) echo "export RELEASETAG=${RELEASETAG}" >> ${CHROOTDIR}/mk .endif @@ -357,7 +358,7 @@ release.3: rm -rf ${.CURDIR}/../sys/compile/${kernel} cd ${.CURDIR} && ${MAKE} doKERNEL KERNEL=${kernel} rm -rf ${.CURDIR}/../sys/compile/${kernel} - ln -f ${RD}/kernels/${kernel} ${RD}/trees/bin/kernel.${kernel} + cp ${RD}/kernels/${kernel} ${RD}/trees/bin/kernel.${kernel} .endfor touch release.3 @@ -749,10 +750,9 @@ doKERNEL: @rm -f ${RD}/kernels/${KERNEL} @cd ${.CURDIR}/../sys/${MACHINE}/conf && config ${KERNEL} @cd ${.CURDIR}/../sys/compile/${KERNEL} && \ - make depend && \ + make kernel-depend && \ make ${KERNEL} && \ - strip --strip-debug ${KERNEL} && \ - cp ${KERNEL} ${RD}/kernels/${KERNEL} + make kernel-reinstall DESTDIR=${RD}/kernels # # --==## Put a filesystem into a BOOTMFS kernel ##==-- @@ -773,6 +773,7 @@ doMFSKERN: @cd ${.CURDIR} && ${MAKE} doKERNEL KERNEL=BOOTMFS @rm -rf ${RD}/image.${FSIMAGE} @mkdir ${RD}/image.${FSIMAGE} + @chflags noschg ${RD}/kernels/BOOTMFS @strip ${RD}/kernels/BOOTMFS @cp ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE} mv ${RD}/kernels/BOOTMFS ${RD}/image.${FSIMAGE}/kernel @@ -788,7 +789,6 @@ doMFSKERN: .endif @echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc - @touch ${RD}/image.${FSIMAGE}/boot/loader.config .if ${MACHINE_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} @echo "-P" >> ${RD}/image.${FSIMAGE}/boot.config .endif @@ -798,7 +798,6 @@ doMFSKERN: @cp ${RD}/image.${FSIMAGE}/kernel ${RD}/kernels/MFSKERNEL.${FSIMAGE} .endif @gzip -9v ${RD}/image.${FSIMAGE}/kernel - @touch ${RD}/image.${FSIMAGE}/kernel.config @rm -f ${RD}/floppies/${FSIMAGE}.flp .if defined(BIGBOOT) sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \ |
