summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-05-01 20:53:56 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-05-01 20:53:56 +0000
commit13e9c0e0bca80267260f8aaa95143e633a1856c5 (patch)
tree76835afaf93425a08d38c7b4bf27ee784bc1accd /distrib
parent47697d3d39f990de4e67390ceb47c2decb190fca (diff)
verbose mkhybrid was never needed on these arch
Diffstat (limited to 'distrib')
-rw-r--r--distrib/amd64/iso/Makefile4
-rw-r--r--distrib/amd64/ramdisk_cd/Makefile4
-rw-r--r--distrib/i386/iso/Makefile4
-rw-r--r--distrib/i386/ramdisk_cd/Makefile4
-rw-r--r--distrib/loongson/ramdisk/Makefile4
-rw-r--r--distrib/macppc/iso/Makefile4
-rw-r--r--distrib/macppc/ramdisk/Makefile4
-rw-r--r--distrib/sgi/cdfs/Makefile11
8 files changed, 20 insertions, 19 deletions
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index 75c81a8a45b..e92f8fcd563 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2019/04/30 23:37:31 deraadt Exp $
+# $OpenBSD: Makefile,v 1.32 2019/05/01 20:53:55 deraadt Exp $
FS= install${OSrev}.fs
FSSIZE= 921536
@@ -79,7 +79,7 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
- mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index ba821c28920..d710e75961e 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/04/30 23:37:31 deraadt Exp $
+# $OpenBSD: Makefile,v 1.18 2019/05/01 20:53:55 deraadt Exp $
FS= miniroot${OSrev}.fs
FSSIZE= 9600
@@ -45,7 +45,7 @@ ${CDROM}: bsd.rd
cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/amd64
cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64
cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot
- mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} amd64 bootonly CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index c3f12ffd991..8403ae8353a 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2019/04/30 23:37:32 deraadt Exp $
+# $OpenBSD: Makefile,v 1.25 2019/05/01 20:53:55 deraadt Exp $
FS= install${OSrev}.fs
FSSIZE= 921600
@@ -64,7 +64,7 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
- mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 45b3308b92e..56f7243ae79 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/04/30 23:37:32 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2019/05/01 20:53:55 deraadt Exp $
FS= miniroot${OSrev}.fs
FSSIZE= 7936
@@ -43,7 +43,7 @@ ${CDROM}: bsd.rd
cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/i386
cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386
cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot
- mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} i386 bootonly CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile
index 850de43911c..05e64266701 100644
--- a/distrib/loongson/ramdisk/Makefile
+++ b/distrib/loongson/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2019/04/30 23:25:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.22 2019/05/01 20:53:55 deraadt Exp $
FS= miniroot${OSrev}.fs
FSSIZE= 18432
@@ -34,7 +34,7 @@ ${CDROM}: bsd.rd
mkdir -p ${.OBJDIR}/cd-dir/etc
echo "set image /${OSREV}/loongson/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/loongson
- mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
+ mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} loongson bootonly CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <deraadt@openbsd.org>" \
diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile
index cfbac27cf7d..e729f77f087 100644
--- a/distrib/macppc/iso/Makefile
+++ b/distrib/macppc/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/04/30 21:14:59 deraadt Exp $
+# $OpenBSD: Makefile,v 1.18 2019/05/01 20:53:55 deraadt Exp $
CDROM= install${OSrev}.iso
RELXDIR?= /home/relx-${MACHINE}
@@ -29,7 +29,7 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/
- mkhybrid -v -v -r -part -hfs \
+ mkhybrid -r -part -hfs \
-hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} \
-map ${.CURDIR}/../../../gnu/usr.sbin/mkhybrid/src/more.mapping \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index 2db710dca2f..8e61293d8ba 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2019/04/30 23:25:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.44 2019/05/01 20:53:55 deraadt Exp $
CDROM= cd${OSrev}.iso
MTREE= ${UTILS}/mtree.conf
@@ -19,7 +19,7 @@ ${CDROM}: bsd.gz
cp ${.CURDIR}/../../../sys/arch/macppc/stand/tbxidata/bsd.tbxi \
${.OBJDIR}/cd-dir/${OSREV}/macppc
cp ${DESTDIR}/usr/mdec/ofwboot ${.OBJDIR}/cd-dir/
- mkhybrid -v -v -r -part -hfs \
+ mkhybrid -r -part -hfs \
-hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/macppc \
-map ${.CURDIR}/../../../gnu/usr.sbin/mkhybrid/src/more.mapping \
-A "OpenBSD ${OSREV} macppc bootonly CD" \
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 608d115feca..ad144589196 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2019/04/30 21:14:59 deraadt Exp $
+# $OpenBSD: Makefile,v 1.24 2019/05/01 20:53:55 deraadt Exp $
-CDROM= cd${OSrev}.iso
-FFS= ffs.img
+FS= miniroot${OSrev}.fs
+CDROM= cd${OSrev}.iso
# must match the size of `minicdroot' in disktab
CDFSMB= 15
+
all: ${CDROM}
ALLIP= 22 26 27 28 30 32
@@ -17,8 +18,8 @@ SGIVOLSZ= 33500
${CDROM}:
rm -rf ${.OBJDIR}/cd-dir
mkdir -p ${.OBJDIR}/cd-dir/
- dd if=/dev/zero of=${FFS} bs=1m count=${CDFSMB}
- vnconfig -v ${FFS} > vnd
+ dd if=/dev/zero of=${FS} bs=1m count=${CDFSMB}
+ vnconfig -v ${FS} > vnd
disklabel -w `cat vnd` minicdroot "OpenBSD/sgi "
newfs /dev/r`cat vnd`a
mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:15:38 +0000