diff options
| author | ru <ru@FreeBSD.org> | 2003-04-23 09:01:35 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-04-23 09:01:35 +0000 |
| commit | 560225c4701568b026e83f60ab0c09ddf7f1edcc (patch) | |
| tree | 0f2895d8362521000b9aca2a72af4108166aa923 /release | |
| parent | 14fc0ea5a46713c368bf8a252e48a32aed97aacb (diff) | |
| download | FreeBSD-src-560225c4701568b026e83f60ab0c09ddf7f1edcc.zip FreeBSD-src-560225c4701568b026e83f60ab0c09ddf7f1edcc.tar.gz | |
Presumably fix sparc64 "make release". (The breakage was due to
sunlabel(8) no longer being linked to disklabel(8).)
Reviewed by: phk
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 12 | ||||
| -rw-r--r-- | release/ia64/doFS.sh | 2 | ||||
| -rw-r--r-- | release/scripts/doFS.sh | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile index 3d43d8b..82598f6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -200,6 +200,7 @@ FIXITLABEL= minimum2 MFSLABEL= auto BIGBOOTLABEL= minimum2 .elif ${TARGET_ARCH} == "sparc64" +DISKLABEL= sunlabel BIGBOOTSIZE= 4096 MFSSIZE= 4096 BOOTINODE= 8192 @@ -215,6 +216,8 @@ MFSLABEL= auto MFSSIZE= 8192 .endif +DISKLABEL?= disklabel + ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k - # Things that need to be recompiled with Kerberos support. @@ -245,13 +248,12 @@ CD_DISC2= ${CD}/disc2 # Where the bootstrap ports (see DOCPORTS) get installed. 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 +.if exists(${.CURDIR}/${TARGET_ARCH}/doFS.sh) +DOFS_SH= ${.CURDIR}/${TARGET_ARCH}/doFS.sh .elif ${TARGET} != ${MACHINE} -DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${TARGET} +DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ${TARGET} .else -DOFS_SH= ${.CURDIR}/scripts/doFS.sh "" +DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} "" .endif .if ${TARGET_ARCH} == "sparc64" diff --git a/release/ia64/doFS.sh b/release/ia64/doFS.sh index 816284b..6c2aa1e 100644 --- a/release/ia64/doFS.sh +++ b/release/ia64/doFS.sh @@ -20,7 +20,7 @@ FSLABEL=$1 ; shift if [ x$FSLABEL != "xefi" ]; then DOFS_SH=`dirname $0`/../scripts/`basename $0` echo "Transferring control to $DOFS_SH..." - exec sh $DOFS_SH ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL + exec sh $DOFS_SH disklabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL fi export BLOCKSIZE=512 diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh index 8aa51ec..d4fbfc1 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -7,6 +7,7 @@ set -ex export BLOCKSIZE=512 +DISKLABEL=$1; shift MACHINE=${1:+"-m $1"}; shift FSIMG=$1; shift RD=$1 ; shift @@ -103,7 +104,7 @@ dofs_md () { trap "umount ${MNT}; mdconfig -d -u ${MDDEVICE}" EXIT - disklabel ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL} + ${DISKLABEL} ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL} newfs -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c mount /dev/${MDDEVICE}c ${MNT} |
