diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-08-10 12:29:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-08-10 12:29:56 +0000 |
| commit | a85a94cd1e68da6ef66d261da53ff0ce7b9f4a8d (patch) | |
| tree | daf3c70aebe89fd0b0c4183df4e1bd3508307f37 /distrib/sparc/iso | |
| parent | c4e9352756d6701223ecbc7ea7bf7be97bcada75 (diff) | |
add missing xserv, and use ${MACHINE} throughout (still needs testing)
Diffstat (limited to 'distrib/sparc/iso')
| -rw-r--r-- | distrib/sparc/iso/Makefile | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile index ee532336cdf..c9ef418169b 100644 --- a/distrib/sparc/iso/Makefile +++ b/distrib/sparc/iso/Makefile @@ -1,53 +1,54 @@ -# $OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $ TOP= ${.CURDIR}/.. #.include "${TOP}/Makefile.inc" CDROM= install${OSrev}.iso -RELXDIR= /home/relx-sparc -RELDIR?= /home/rel-sparc +RELXDIR= /home/relx-${MACHINE} +RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ ${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \ ${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \ ${RELDIR}/bsd ${RELDIR}/bsd.rd \ - ${RELDIR}/INSTALL.sparc + ${RELDIR}/INSTALL.${MACHINE} XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \ - ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz + ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \ + ${RELXDIR}/xserv${OSrev}.tgz all: ${CDROM} ${CDROM}: ${BASE} ${XBASE} -rm -rf ${.OBJDIR}/cd-dir - mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc + mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} - cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc - cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc + cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} + cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} - ln -f ${.OBJDIR}/cd-dir/${OSREV}/sparc/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd + ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/vmunix # for kicks - cp ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/sparc - cp ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/sparc + cp ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} + cp ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} (mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \ - -A "OpenBSD ${OSREV} sparc Install CD" \ + -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \ -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \ -p "Theo de Raadt <deraadt@openbsd.org>" \ - -V "OpenBSD/sparc ${OSREV} Install CD" \ + -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \ ${.OBJDIR}/cd-dir 2>&1) | tee log vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} mount -t cd9660 /dev/svnd0a /mnt /usr/mdec/installboot -v \ - -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f1` \ - -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f2` \ - /mnt/${OSREV}/sparc/boot /usr/mdec/bootxx /dev/rsvnd0c - disklabel -w svnd0 fakecdrom "OpenBSD/sparc " + -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \ + -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \ + /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c + disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE} " umount /mnt vnconfig -u svnd0 - # XXX Some sparc machines fail to load the kernel correctly if the + # XXX Some ${MACHINE} machines fail to load the kernel correctly if the # XXX cd image is truncated. It is not yet known why this happens. # XXX For now we pad the image. dd if=/dev/zero bs=2k count=200 >> ${.OBJDIR}/${CDROM} |