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

unify these damnit!

OPENBSD_4_0
deraadt 18 years ago
parent
938c182746
commit
b7aaabec70
14 changed files with 65 additions and 70 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -7
      src/etc/etc.alpha/Makefile.inc
  2. +3
    -3
      src/etc/etc.amd64/Makefile.inc
  3. +6
    -4
      src/etc/etc.armish/Makefile.inc
  4. +4
    -5
      src/etc/etc.aviion/Makefile.inc
  5. +5
    -7
      src/etc/etc.cats/Makefile.inc
  6. +1
    -2
      src/etc/etc.hp300/Makefile.inc
  7. +4
    -4
      src/etc/etc.hppa/Makefile.inc
  8. +4
    -4
      src/etc/etc.hppa64/Makefile.inc
  9. +7
    -5
      src/etc/etc.luna88k/Makefile.inc
  10. +6
    -4
      src/etc/etc.mac68k/Makefile.inc
  11. +6
    -7
      src/etc/etc.macppc/Makefile.inc
  12. +4
    -5
      src/etc/etc.mvme68k/Makefile.inc
  13. +5
    -5
      src/etc/etc.mvme88k/Makefile.inc
  14. +6
    -8
      src/etc/etc.sgi/Makefile.inc

+ 4
- 7
src/etc/etc.alpha/Makefile.inc View File

@ -1,9 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.13 2002/05/13 07:22:42 espie Exp $
# etc.alpha/Makefile.inc -- alpha-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.14 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd distrib boot
snap_md: bsd bootlocks distrib
cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -12,12 +10,11 @@ bsd:
cd ${.CURDIR}/../sys/arch/alpha/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/alpha/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
boot:
bootblocks:
cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot
cp ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/snapshot
cp ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/snapshot
.PHONY: bsd boot
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

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

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.6 2004/08/26 03:34:16 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.7 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd bsd.mp distrib bootblocks
snap_md: bsd bsd.mp bootblocks distrib
cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP/bsd \ cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP/bsd \
@ -22,6 +22,6 @@ bootblocks:
cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot
cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot
.PHONY: bsd bootblocks
.PHONY: bsd bsd.mp bootblocks
.endif # DESTDIR check .endif # DESTDIR check

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

@ -1,8 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.3 2006/06/08 02:29:03 drahn Exp $
# etc.armish/Makefile.inc -- armish-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.4 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd distrib
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -11,6 +10,9 @@ bsd:
cd ${.CURDIR}/../sys/arch/armish/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/armish/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
.PHONY: bsd
bootblocks:
#none needed
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

+ 4
- 5
src/etc/etc.aviion/Makefile.inc View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile.inc,v 1.1 2006/05/09 21:17:13 miod Exp $
# etc.aviion/Makefile.inc -- aviion-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd-generic bootblocks distrib
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
bsd-generic:
bsd:
cd ${.CURDIR}/../sys/arch/aviion/conf && config GENERIC cd ${.CURDIR}/../sys/arch/aviion/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/aviion/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/aviion/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && ${MAKE} ${MAKE} clean && ${MAKE} depend && ${MAKE}
@ -14,6 +13,6 @@ bsd-generic:
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
.PHONY: bsd-generic bootblocks
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

+ 5
- 7
src/etc/etc.cats/Makefile.inc View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.4 2004/02/09 02:28:23 drahn Exp $
# etc.cats/Makefile.inc -- cats-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.5 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd distrib1
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/cats/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/cats/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -11,10 +10,9 @@ bsd:
cd ${.CURDIR}/../sys/arch/cats/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/cats/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
# knows about bsd.rd
distrib1:
${MAKE} distrib
bootblocks:
#none needed
.PHONY: bsd distrib1
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

+ 1
- 2
src/etc/etc.hp300/Makefile.inc View File

@ -1,5 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.18 2005/03/08 20:03:04 miod Exp $
# etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.19 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd bootblocks distrib snap_md: bsd bootblocks distrib


+ 4
- 4
src/etc/etc.hppa/Makefile.inc View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.4 2003/03/28 23:20:51 mickey Exp $
# $OpenBSD: Makefile.inc,v 1.5 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: boot bsd distrib
snap_md: bootblocks bsd distrib
cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -10,9 +10,9 @@ bsd:
cd ${.CURDIR}/../sys/arch/hppa/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/hppa/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
boot:
bootblocks:
cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot
.PHONY: bsd
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

+ 4
- 4
src/etc/etc.hppa64/Makefile.inc View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.1 2005/04/01 16:02:16 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: boot bsd distrib
snap_md: bootblocks bsd distrib
cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -10,9 +10,9 @@ bsd:
cd ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
boot:
bootblocks:
cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot
.PHONY: bsd
.PHONY: bootblocks bsd
.endif # DESTDIR check .endif # DESTDIR check

+ 7
- 5
src/etc/etc.luna88k/Makefile.inc View File

@ -1,16 +1,18 @@
# $OpenBSD: Makefile.inc,v 1.1 2004/04/21 18:23:44 miod Exp $
# etc.luna88k/Makefile.inc -- luna88k-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.2 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd-generic distrib
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
bsd-generic:
bsd:
cd ${.CURDIR}/../sys/arch/luna88k/conf && config GENERIC cd ${.CURDIR}/../sys/arch/luna88k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && ${MAKE} ${MAKE} clean && ${MAKE} depend && ${MAKE}
.PHONY: bsd-generic
bootblocks:
#none needed
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

+ 6
- 4
src/etc/etc.mac68k/Makefile.inc View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.9 2004/12/03 06:37:51 miod Exp $
# etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.10 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd distrib
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
printf "disable ncrscsi\nenable sbc\nquit" | config -e \ printf "disable ncrscsi\nenable sbc\nquit" | config -e \
@ -13,6 +12,9 @@ bsd:
cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
.PHONY: bsd
bootblocks:
#none needed
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

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

@ -1,8 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.7 2003/03/24 18:57:21 drahn Exp $
# etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.8 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd distrib1
snap_md: bsd bootblocks distrib gzip_bsd.rd
cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -11,14 +10,14 @@ bsd:
cd ${.CURDIR}/../sys/arch/macppc/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/macppc/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
# knows about bsd.rd
distrib1:
bootblocks:
cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/ofwboot cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/ofwboot
cp ${DESTDIR}/usr/mdec/bsd.tbxi ${DESTDIR}/snapshot/bsd.tbxi cp ${DESTDIR}/usr/mdec/bsd.tbxi ${DESTDIR}/snapshot/bsd.tbxi
${MAKE} distrib
gzip_bsd.rd:
gzip -9 ${DESTDIR}/snapshot/bsd.rd gzip -9 ${DESTDIR}/snapshot/bsd.rd
mv ${DESTDIR}/snapshot/bsd.rd.gz ${DESTDIR}/snapshot/bsd.rd mv ${DESTDIR}/snapshot/bsd.rd.gz ${DESTDIR}/snapshot/bsd.rd
.PHONY: bsd distrib1
.PHONY: bootblocks bsd gzip_bsd.rd
.endif # DESTDIR check .endif # DESTDIR check

+ 4
- 5
src/etc/etc.mvme68k/Makefile.inc View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile.inc,v 1.8 2002/05/13 07:22:43 espie Exp $
# etc.mvme68k/Makefile.inc -- mvme68k-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.9 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd-generic bootblocks distrib
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
bsd-generic:
bsd:
cd ${.CURDIR}/../sys/arch/mvme68k/conf && config GENERIC cd ${.CURDIR}/../sys/arch/mvme68k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
@ -14,6 +13,6 @@ bsd-generic:
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
.PHONY: bsd-generic bootblocks
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

+ 5
- 5
src/etc/etc.mvme88k/Makefile.inc View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile.inc,v 1.6 2003/08/15 13:37:56 miod Exp $
# etc.mvme88k/Makefile.inc -- mvme88k-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.7 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd-generic bootblocks distrib
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
bsd-generic:
bsd:
cd ${.CURDIR}/../sys/arch/mvme88k/conf && config GENERIC cd ${.CURDIR}/../sys/arch/mvme88k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && ${MAKE} ${MAKE} clean && ${MAKE} depend && ${MAKE}
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/ cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
.PHONY: bsd-generic bootblocks
.PHONY: bsd bootblocks
.endif # DESTDIR check .endif # DESTDIR check

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

@ -1,9 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.3 2006/07/24 18:11:47 deraadt Exp $
# etc.sgi/Makefile.inc -- sgi-specific etc Makefile targets
# $OpenBSD: Makefile.inc,v 1.4 2006/07/27 02:53:55 deraadt Exp $
.ifdef DESTDIR .ifdef DESTDIR
snap_md: bsd distrib1
snap_md: bsd bootblocks distrib
cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC/bsd \
${DESTDIR}/snapshot/bsd ${DESTDIR}/snapshot/bsd
@ -12,9 +10,9 @@ bsd:
cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC && \ cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE} ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
distrib1:
${MAKE} distrib
bootblocks:
#none needed
.PHONY: bsd distrib1
.PHONY: bsd bootblocks
.endif
.endif # DESTDIR check

Write Preview
Loading…
Cancel
Save