diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-17 03:58:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-17 03:58:56 +0000 |
| commit | e886d2ed5f458a1c669b7e01332cb294ae4cbdeb (patch) | |
| tree | c2b4570421724d0f1f9b22228287ea4c64f5cb11 | |
| parent | f4409ec46343690f2d8488e54a5731d75ae3a918 (diff) | |
For SHA256 hashes to be ready to go onto the install media, we must
build the sets before we build the media. While there we can get rid
of DESTDIR/snapshot too, and simply install straight into RELEASEDIR.
(This also ends up saving an astounding amount of traffic/latency in a nfs
environment)
78 files changed, 453 insertions, 383 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index cb65a6d396a..cc1f243781a 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -80,5 +80,7 @@ unconfig: -umount ${MOUNT_POINT} -vnconfig -u ${VND} +.ifdef RELEASEDIR beforeinstall: - cp bsd.rd ${DESTDIR}/snapshot + cp bsd.rd ${RELEASEDIR} +.endif diff --git a/distrib/alpha/cdfs/Makefile b/distrib/alpha/cdfs/Makefile index a72a4d500e7..9cb7a7eb1a7 100644 --- a/distrib/alpha/cdfs/Makefile +++ b/distrib/alpha/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/03/05 21:29:13 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -37,8 +37,10 @@ ${CDROM}: umount /mnt vnconfig -u svnd0 +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index d6646a946bb..71f0c3d6479 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.20 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.21 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -104,5 +104,8 @@ unconfig: -umount ${MOUNT_POINT} -vnconfig -u ${VND} +.ifdef RELEASEDIR beforeinstall: - cp ${FLOPPY} ${DESTDIR}/snapshot + cp ${FLOPPY} ${RELEASEDIR} +.endif + diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc index d15ed56eed5..5d22ba38d09 100644 --- a/distrib/alpha/inst-common/Makefile.inc +++ b/distrib/alpha/inst-common/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.8 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2009/04/17 03:58:54 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -29,7 +29,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS}\ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile index e8b1c13d6a4..3933054081e 100644 --- a/distrib/alpha/iso/Makefile +++ b/distrib/alpha/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -51,6 +51,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/amd64/cdfs-emu/Makefile b/distrib/amd64/cdfs-emu/Makefile index 10fadbe6e28..89ddea96136 100644 --- a/distrib/amd64/cdfs-emu/Makefile +++ b/distrib/amd64/cdfs-emu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2005/03/11 15:40:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -21,8 +21,10 @@ ${CDROM}: -b ${OSREV}/amd64/${CDFS} -c ${OSREV}/amd64/boot.catalog \ ${.OBJDIR}/cd-dir +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASeDIR} +.endif clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile index f3b47380b95..18b68f81792 100644 --- a/distrib/amd64/cdfs/Makefile +++ b/distrib/amd64/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2005/03/11 15:40:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -25,8 +25,10 @@ ${CDROM}: -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \ ${.OBJDIR}/cd-dir +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/common/Makefile.inc index ff9aa97600f..17d8c3ad204 100644 --- a/distrib/amd64/common/Makefile.inc +++ b/distrib/amd64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.13 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -95,13 +95,15 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: .ifndef NOBSDRD - cp bsd.rd ${DESTDIR}/snapshot/bsd.rd + cp bsd.rd ${RELEASEDIR}/bsd.rd .endif .ifndef NOFS - cp ${FS} ${DESTDIR}/snapshot/${FS} + cp ${FS} ${RELEASEDIR}/${FS} .endif +.endif # RELEASEDIR ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ @@ -118,7 +120,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index 9502ee8c41c..1b8350b6f59 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -41,6 +41,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/armish/ramdisk/Makefile b/distrib/armish/ramdisk/Makefile index 777996ea6bb..6e7bf44d1ab 100644 --- a/distrib/armish/ramdisk/Makefile +++ b/distrib/armish/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -79,9 +79,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -95,7 +92,7 @@ do_files: cat ${MTREE} | mtree -de -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -104,8 +101,10 @@ clean cleandir: rm -f instbin.conf rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD_RD} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile index abc572ff309..b20546646e6 100644 --- a/distrib/hp300/ramdisk/Makefile +++ b/distrib/hp300/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.27 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $ TOP= ${.CURDIR}/.. @@ -22,8 +22,10 @@ GZIPFLAGS?= -9fn all: ${CBIN} ${IMAGE} bsd.rd +.ifdef RELEASEDIR install: bsd.rd - ${GZIPCMD} -c ${GZIPFLAGS} bsd.rd > ${DESTDIR}/snapshot/bsd.rd + ${GZIPCMD} -c ${GZIPFLAGS} bsd.rd > ${RELEASEDIR}/bsd.rd +.endif .include "Makefile.inc" diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc index 3b963eba68d..583eaf4139b 100644 --- a/distrib/hp300/ramdisk/Makefile.inc +++ b/distrib/hp300/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.7 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -28,7 +28,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/hppa/Makefile b/distrib/hppa/Makefile index 19297da31ba..d8e7a3e1b8a 100644 --- a/distrib/hppa/Makefile +++ b/distrib/hppa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/10/18 18:16:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2009/04/17 03:58:54 deraadt Exp $ SUBDIR=ramdisk @@ -7,7 +7,6 @@ SUBDIR+= iso .endif unconfig: - cd ramdisk_cd; ${MAKE} unconfig - cd ramdiskA; ${MAKE} unconfig + cd ramdisk; ${MAKE} unconfig .include <bsd.subdir.mk> diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile index 262f78fd99c..1b36d6304f6 100644 --- a/distrib/hppa/iso/Makefile +++ b/distrib/hppa/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -44,6 +44,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -rf cd-dir ${CDROM} diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 2fb2ceaa596..7f1354b2da9 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.17 2009/04/17 03:58:54 deraadt Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -86,8 +86,9 @@ ${IMAGE}: ${CBIN} newfs ${NEWFSOPTS_RD} ${VND_RDEV} || ${NEWFS_WILL_FAIL} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \ - TARGDIR=${MOUNT_POINT} UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS} + REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} @echo "" @df -i ${MOUNT_POINT} @@ -111,10 +112,10 @@ clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ ${CBIN}.conf *.o *.lo *.c obsd bsd bsd.* ${LIF} ${CDROM} +.ifdef RELEASEDIR beforeinstall: - cp bsd.rd ${DESTDIR}/snapshot - cp ${LIF} ${DESTDIR}/snapshot - cp ${CDROM} ${DESTDIR}/snapshot + cp bsd.rd ${LIF} ${CDROM} ${RELEASEDIR} +.endif unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/i386/cdfs-emu/Makefile b/distrib/i386/cdfs-emu/Makefile index 8888cb9c73e..e312c0b5a50 100644 --- a/distrib/i386/cdfs-emu/Makefile +++ b/distrib/i386/cdfs-emu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/03/11 15:40:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -21,8 +21,10 @@ ${CDROM}: -b ${OSREV}/i386/${CDFS} -c ${OSREV}/i386/boot.catalog \ ${.OBJDIR}/cd-dir +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif # RELEASEDIR check clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile index 451af57c325..b0996f42e48 100644 --- a/distrib/i386/cdfs/Makefile +++ b/distrib/i386/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2005/03/11 15:40:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -25,8 +25,10 @@ ${CDROM}: -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \ ${.OBJDIR}/cd-dir +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif # RELEASEDIR check clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index 4ba45639e61..e8ed9f86b3f 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.23 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.24 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -95,13 +95,15 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: .ifndef NOBSDRD - cp bsd.rd ${DESTDIR}/snapshot/bsd.rd + cp bsd.rd ${RELEASEDIR}/bsd.rd .endif .ifndef NOFS - cp ${FS} ${DESTDIR}/snapshot/${FS} + cp ${FS} ${RELEASEDIR}/${FS} .endif +.endif # RELEASEDIR check ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ @@ -118,7 +120,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index fca84d0018e..4224e6e6b1d 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -41,6 +41,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile index 4b7a0639c69..40687af1d89 100644 --- a/distrib/landisk/miniroot/Makefile +++ b/distrib/landisk/miniroot/Makefile @@ -58,8 +58,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${IMAGE} ${DESTDIR}/snapshot/ + cp ${IMAGE} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index da3d98ba550..4509e55e873 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2009/03/28 16:34:24 krw Exp $ +# $OpenBSD: Makefile,v 1.12 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -72,8 +72,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/ + cp ${BSD_RD} ${RELEASEDIR} +.endif ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -88,7 +90,7 @@ do_files: cat ${MTREE} | mtree -de -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -97,8 +99,5 @@ clean cleandir: rm -f instbin.conf rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot - .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index 581da4c7dc3..961ce20a7ba 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -64,8 +64,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} + cp ${BSD_RD} ${RELEASEDIR} +.endif ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -80,7 +82,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 04d3894848a..3b5037a4888 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.3 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2009/04/17 03:58:54 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -32,8 +32,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile index 2f4d951d5b9..52a9ac27cc4 100644 --- a/distrib/mac68k/ramdisk/Makefile +++ b/distrib/mac68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.13 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -61,10 +61,12 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} + cp ${BSD_RD} ${RELEASEDIR}/${BSD_RD} printf "disable ncrscsi\nenable sbc\nquit" | config -e \ - -o ${DESTDIR}/snapshot/${BSDSBC_RD} ${DESTDIR}/snapshot/${BSD_RD} + -o ${RELEASEDIR}/${BSDSBC_RD} ${RELEASEDIR}/${BSD_RD} +.endif ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -79,7 +81,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/mac68k/ramdisk/Makefile.inc b/distrib/mac68k/ramdisk/Makefile.inc index e24ed759fab..b40168b6fe6 100644 --- a/distrib/mac68k/ramdisk/Makefile.inc +++ b/distrib/mac68k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.6 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -33,7 +33,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} + REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile index 7991ba790e0..88fcab89587 100644 --- a/distrib/macppc/iso/Makefile +++ b/distrib/macppc/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -41,6 +41,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 4355ee1b35c..5973d2dc54f 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.23 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -95,9 +95,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} cd${REV}.iso ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -111,7 +108,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -120,8 +117,10 @@ clean cleandir: rdsetroot rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} cd${REV}.iso ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD_RD} cd${REV}.iso ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index ca998066c33..233a88671c9 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.31 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -11,6 +11,8 @@ ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot .include "${ARCHDIR}/Makefile.inc" .endif +UTILS= ${.CURDIR} + MOUNT_POINT?= /mnt VND?= svnd0 VND_DEV= /dev/${VND}a @@ -51,8 +53,9 @@ all: ${CBIN} bsd newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} || ${NEWFS_WILL_FAIL} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \ - TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/runlist.sh ${LISTS} + REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + UTILS=${UTILS} ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} @echo "" @df -i ${MOUNT_POINT} @@ -76,11 +79,13 @@ clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ ${CBIN}.conf *.o *.lo *.c -beforeinstall: - cp ${IMAGE} ${DESTDIR}/snapshot - .endif # DESTDIR check +.ifdef RELEASEDIR +beforeinstall: + cp ${IMAGE} ${RELEASEDIR} +.endif + unconfig: -umount -f ${MOUNT_POINT} -vnconfig -u ${VND} diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 2eab1472406..31d753a49e6 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.453 2009/04/13 02:04:11 deraadt Exp $ +# $OpenBSD: install.sub,v 1.454 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -971,20 +971,33 @@ __EOT [[ -n $resp ]] || return _get_sets=$resp - ask_yn "Ready to $MODE sets?" yes [[ $resp = n ]] && return + shacmd="cat" + [[ -x /bin/sha256 ]] && shacmd="sha256 /tmp/h" + + ask_yn "Ready to $MODE sets?" yes for _f in $THESETS ; do isin $_f $_get_sets || continue echo -n "Getting $_f ..." + rm /tmp/h case $_f in - *.tgz) ftp -T "$_f" $FTPOPTS -o - -m "$_src/$_f" | tar zxphf - -C /mnt + *.tgz) ftp -T "$_f" $FTPOPTS -o - -m "$_src/$_f" | \ + $shacmd | tar zxphf - -C /mnt ;; - *) ftp -T "$_f" $FTPOPTS -o "/mnt/$_f" -m "$_src/$_f" + *) ftp -T "$_f" $FTPOPTS -o - -m "$_src/$_f" | \ + $shacmd > "/mnt/$_f" ;; esac if [ $? -ne 0 ]; then echo "'$_f' did not install correctly." + elif [ -f /tmp/h -a -f "/var/hash/$_f" ]; then + if [ "$(</tmp/h)" != "$(</var/hash/$_f)" ]; then + echo "The SHA256 hash for $_f did not match what bsd.rd expected:" + cat /tmp/h + # XXX should mark failure somehow + fi + DEFAULTSETS=$(rmel $_f $DEFAULTSETS) else DEFAULTSETS=$(rmel $_f $DEFAULTSETS) fi diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile index 3feee21dd97..f4dafe7fef8 100644 --- a/distrib/mvme68k/ramdisk/Makefile +++ b/distrib/mvme68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.25 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -64,8 +64,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} + cp ${BSD_RD} ${RELEASEDIR} +.endif ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -80,7 +82,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/mvme68k/ramdisk/Makefile.inc b/distrib/mvme68k/ramdisk/Makefile.inc index 85c3d818662..ecc640d24b2 100644 --- a/distrib/mvme68k/ramdisk/Makefile.inc +++ b/distrib/mvme68k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.9 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -34,7 +34,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/mvme88k/ramdisk/Makefile b/distrib/mvme88k/ramdisk/Makefile index e7662d452e9..2843107faf4 100644 --- a/distrib/mvme88k/ramdisk/Makefile +++ b/distrib/mvme88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -64,8 +64,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} + cp ${BSD_RD} ${RELEASEDIR} +.endif ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -80,7 +82,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc index 19a50719896..5e6ba3b0088 100644 --- a/distrib/mvme88k/ramdisk/Makefile.inc +++ b/distrib/mvme88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.9 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2009/04/17 03:58:54 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -33,7 +33,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile index 7bff2301164..e26c9ce8f7f 100644 --- a/distrib/mvmeppc/ramdisk/Makefile +++ b/distrib/mvmeppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -78,9 +78,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} cd${REV}.fs ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -91,7 +88,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -99,8 +96,10 @@ clean cleandir: *.o *.lo *.c bsd ${BSD_RD} \ rdsetroot -beforeinstall: - cp ${BSD.RD} cd${REV}.fs ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD.RD} cd${REV}.fs ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile index 05628db6f0c..700e2ac226a 100644 --- a/distrib/notes/Makefile +++ b/distrib/notes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2008/05/15 21:01:14 miod Exp $ +# $OpenBSD: Makefile,v 1.32 2009/04/17 03:58:54 deraadt Exp $ NOPROG= NOMAN= @@ -27,13 +27,15 @@ $(TARG): $(DEP) m4 -DOSREV=$(OSREV) -DOSrev=$(OSrev) -DINCLUDE=$(.CURDIR)/$M \ -DMACHINE=$M -Uunix $(SRC) > $@ -beforeinstall: - cp ${TARG} ${DESTDIR}/snapshot/ - .else all: .endif +.ifdef RELEASEDIR +beforeinstall: + cp ${TARG} ${RELEASEDIR} +.endif + clean: -/bin/rm -f INSTALL.* diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 86045ac285b..154acd68696 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.35 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -106,8 +106,9 @@ ${IMAGE}: ${CBIN} newfs ${NEWFSOPTS_RD} ${VND_RDEV} || ${NEWFS_WILL_FAIL} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \ - TARGDIR=${MOUNT_POINT} UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS} + REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} @echo "" @df -i ${MOUNT_POINT} @@ -131,13 +132,15 @@ clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ ${CBIN}.conf *.o *.lo *.c bsd bsd.* +.endif # DESTDIR check + +.ifdef RELEASEDIR beforeinstall: - cp bsd.rd ${DESTDIR}/snapshot + cp bsd.rd ${RELEASEDIR} .ifdef MAKEFLOPPY - cp ${FLOPPY} ${DESTDIR}/snapshot -.endif - -.endif # DESTDIR check + cp ${FLOPPY} ${RELEASEDIR} +.endif # MAKEFLOPPY +.endif # RELEASEDIR unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/sets/checkflist b/distrib/sets/checkflist index 937f3b862bb..60ca1a17fe4 100644 --- a/distrib/sets/checkflist +++ b/distrib/sets/checkflist @@ -1,5 +1,5 @@ #!/bin/sh -x -# $OpenBSD: checkflist,v 1.10 2003/12/11 00:13:27 deraadt Exp $ +# $OpenBSD: checkflist,v 1.11 2009/04/17 03:58:54 deraadt Exp $ # # Copyright (c) 2001 Theo de Raadt # All rights reserved. @@ -34,4 +34,4 @@ trap 'rm -f $TMP' 0 1 15 sh makeflist > $TMP ( cd $DESTDIR ; find . \( -type d -o -type f -o -type l \) ) | \ - grep -v -e '^\./snapshot' -e '^.$' | sort -H | diff $TMP - + grep -v -e '^.$' | sort -H | diff $TMP - diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index 5086bcddece..2e738e85060 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/02/18 16:08:26 jsing Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -41,8 +41,10 @@ ${CDROM}: dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \ seek=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'` +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif unconfig: -umount /mnt diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index 0a00c5a43d7..fc9a40a802b 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2008/09/04 01:09:20 jsing Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -53,6 +53,11 @@ ${CDROM}: install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new unconfig: -umount /mnt diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 3b3b3957607..4eb06e9de37 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/04/12 03:18:52 jsing Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -71,9 +71,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -87,15 +84,17 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ *.o *.lo *.c bsd ${BSD_RD} rdsetroot -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD_RD} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile index 0a34d6af8e9..f66894746eb 100644 --- a/distrib/socppc/ramdisk/Makefile +++ b/distrib/socppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/12/02 03:20:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -75,9 +75,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} ${BSD_BIN} ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -91,7 +88,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -100,8 +97,10 @@ clean cleandir: rdsetroot rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} ${BSD_BIN} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD.RD} ${BSD_BIN} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile index 42ee020eaf0..c11961930cf 100644 --- a/distrib/sparc/Makefile +++ b/distrib/sparc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2007/10/18 18:16:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:55 deraadt Exp $ SUBDIR+= ../ramdisk ../miniroot cdfs @@ -7,7 +7,7 @@ SUBDIR+= iso .endif unconfig: - cd ramdisk_cd; ${MAKE} unconfig + cd ramdisk; ${MAKE} unconfig cd ramdiskA; ${MAKE} unconfig .include <bsd.subdir.mk> diff --git a/distrib/sparc/cdfs/Makefile b/distrib/sparc/cdfs/Makefile index feeaf215a47..b93fae0baa4 100644 --- a/distrib/sparc/cdfs/Makefile +++ b/distrib/sparc/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2005/03/11 15:40:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -35,8 +35,10 @@ ${CDROM}: # XXX For now we pad the image. dd if=/dev/zero bs=2k count=200 >> ${.OBJDIR}/${CDROM} +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile index 04a2343ae05..38a6254e725 100644 --- a/distrib/sparc/iso/Makefile +++ b/distrib/sparc/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -55,6 +55,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 05a21c92715..24cc990def3 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -109,9 +109,11 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: .ifndef NOBSDRD - cp bsd.rd ${DESTDIR}/snapshot/bsd.rd + cp bsd.rd ${RELEASEDIR} +.endif .endif ${CBIN}.conf: ${LISTS} @@ -128,7 +130,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile index 397e9cc5dfe..47d509ce56a 100644 --- a/distrib/sparc64/cdfs/Makefile +++ b/distrib/sparc64/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2008/03/04 05:37:51 deraadt Exp $ +# $OpenBSD: Makefile,v 1.13 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -32,8 +32,10 @@ ${CDROM}: vnconfig -u svnd0 mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif clean cleandir: /bin/rm -rf ${CDROM} ${.OBJDIR}/cd-dir diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc index c81e0ee89b5..05927f7dc2b 100644 --- a/distrib/sparc64/common/Makefile.inc +++ b/distrib/sparc64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2008/12/02 01:01:07 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -35,7 +35,7 @@ ${FS}: bsd.rd mount ${VND_DEV} ${MOUNT_POINT} TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTFLOPPY} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTFLOPPY} /usr/mdec/installboot -v ${DESTDIR}/usr/mdec/bootblk ${VND_CRDEV} @echo "" @df -i ${MOUNT_POINT} @@ -77,11 +77,13 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: .ifndef NOBSDRD - cp bsd.rd ${DESTDIR}/snapshot/bsd.rd + cp bsd.rd ${RELEASEDIR} +.endif + cp ${FS} ${RELEASEDIR} .endif - cp ${FS} ${DESTDIR}/snapshot/${FS} ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ @@ -94,7 +96,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 4d79b46acc2..b9986fdac8d 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -48,6 +48,11 @@ ${CDROM}: ${BASE} ${XBASE} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -rf ${CDROM} ${.OBJDIR}/cd-dir diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile index c0256ba43e7..60cfabb868e 100644 --- a/distrib/sparc64/miniroot/Makefile +++ b/distrib/sparc64/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/02/25 04:41:07 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -51,8 +51,10 @@ unconfig: -umount -f /mnt -vnconfig -u /dev/svnd0a +.ifdef RELEASEDIR install: - cp ${TARGET} ${DESTDIR}/snapshot/ + cp ${TARGET} ${RELEASEDIR} +.endif clean: rm -f ${TARGET} diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 41061d4f34f..13c20906007 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2008/12/02 01:01:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -110,9 +110,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${FLOPPY} ${DESTDIR}/snapshot/ - ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -124,17 +121,19 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - REV=${REV} ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} \ - UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS} + TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ + ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} elfrdsetroot -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${FLOPPY} ${BSD.RD} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 8fb309fe0f1..8c289a3fce4 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2008/12/02 01:01:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -110,9 +110,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${FLOPPY} ${DESTDIR}/snapshot/ - ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -124,17 +121,19 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - REV=${REV} ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} \ - UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS} + TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ + ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ *.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} elfrdsetroot -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${FLOPPY} ${BSD.RD} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/vax/cdfs/Makefile b/distrib/vax/cdfs/Makefile index fc3e7b167a4..d4e9fa66680 100644 --- a/distrib/vax/cdfs/Makefile +++ b/distrib/vax/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2008/02/25 19:52:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -9,8 +9,10 @@ CDROM= cd${REV}.iso # The floppy image works fine as a CD image, too +.ifdef RELEASEDIR install: - cp ${DESTDIR}/snapshot/${FLOPPY} ${DESTDIR}/snapshot/${CDROM} + cp ${RELEASEDIR}/${FLOPPY} ${RELEASEDIR}/${CDROM} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/vax/common/Makefile.inc b/distrib/vax/common/Makefile.inc index d1df15e24de..2839452e4eb 100644 --- a/distrib/vax/common/Makefile.inc +++ b/distrib/vax/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:55 deraadt Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -27,7 +27,7 @@ all: ${CBIN} bootroot mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} @echo "" @df -i ${MOUNT_POINT} diff --git a/distrib/vax/iso/Makefile b/distrib/vax/iso/Makefile index 5e753602295..9d3563171a1 100644 --- a/distrib/vax/iso/Makefile +++ b/distrib/vax/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -53,6 +53,11 @@ ${CDROM}: ${BASE} ${XBASE} ${BOOT} ${BOOTXX} install: cp ${CDROM} ${RELDIR}/ + # update the SHA256 file + grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new + sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new + sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256 + rm ${RELDIR}/SHA256.new clean cleandir: /bin/rm -f ${CDROM} ${.OBJDIR}/image.* diff --git a/distrib/zaurus/ipk/Makefile b/distrib/zaurus/ipk/Makefile index 5d3a3beb540..0c0de3f2d5e 100644 --- a/distrib/zaurus/ipk/Makefile +++ b/distrib/zaurus/ipk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2005/07/14 02:59:30 uwe Exp $ +# $OpenBSD: Makefile,v 1.10 2009/04/17 03:58:55 deraadt Exp $ TOP= ${.CURDIR}/.. IPK= openbsd${OSrev}_arm.ipk @@ -59,9 +59,11 @@ Packages: ${IPK} echo "Size:" `/bin/ls -l ${IPK} | awk '{print $$5}'` \ >> ${.OBJDIR}/Packages +.ifdef RELEASEDIR install: ${IPK} Packages - cp ${IPK} ${DESTDIR}/snapshot - cp Packages ${DESTDIR}/snapshot + cp ${IPK} ${RELEASEDIR} + cp Packages ${RELEASEDIR} +.endif clean cleandir: rm -rf data control ${IPK} debian-binary control.tar.gz data.tar.gz \ diff --git a/distrib/zaurus/ramdisk/Makefile b/distrib/zaurus/ramdisk/Makefile index 035c419fd5e..28d8666272e 100644 --- a/distrib/zaurus/ramdisk/Makefile +++ b/distrib/zaurus/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/12/02 03:20:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2009/04/17 03:58:55 deraadt Exp $ REV= ${OSrev} @@ -72,9 +72,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -88,7 +85,7 @@ do_files: cat ${MTREE} | mtree -de -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: @@ -98,8 +95,10 @@ clean cleandir: rm -f instbin.conf rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD_RD} ${RELEASEDIR} +.endif # RELEASEDIR .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/etc/Makefile b/etc/Makefile index 71dc7950b25..c177bec073a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.271 2009/04/14 23:09:04 deraadt Exp $ +# $OpenBSD: Makefile,v 1.272 2009/04/17 03:58:52 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -30,6 +30,9 @@ BIN1+= wsconsctl.conf # -rw-rw-r-- BIN2= motd +MISETS= bsd base${OSrev}.tgz comp${OSrev}.tgz misc${OSrev}.tgz \ + man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz + PCS= pcs750.bin # Use NOGZIP on architectures where the gzip'ing would take too much time @@ -264,27 +267,15 @@ release: @echo setenv RELEASEDIR before building a release. @false .else + release-sets: - cd ${.CURDIR}/../distrib/notes && ${MAKE} && exec ${SUDO} ${MAKE} install cd ${.CURDIR}/../distrib/sets && exec ${SUDO} sh maketars ${OSrev} -release: distribution snap_pre release-sets snap_md - -cp ${DESTDIR}/snapshot/*bsd* ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/*boot* ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/cdbr ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/*BOOT* ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/cd*.iso ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/Packages ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/INSTALL.* ${RELEASEDIR} - -cp ${DESTDIR}/snapshot/*.fs ${DESTDIR}/snapshot/*.fs.gz ${RELEASEDIR} +sha: -cd ${RELEASEDIR}; \ - md5 *bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* Packages *.fs \ - *.iso *.gz *.tgz > MD5 - -cd ${RELEASEDIR} && sort -o MD5 MD5 + sum -a sha256 bsd.rd INSTALL.`arch -ks` ${MDEXT} ${MISETS} > SHA256 -snap_pre: - ${SUDO} /bin/rm -rf ${DESTDIR}/snapshot - ${SUDO} ${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}/snapshot +release: distribution kernels release-sets distrib sha .endif @@ -306,7 +297,7 @@ update-moduli: ) > moduli .PHONY: distribution-etc-root-var distribution distrib-dirs \ - release allarchs snap_md m4 snap_pre + release allarchs kernels release-sets m4 SUBDIR+= etc.alpha etc.amd64 etc.armish etc.aviion etc.hp300 etc.hppa SUBDIR+= etc.hppa64 etc.i386 etc.landisk etc.luna88k etc.mac68k etc.macppc diff --git a/etc/etc.alpha/Makefile.inc b/etc/etc.alpha/Makefile.inc index d67fb38ae17..09fcff2663e 100644 --- a/etc/etc.alpha/Makefile.inc +++ b/etc/etc.alpha/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.15 2006/07/27 03:11:23 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/alpha/conf && config GENERIC @@ -11,10 +10,11 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR} -.PHONY: bsd bootblocks +MDEXT= cd${OSrev}.iso floppy${OSrev}.fs floppyB${OSrev}.fs \ + boot bootxx netboot -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.amd64/Makefile.inc b/etc/etc.amd64/Makefile.inc index a99dd5814b0..6b10c491539 100644 --- a/etc/etc.amd64/Makefile.inc +++ b/etc/etc.amd64/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.7 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bsd.mp bootblocks distrib +kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP/bsd \ - ${DESTDIR}/snapshot/bsd.mp + ${RELEASEDIR}/bsd.mp bsd: cd ${.CURDIR}/../sys/arch/amd64/conf && config GENERIC @@ -18,10 +17,11 @@ bsd.mp: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/pxeboot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR} -.PHONY: bsd bsd.mp bootblocks +MDEXT= bsd.mp cd${OSrev}.iso floppy${OSrev}.fs \ + pxeboot cdboot cdbr -.endif # DESTDIR check +.PHONY: bsd bsd.mp bootblocks diff --git a/etc/etc.armish/Makefile.inc b/etc/etc.armish/Makefile.inc index 2373edc7565..4ee665ee454 100644 --- a/etc/etc.armish/Makefile.inc +++ b/etc/etc.armish/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.5 2006/08/30 21:40:05 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/armish/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.aviion/Makefile.inc b/etc/etc.aviion/Makefile.inc index 85ee7110a99..e9aba84aca8 100644 --- a/etc/etc.aviion/Makefile.inc +++ b/etc/etc.aviion/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/aviion/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ + cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.hp300/Makefile.inc b/etc/etc.hp300/Makefile.inc index f7b1299b793..645ddd6920b 100644 --- a/etc/etc.hp300/Makefile.inc +++ b/etc/etc.hp300/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.19 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.20 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/hp300/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/hp300/conf && config GENERIC @@ -11,9 +10,9 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/snapshot/SYS_UBOOT - cp ${DESTDIR}/usr/mdec/cdboot.lif ${DESTDIR}/snapshot/SYS_CDBOOT + cp ${DESTDIR}/usr/mdec/uboot.lif ${RELEASEDIR}/SYS_UBOOT + cp ${DESTDIR}/usr/mdec/cdboot.lif ${RELEASEDIR}/SYS_CDBOOT -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.hppa/Makefile.inc b/etc/etc.hppa/Makefile.inc index c8685a5d613..e90b28561a9 100644 --- a/etc/etc.hppa/Makefile.inc +++ b/etc/etc.hppa/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.5 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bootblocks bsd distrib +kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/hppa/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -.PHONY: bsd bootblocks +MDEXT= cd${OSrev}.iso xxboot -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.hppa64/Makefile.inc b/etc/etc.hppa64/Makefile.inc index d3d7e6925c6..dcf8a29cf6f 100644 --- a/etc/etc.hppa64/Makefile.inc +++ b/etc/etc.hppa64/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bootblocks bsd distrib +kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/hppa64/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -.PHONY: bootblocks bsd +MDEXT= -.endif # DESTDIR check +.PHONY: bootblocks bsd diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc index 24e41f30958..7434cd5d5a4 100644 --- a/etc/etc.i386/Makefile.inc +++ b/etc/etc.i386/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.16 2006/07/27 02:53:38 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2009/04/17 03:58:53 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bsd.mp bootblocks notes distrib +kernels: bsd bsd.mp bootblocks linux-notes cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC.MP/bsd \ - ${DESTDIR}/snapshot/bsd.mp + ${RELEASEDIR}/bsd.mp bsd: cd ${.CURDIR}/../sys/arch/i386/conf && config GENERIC @@ -18,13 +17,15 @@ bsd.mp: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/pxeboot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR} -notes: - cp ${.CURDIR}/etc.i386/INSTALL.* ${DESTDIR}/snapshot +linux-notes: + cp ${.CURDIR}/etc.i386/INSTALL.* ${RELEASEDIR} -.PHONY: bsd bsd.mp bootblocks notes +MDEXT= bsd.mp cd${OSrev}.iso cdemu${OSrev}.iso \ + floppy${OSrev}.fs floppyB${OSrev}.fs floppyC${OSrev}.fs \ + pxeboot cdboot cdbr INSTALL.linux -.endif # DESTDIR check +.PHONY: bsd bsd.mp bootblocks diff --git a/etc/etc.landisk/Makefile.inc b/etc/etc.landisk/Makefile.inc index 8e2df705da4..0e7198c04a4 100644 --- a/etc/etc.landisk/Makefile.inc +++ b/etc/etc.landisk/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.2 2006/11/12 21:45:19 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/landisk/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/landisk/conf && config GENERIC @@ -12,10 +11,10 @@ bsd: # probably will be replaced by procedure to build 'miniroot' image bootblocks: - cp ${DESTDIR}/usr/mdec/mbr ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.luna88k/Makefile.inc b/etc/etc.luna88k/Makefile.inc index 1fb4b53f374..f53c2f753ba 100644 --- a/etc/etc.luna88k/Makefile.inc +++ b/etc/etc.luna88k/Makefile.inc @@ -1,18 +1,13 @@ -# $OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd cp ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/luna88k/conf && config GENERIC cd ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && ${MAKE} -bootblocks: - #none needed +.PHONY: bsd -.PHONY: bsd bootblocks - -.endif # DESTDIR check diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc index dabfdfb72dc..48a425bbe2d 100644 --- a/etc/etc.mac68k/Makefile.inc +++ b/etc/etc.mac68k/Makefile.inc @@ -1,20 +1,14 @@ -# $OpenBSD: Makefile.inc,v 1.10 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd printf "disable ncrscsi\nenable sbc\nquit" | config -e \ - -o ${DESTDIR}/snapshot/bsdsbc ${DESTDIR}/snapshot/bsd + -o ${RELEASEDIR}/bsdsbc ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERIC cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && exec ${MAKE} -bootblocks: - #none needed - -.PHONY: bsd bootblocks - -.endif # DESTDIR check +.PHONY: bsd diff --git a/etc/etc.macppc/Makefile.inc b/etc/etc.macppc/Makefile.inc index e2fdbc01d65..983ee079c8f 100644 --- a/etc/etc.macppc/Makefile.inc +++ b/etc/etc.macppc/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.10 2008/04/25 04:04:15 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bsd.mp bootblocks distrib gzip_bsd.rd +kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC.MP/bsd \ - ${DESTDIR}/snapshot/bsd.mp + ${RELEASEDIR}/bsd.mp bsd: cd ${.CURDIR}/../sys/arch/macppc/conf && config GENERIC @@ -18,14 +17,12 @@ bsd.mp: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/ofwboot - cp ${DESTDIR}/usr/mdec/bsd.tbxi ${DESTDIR}/snapshot/bsd.tbxi - cp ${DESTDIR}/usr/mdec/boot.mac ${DESTDIR}/snapshot/boot.mac + cp ${DESTDIR}/usr/mdec/ofwboot ${RELEASEDIR}/ofwboot + cp ${DESTDIR}/usr/mdec/bsd.tbxi ${RELEASEDIR}/bsd.tbxi + cp ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac -gzip_bsd.rd: - gzip -9 ${DESTDIR}/snapshot/bsd.rd - mv ${DESTDIR}/snapshot/bsd.rd.gz ${DESTDIR}/snapshot/bsd.rd +MDEXT= bsd.mp cd${OSrev}.iso \ + ofwboot bsd.tbxi boot.mac -.PHONY: bootblocks bsd gzip_bsd.rd +.PHONY: bsd bsd.mp bootblocks -.endif # DESTDIR check diff --git a/etc/etc.mvme68k/Makefile.inc b/etc/etc.mvme68k/Makefile.inc index e318bd7cd97..3e246826d04 100644 --- a/etc/etc.mvme68k/Makefile.inc +++ b/etc/etc.mvme68k/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.9 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/mvme68k/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ + cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.mvme88k/Makefile.inc b/etc/etc.mvme88k/Makefile.inc index 3215651cabe..d79aaa7d3b3 100644 --- a/etc/etc.mvme88k/Makefile.inc +++ b/etc/etc.mvme88k/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.8 2007/11/09 18:15:22 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bsd.mp bootblocks distrib +kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC.MP/bsd \ - ${DESTDIR}/snapshot/bsd.mp + ${RELEASEDIR}/bsd.mp bsd: cd ${.CURDIR}/../sys/arch/mvme88k/conf && config GENERIC @@ -18,8 +17,8 @@ bsd.mp: ${MAKE} clean && ${MAKE} depend && ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ + cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -.PHONY: bsd bsd.mp bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bsd.mp bootblocks diff --git a/etc/etc.mvmeppc/Makefile.inc b/etc/etc.mvmeppc/Makefile.inc index 4fe9955ef26..be477ef8777 100644 --- a/etc/etc.mvmeppc/Makefile.inc +++ b/etc/etc.mvmeppc/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.4 2006/07/27 02:51:15 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/mvmeppc/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/mvmeppc/conf && config GENERIC @@ -11,10 +10,10 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/snapshot/bootxx - cp ${DESTDIR}/usr/mdec/bootsd ${DESTDIR}/snapshot/bootsd - cp ${DESTDIR}/usr/mdec/installboot ${DESTDIR}/snapshot/installboot + cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR}/bootxx + cp ${DESTDIR}/usr/mdec/bootsd ${RELEASEDIR}/bootsd + cp ${DESTDIR}/usr/mdec/installboot ${RELEASEDIR}/installboot -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.sgi/Makefile.inc b/etc/etc.sgi/Makefile.inc index 5e264a79e3f..97957a56e99 100644 --- a/etc/etc.sgi/Makefile.inc +++ b/etc/etc.sgi/Makefile.inc @@ -1,18 +1,15 @@ -# $OpenBSD: Makefile.inc,v 1.4 2006/07/27 02:53:55 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC && \ ${MAKE} clean && ${MAKE} depend && exec ${MAKE} -bootblocks: - #none needed +MDEXT= -.PHONY: bsd bootblocks +.PHONY: bsd -.endif # DESTDIR check diff --git a/etc/etc.socppc/Makefile.inc b/etc/etc.socppc/Makefile.inc index f70f982d7a1..d6ad4b30edf 100644 --- a/etc/etc.socppc/Makefile.inc +++ b/etc/etc.socppc/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.1 2008/05/13 19:39:58 kettenis Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/socppc/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/socppc/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot/boot + cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot -.PHONY: bsd bootblocks +MDEXT= -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.sparc/Makefile.inc b/etc/etc.sparc/Makefile.inc index b281e06e301..5f16f5679bf 100644 --- a/etc/etc.sparc/Makefile.inc +++ b/etc/etc.sparc/Makefile.inc @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile.inc,v 1.14 2006/07/27 01:58:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.15 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd - s=`printf "find sd\nexit" | config -e ${DESTDIR}/snapshot/bsd | \ + ${RELEASEDIR}/bsd + s=`printf "find sd\nexit" | config -e ${RELEASEDIR}/bsd | \ grep scsibus | awk '{print $$1}'`; \ printf "add sd0\n%s\n%s\nchange %s\ny\n3\n\n\nquit\n" $$s $$s $$s | \ - config -e -o ${DESTDIR}/snapshot/bsd.scsi3 ${DESTDIR}/snapshot/bsd + config -e -o ${RELEASEDIR}/bsd.scsi3 ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/sparc/conf && config GENERIC @@ -15,10 +14,10 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/*boot* ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} ${DESTDIR}/usr/mdec/binstall net /tmp && \ - mv /tmp/boot.sparc.openbsd ${DESTDIR}/snapshot/boot.net + mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net -.PHONY: bsd bootblocks +MDEXT= bsd.scsi3 boot boot.net bootxx installboot -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.sparc64/Makefile.inc b/etc/etc.sparc64/Makefile.inc index 7354e139723..f42737b7b53 100644 --- a/etc/etc.sparc64/Makefile.inc +++ b/etc/etc.sparc64/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.5 2007/11/09 18:14:33 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bsd.mp bootblocks distrib +kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC.MP/bsd \ - ${DESTDIR}/snapshot/bsd.mp + ${RELEASEDIR}/bsd.mp bsd: cd ${.CURDIR}/../sys/arch/sparc64/conf && config GENERIC @@ -18,8 +17,10 @@ bsd.mp: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/*boot* ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} -.PHONY: bsd bsd.mp bootblocks +MDEXT= bsd.mp cd${OSrev}.iso miniroot${OSrev}.fs \ + floppy${OSrev}.fs floppyB${OSrev}.fs \ + bootblk installboot ofwboot ofwboot.net -.endif # DESTDIR check +.PHONY: bsd bsd.mp bootblocks diff --git a/etc/etc.vax/Makefile.inc b/etc/etc.vax/Makefile.inc index 69171c06206..8cd8656c03e 100644 --- a/etc/etc.vax/Makefile.inc +++ b/etc/etc.vax/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.6 2006/07/27 01:58:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/vax/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/vax/conf && config GENERIC @@ -11,8 +10,8 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - mopa.out ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot/boot.mop + mopa.out ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot.mop -.PHONY: bsd bootblocks +MDEXT= boot.mop -.endif # DESTDIR check +.PHONY: bsd bootblocks diff --git a/etc/etc.zaurus/Makefile.inc b/etc/etc.zaurus/Makefile.inc index 552277cda33..1298dd1d61e 100644 --- a/etc/etc.zaurus/Makefile.inc +++ b/etc/etc.zaurus/Makefile.inc @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.6 2006/07/27 01:58:21 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bootblocks distrib +kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/zaurus/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd bsd: cd ${.CURDIR}/../sys/arch/zaurus/conf && config GENERIC @@ -11,9 +10,9 @@ bsd: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/zboot ${DESTDIR}/snapshot - cp ${DESTDIR}/usr/mdec/zbsdmod.o ${DESTDIR}/snapshot + cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR} + cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR} -.PHONY: bsd bootblocks +MDEXT= zboot zbsdmod.o openbsd45_arm.ipk Packages -.endif # DESTDIR check +.PHONY: bsd bootblocks |