Accept the fact that floppies either aren't applicable or relevant on most
platforms. So make the floppy logic easier to read.
This commit is contained in:
parent
5e6db16cd6
commit
b9e0905e14
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=133824
@ -169,6 +169,7 @@ MNT= /mnt
|
||||
#
|
||||
|
||||
.if ${TARGET_ARCH} == "i386"
|
||||
FLOPPIES= true
|
||||
.if ${TARGET} == "pc98"
|
||||
SMALLFLOPPYSIZE= 1200
|
||||
SMALLFLOPPYSPLITSIZE= 1152
|
||||
@ -184,6 +185,7 @@ MFSSIZE= 4320
|
||||
MFSINODE= 8000
|
||||
MFSLABEL= minimum3
|
||||
.elif ${TARGET_ARCH} == "alpha"
|
||||
FLOPPIES= true
|
||||
FLOPPYSIZE= 1440
|
||||
FLOPPYSPLITSIZE= 1392
|
||||
FLOPPYINODE= 40000
|
||||
@ -199,17 +201,14 @@ MFSSIZE= 4096
|
||||
MFSINODE= 8192
|
||||
MFSLABEL= auto
|
||||
MINIROOT=
|
||||
NO_FLOPPIES=
|
||||
.elif ${TARGET_ARCH} == "ia64"
|
||||
MFSSIZE= 8192
|
||||
MFSINODE= 8192
|
||||
MFSLABEL= auto
|
||||
NO_FLOPPIES=
|
||||
.elif ${TARGET_ARCH} == "amd64"
|
||||
MFSSIZE= 4096
|
||||
MFSINODE= 8192
|
||||
MFSLABEL= auto
|
||||
NO_FLOPPIES=
|
||||
.endif
|
||||
|
||||
.if exists(/sbin/bsdlabel)
|
||||
@ -251,7 +250,7 @@ CRUNCH_TARGETS+=fixit-small
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined(NO_FLOPPIES)
|
||||
.if defined(FLOPPIES)
|
||||
EXTRAS= floppies.1
|
||||
.if ${TARGET_ARCH} == "i386"
|
||||
EXTRAS+= floppies.2
|
||||
@ -447,7 +446,7 @@ release rerelease:
|
||||
NOSRC \
|
||||
NO_CPU_CFLAGS \
|
||||
NO_CPU_COPTFLAGS \
|
||||
NO_FLOPPIES \
|
||||
FLOPPIES \
|
||||
NO_SENDMAIL \
|
||||
RELEASETAG \
|
||||
RELNOTES_LANG \
|
||||
@ -513,7 +512,7 @@ release.1:
|
||||
-chflags -R noschg ${_R}/.
|
||||
rm -rf ${_R}/*
|
||||
mkdir ${RD}
|
||||
.if !defined(NO_FLOPPIES)
|
||||
.if defined(FLOPPIES)
|
||||
mkdir ${RD}/floppies
|
||||
.endif
|
||||
mkdir ${RD}/trees
|
||||
@ -825,7 +824,7 @@ ftp.1:
|
||||
@echo "Setting up FTP distribution area"
|
||||
@mkdir -p ${FD}
|
||||
-@ln -s . ${FD}/${BUILDNAME}
|
||||
.if !defined(NO_FLOPPIES)
|
||||
.if defined(FLOPPIES)
|
||||
@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
|
||||
.endif
|
||||
@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
|
||||
@ -858,7 +857,7 @@ cdrom.1:
|
||||
@echo "Setting up CDROM distribution area"
|
||||
@mkdir -p ${CD_BOOT} ${CD_DISC1} ${CD_DISC2}
|
||||
-@ln -s . ${CD_DISC1}/${BUILDNAME}
|
||||
.if !defined(NO_FLOPPIES)
|
||||
.if defined(FLOPPIES)
|
||||
@cd ${RD} && find floppies -print | cpio -dumpl ${CD_DISC1}
|
||||
.endif
|
||||
@cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DISC1}
|
||||
|
Loading…
Reference in New Issue
Block a user