mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

verbose mkhybrid was never needed on these arch

Browse Source
This commit is contained in:
deraadt 2019-05-01 20:53:55 +00:00
parent 90d980fe6c
commit 5602f3f873
8 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/amd64/iso/Makefile
View File

@ -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>" \

4
distrib/amd64/ramdisk_cd/Makefile
View File

@ -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>" \

4
distrib/i386/iso/Makefile
View File

@ -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>" \

4
distrib/i386/ramdisk_cd/Makefile
View File

@ -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>" \

4
distrib/loongson/ramdisk/Makefile
View File

@ -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>" \

4
distrib/macppc/iso/Makefile
View File

@ -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" \

4
distrib/macppc/ramdisk/Makefile
View File

@ -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" \

11
distrib/sgi/cdfs/Makefile
View File

@ -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