Presumably fix sparc64 "make release". (The breakage was due to
sunlabel(8) no longer being linked to disklabel(8).) Reviewed by: phk
This commit is contained in:
parent
af16b40ba9
commit
c9030dc84d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=113899
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user