Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

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)
OPENBSD_4_6
deraadt 15 years ago
parent
8b81695079
commit
f192de6910
22 changed files with 162 additions and 199 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -18
      src/etc/Makefile
  2. +9
    -9
      src/etc/etc.alpha/Makefile.inc
  3. +10
    -10
      src/etc/etc.amd64/Makefile.inc
  4. +6
    -7
      src/etc/etc.armish/Makefile.inc
  5. +6
    -7
      src/etc/etc.aviion/Makefile.inc
  6. +7
    -8
      src/etc/etc.hp300/Makefile.inc
  7. +6
    -7
      src/etc/etc.hppa/Makefile.inc
  8. +6
    -7
      src/etc/etc.hppa64/Makefile.inc
  9. +13
    -12
      src/etc/etc.i386/Makefile.inc
  10. +8
    -9
      src/etc/etc.landisk/Makefile.inc
  11. +4
    -9
      src/etc/etc.luna88k/Makefile.inc
  12. +5
    -11
      src/etc/etc.mac68k/Makefile.inc
  13. +10
    -13
      src/etc/etc.macppc/Makefile.inc
  14. +6
    -7
      src/etc/etc.mvme68k/Makefile.inc
  15. +7
    -8
      src/etc/etc.mvme88k/Makefile.inc
  16. +8
    -9
      src/etc/etc.mvmeppc/Makefile.inc
  17. +5
    -8
      src/etc/etc.sgi/Makefile.inc
  18. +6
    -7
      src/etc/etc.socppc/Makefile.inc
  19. +9
    -10
      src/etc/etc.sparc/Makefile.inc
  20. +9
    -8
      src/etc/etc.sparc64/Makefile.inc
  21. +6
    -7
      src/etc/etc.vax/Makefile.inc
  22. +7
    -8
      src/etc/etc.zaurus/Makefile.inc

+ 9
- 18
src/etc/Makefile View File

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


+ 9
- 9
src/etc/etc.alpha/Makefile.inc View File

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

+ 10
- 10
src/etc/etc.amd64/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.armish/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.aviion/Makefile.inc View File

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

+ 7
- 8
src/etc/etc.hp300/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.hppa/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.hppa64/Makefile.inc View File

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

+ 13
- 12
src/etc/etc.i386/Makefile.inc View File

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

+ 8
- 9
src/etc/etc.landisk/Makefile.inc View File

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

+ 4
- 9
src/etc/etc.luna88k/Makefile.inc View File

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

+ 5
- 11
src/etc/etc.mac68k/Makefile.inc View File

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

+ 10
- 13
src/etc/etc.macppc/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.mvme68k/Makefile.inc View File

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

+ 7
- 8
src/etc/etc.mvme88k/Makefile.inc View File

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

+ 8
- 9
src/etc/etc.mvmeppc/Makefile.inc View File

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

+ 5
- 8
src/etc/etc.sgi/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.socppc/Makefile.inc View File

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

+ 9
- 10
src/etc/etc.sparc/Makefile.inc View File

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

+ 9
- 8
src/etc/etc.sparc64/Makefile.inc View File

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

+ 6
- 7
src/etc/etc.vax/Makefile.inc View File

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

+ 7
- 8
src/etc/etc.zaurus/Makefile.inc View File

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

Write Preview
Loading…
Cancel
Save