diff options
| author | ru <ru@FreeBSD.org> | 2003-03-20 23:46:22 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-03-20 23:46:22 +0000 |
| commit | 18bbff56056cc6fd3c51a8a21a50f257c2ef1fcd (patch) | |
| tree | 616fa25a38df3d7a5594d6717c82c0beb996c3b4 /release/Makefile | |
| parent | a3529ba22b1d7664e49d97daa5966b528b494381 (diff) | |
| download | FreeBSD-src-18bbff56056cc6fd3c51a8a21a50f257c2ef1fcd.zip FreeBSD-src-18bbff56056cc6fd3c51a8a21a50f257c2ef1fcd.tar.gz | |
Pass the target machine architecture down to disklabel(8).
Do it so that systems without the -m option in disklabel(8),
e.g. 5.0-RELEASE, can still build current snapshots.
While here, drop the -s option from doFS.sh; we have not
been using the .size files for a long time.
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 659644e..7a09f5a 100644 --- a/release/Makefile +++ b/release/Makefile @@ -252,8 +252,10 @@ LOCALDIR= /usr/local/bin # ia64 is different enough that we want our own doFS.sh. .if ${TARGET_ARCH} == "ia64" DOFS_SH= ${.CURDIR}/ia64/doFS.sh +.elif ${TARGET} != ${MACHINE} +DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${TARGET} .else -DOFS_SH= ${.CURDIR}/scripts/doFS.sh +DOFS_SH= ${.CURDIR}/scripts/doFS.sh "" .endif .if ${TARGET_ARCH} == "sparc64" @@ -726,7 +728,7 @@ release.9: ${.CURDIR}/${TARGET}/drivers-small.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules .endif - sh -e ${DOFS_SH} -s mfsroot ${RD} ${MNT} \ + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} @gzip -9vc mfsroot > mfsroot.gz @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ @@ -753,7 +755,7 @@ release.9: *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ fi .endif - sh -e ${DOFS_SH} -s mfsroot ${RD} ${MNT} \ + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} @gzip -9vc mfsroot > mfsroot.gz @mkdir -p ${RD}/mfsroot |
