From: krw Date: Mon, 24 Apr 2023 15:31:14 +0000 (+0000) Subject: Change variable 'DISKTYPE' to 'FSDISKTYPE' like every other arch. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b2d0616c240b9fa6a5513e2cfd035622cae9f583;p=openbsd Change variable 'DISKTYPE' to 'FSDISKTYPE' like every other arch. No functional change. ok patrick@ --- diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index b1967e80823..753c7c8efba 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.30 2023/02/10 15:54:33 krw Exp $ +# $OpenBSD: Makefile.inc,v 1.31 2023/04/24 15:31:14 krw Exp $ FS= miniroot-${BOARD}-${OSrev}.img FSSIZE= 71424 # ffs+msdos, actually @@ -6,7 +6,7 @@ MOUNT_POINT= /mnt MKUBOOT?= mkuboot -DISKTYPE= miniroot +FSDISKTYPE= miniroot MSDOSSTART= 32768 MSDOSSIZE= 8192 @@ -17,7 +17,7 @@ all: ${FS} ${FS}: bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} - vnconfig -v -t ${DISKTYPE} ${FS} > vnd + vnconfig -v -t ${FSDISKTYPE} ${FS} > vnd fdisk -iy -b "${MSDOSSIZE}@${MSDOSSTART}:c" `cat vnd` >/dev/null echo '/ *' | disklabel -wAT- `cat vnd` newfs -O 1 -t msdos -L boot /dev/r`cat vnd`i