1
0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00

Retire -E's "expert" mode. Introduced 23 years ago to avoid

confusing users with FFS attributes that only experts should
fiddle with. Actual use has withered away with functionality
rendered moot or moved elsewhere.

'-e' remains for the truly obscure corner cases.

Simply excise the code for now to see if hidden users/uses are
exposed.  Further simplifications are possible if no such
users/uses surface.

ok with sthen@ millert@ kn@ otto@
This commit is contained in:
krw 2023-04-28 08:45:24 +00:00
parent 95cce6dbe5
commit c2ec81004a
20 changed files with 60 additions and 60 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2023/04/26 14:42:27 krw Exp $
# $OpenBSD: Makefile,v 1.25 2023/04/28 08:45:24 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 5760
@ -68,7 +68,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -77,7 +77,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2023/04/26 20:59:32 krw Exp $
# $OpenBSD: Makefile,v 1.18 2023/04/28 08:45:25 krw Exp $
FS= floppy${OSrev}.img
FSSIZE= 2880
@ -38,7 +38,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -47,7 +47,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.37 2023/04/24 17:07:34 krw Exp $
# $OpenBSD: Makefile,v 1.38 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 11392
@ -62,7 +62,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -71,7 +71,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2023/04/24 16:21:43 krw Exp $
# $OpenBSD: Makefile,v 1.28 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 88064
@ -71,7 +71,7 @@ ${FS}: bsd.rd
vnconfig -u `cat vnd`
rm -f vnd
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -80,7 +80,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2021/07/26 12:47:45 kn Exp $
# $OpenBSD: Makefile,v 1.29 2023/04/28 08:45:25 krw Exp $
MTREE= ${UTILS}/mtree.conf
RAMDISK= RAMDISK
@ -11,7 +11,7 @@ MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096
all: bsd.rd
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -20,7 +20,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.48 2021/07/26 12:47:45 kn Exp $
# $OpenBSD: Makefile,v 1.49 2023/04/28 08:45:25 krw Exp $
LIF= lif${OSrev}.img
CDROM= cd${OSrev}.iso
@ -32,7 +32,7 @@ ${CDROM}: bsd.rd
bsd.lif: bsd.rd
(cat bsd.rd ; dd if=/dev/zero count=1) | gzip -9n > bsd.lif
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
strip -R .SUNW_ctf bsd.rd
@ -42,7 +42,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2023/04/26 14:42:27 krw Exp $
# $OpenBSD: Makefile,v 1.19 2023/04/28 08:45:25 krw Exp $
FS= floppy${OSrev}.img
FSSIZE= 2880
@ -35,7 +35,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -44,7 +44,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2023/04/26 14:42:27 krw Exp $
# $OpenBSD: Makefile,v 1.30 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 8448
@ -54,7 +54,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -63,7 +63,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2023/04/26 14:42:27 krw Exp $
# $OpenBSD: Makefile,v 1.36 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 5120
@ -35,7 +35,7 @@ ${FS}: bsd.gz
bsd.gz: bsd.rd
gzip -9cn bsd.rd > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -44,7 +44,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2022/09/11 11:12:39 krw Exp $
# $OpenBSD: Makefile,v 1.34 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 18432
@ -50,7 +50,7 @@ ${CDROM}: bsd.rd
bsd.strip: bsd.rd
objcopy -S -R .comment -R .SUNW_ctf bsd.rd bsd.strip
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -59,7 +59,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2021/07/26 12:47:46 kn Exp $
# $OpenBSD: Makefile,v 1.33 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 8192
@ -32,7 +32,7 @@ ${FS}: bsd.rd
vnconfig -u `cat vnd`
rm -f vnd
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -41,7 +41,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.52 2021/11/11 20:25:56 kn Exp $
# $OpenBSD: Makefile,v 1.53 2023/04/28 08:45:25 krw Exp $
CDROM= cd${OSrev}.iso
MTREE= ${UTILS}/mtree.conf
@ -34,7 +34,7 @@ MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096
bsd.gz: bsd.rd
gzip -9cn bsd.rd > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
objcopy -g -x -R .comment -R .SUNW_ctf \
-K rd_root_size -K rd_root_image \
bsd bsd.rd
@ -45,7 +45,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2022/09/11 15:05:27 krw Exp $
# $OpenBSD: Makefile,v 1.23 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 24576
@ -33,7 +33,7 @@ ${FS}: bsd.rd
vnconfig -u `cat vnd`
rm -f vnd
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -42,7 +42,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2023/04/24 16:21:43 krw Exp $
# $OpenBSD: Makefile,v 1.7 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 67584
@ -43,7 +43,7 @@ ${FS}: bsd.rd
vnconfig -u `cat vnd`
rm -f vnd
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -52,7 +52,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2023/04/24 16:21:43 krw Exp $
# $OpenBSD: Makefile,v 1.8 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 67584
@ -41,7 +41,7 @@ ${FS}: bsd.rd
vnconfig -u `cat vnd`
rm -f vnd
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -50,7 +50,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
.for DIR in ${DIRS}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2023/04/26 20:59:32 krw Exp $
# $OpenBSD: Makefile,v 1.30 2023/04/28 08:45:25 krw Exp $
FS= miniroot${OSrev}.img
FSSIZE= 6400
@ -64,7 +64,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -73,7 +73,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2023/04/26 20:59:32 krw Exp $
# $OpenBSD: Makefile,v 1.56 2023/04/28 08:45:25 krw Exp $
FS= floppy${OSrev}.img
FSSIZE= 2880
@ -37,7 +37,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -46,7 +46,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2023/04/26 20:59:32 krw Exp $
# $OpenBSD: Makefile,v 1.52 2023/04/28 08:45:26 krw Exp $
FS= floppyB${OSrev}.img
FSSIZE= 2880
@ -37,7 +37,7 @@ bsd.gz: bsd.rd
bsd.rd bsd.strip
gzip -9cn bsd.strip > bsd.gz
bsd.rd: mr.fs bsd
bsd.rd: mr.fs
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
@ -46,7 +46,7 @@ bsd:
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE} ${MFLAGS}'
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
mr.fs: instbin bsd
rm -rf $@.d
install -d -o root -g wheel $@.d
mtree -def ${MTREE} -p $@.d -u

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2023/04/25 12:13:15 krw Exp $
# $OpenBSD: Makefile,v 1.11 2023/04/28 08:45:26 krw Exp $
NOMAN=
#MAN= boot.8
@ -20,7 +20,7 @@ rdboot: ${RDBOOT}
cp -p ${RDBOOT} rdboot
strip rdboot
mr.fs: rdboot
mr.fs: rdboot bsd
rm -rf $@.d
install -d -o root -g wheel $@.d/dev
install -d -o root -g wheel $@.d/mnt
@ -29,7 +29,7 @@ mr.fs: rdboot
cd $@.d/dev && sh ${DESTDIR}/dev/MAKEDEV boot
makefs ${MRMAKEFSARGS} $@ $@.d
boot: bsd mr.fs
boot: mr.fs
cp bsd boot
rdsetroot boot mr.fs

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2023/04/25 12:13:15 krw Exp $
# $OpenBSD: Makefile,v 1.4 2023/04/28 08:45:26 krw Exp $
NOMAN=
#MAN= boot.8
@ -20,7 +20,7 @@ rdboot: ${RDBOOT}
cp -p ${RDBOOT} rdboot
strip rdboot
mr.fs: rdboot
mr.fs: rdboot bsd
rm -rf $@.d
install -d -o root -g wheel $@.d/dev
install -d -o root -g wheel $@.d/mnt
@ -29,7 +29,7 @@ mr.fs: rdboot
cd $@.d/dev && sh ${DESTDIR}/dev/MAKEDEV boot
makefs ${MRMAKEFSARGS} $@ $@.d
boot: bsd mr.fs
boot: mr.fs
cp bsd boot
rdsetroot boot mr.fs