diff --git a/distrib/acorn32/kernels/Makefile b/distrib/acorn32/kernels/Makefile index fbaa07c8ce36..254809ef7714 100644 --- a/distrib/acorn32/kernels/Makefile +++ b/distrib/acorn32/kernels/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.14 2002/05/02 18:02:17 lukem Exp $ +# $NetBSD: Makefile,v 1.15 2002/05/08 21:44:54 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - +MDSETTARGETS= INSTALL ${RAMDISK} - MDSET_RELEASEDIR= installation/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/alpha/instkernel/instkernel/Makefile b/distrib/alpha/instkernel/instkernel/Makefile index 7dc4cb624a1f..6a0a1baa60e4 100644 --- a/distrib/alpha/instkernel/instkernel/Makefile +++ b/distrib/alpha/instkernel/instkernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.24 2002/05/02 18:02:20 lukem Exp $ +# $NetBSD: Makefile,v 1.25 2002/05/08 21:44:54 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} netbsd +MDSETTARGETS= INSTALL ${RAMDISK} netbsd MDSET_RELEASEDIR= installation/instkernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/arc/instkernel/Makefile b/distrib/arc/instkernel/Makefile index 65b793c27d87..6ee940ecdf75 100644 --- a/distrib/arc/instkernel/Makefile +++ b/distrib/arc/instkernel/Makefile @@ -1,21 +1,18 @@ -# $NetBSD: Makefile,v 1.5 2002/05/03 15:22:57 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2002/05/08 21:44:54 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= RAMDISK ${RAMDISK} - - -MDSET.-.suffixes= ecoff -MDSET.-.post= OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \ - ${OBJCOPY} -O ecoff-littlemips \ - -R .mdebug -R .ident \ - ${.TARGET:R} ${.TARGET:R}.ecoff && \ - gzip -9f ${.TARGET:R}.ecoff +MDSETTARGETS= RAMDISK ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel +MDSET_SUFFIXES.-= ecoff create-ecoff +create-ecoff= ${OBJCOPY} -O ecoff-littlemips \ + -R .mdebug -R .ident ${.TARGET:R} ${.TARGET} + .include "${DISTRIBDIR}/common/Makefile.mdset" .include diff --git a/distrib/cats/instkernel/Makefile b/distrib/cats/instkernel/Makefile index 4375c510e8a2..cfbfc168127a 100644 --- a/distrib/cats/instkernel/Makefile +++ b/distrib/cats/instkernel/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.8 2002/05/03 15:22:58 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2002/05/08 21:44:54 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} netbsd.aout-INSTALL - -MDSET.netbsd.aout-INSTALL.post= \ - OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \ - ${KERNSRCDIR}/arch/arm/conf/elf2aout.sh \ - ${.TARGET:R} ${.TARGET:R} +MDSETTARGETS= INSTALL ${RAMDISK} netbsd.aout-INSTALL MDSET_RELEASEDIR= binary/kernel +MDSET_POST.netbsd.aout-INSTALL=OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \ + ${KERNSRCDIR}/arch/arm/conf/elf2aout.sh \ + ${.TARGET} ${.TARGET} + + .include "${DISTRIBDIR}/common/Makefile.mdset" .include diff --git a/distrib/common/Makefile.mdset b/distrib/common/Makefile.mdset index 801ac872b3f9..781cc87e4d8d 100644 --- a/distrib/common/Makefile.mdset +++ b/distrib/common/Makefile.mdset @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.mdset,v 1.14 2002/05/07 03:34:17 lukem Exp $ +# $NetBSD: Makefile.mdset,v 1.15 2002/05/08 21:44:55 lukem Exp $ # # Makefile snippet to ${MDSETIMAGE} file system images into kernels # @@ -21,25 +21,26 @@ # Optional variables: # MDSET_RELEASEDIR Where to install release kernels. # -# MDSET.${FILENAME}.nosymbols If defined, don't generate +# MDSET_NOSYMBOLS.${FILENAME} If defined, don't generate # ${FILENAME}.symbols.gz # -# MDSET.${FILENAME}.post For each kernel named ${FILENAME}, +# MDSET_POST.${FILENAME} For each kernel named ${FILENAME}, # execute this after ${NM} / ${STRIP}. -# Kernel is available as "${.TARGET:R}" -# If MDSET.${FILENAME}.suffixes uses -# this to build extra kernels, the -# resultant file must be gzipped by this -# as "${.TARGET:R}.${suffix}.gz" +# Kernel is available as "${.TARGET}" # -# MDSET.${FILENAME}.suffixes List of extra install kernel suffixes. -# The extra kernels are usually created -# by MDSET.${FILENAME}.post. +# MDSET_SUFFIXES.${FILENAME} List of extra install kernel suffixes +# and build commands to create from +# ${FILENAME} after its created by +# ${MDSET} ; ${NM} ; ${STRIP}: +# SUFFIX COMMANDVAR +# "${.TARGET}" is "${FILENAME}.${SUFFIX}" +# COMMANDVAR is the name of the variable +# containing the command to build +# ${.TARGET}. # # Variables modified by this: # KERNELS List of kernel .gz files to build # KERNELSYMS List of kernel .symbol.gz files to build -# _KERNEL.${KERNEL} Target filename for ${KERNEL} # .include @@ -53,33 +54,51 @@ _KERNEL.${_K}:= ${_F} .endif KERNELS+= ${_KERNEL.${_K}}.gz -.for suf in ${MDSET.${_FILENAME}.suffixes} -KERNELS+= ${_KERNEL.${_K}}.${suf}.gz -CLEANFILES+= ${_KERNEL.${_K}}.${suf} -.endfor -.if !defined(MDSET.${_FILENAME}.nosymbols) + +.for _S _C in ${MDSET_SUFFIXES.${_FILENAME}} # { +KERNELS+= ${_KERNEL.${_K}}.${_S}.gz +CLEANFILES+= ${_KERNEL.${_K}}.${_S} + +${_KERNEL.${_K}}.${_S}: ${_KERNEL.${_K}} +.if defined(${_C}) + ${${_C}} +.else + @echo "No such variable \"${_C}\"" + false +.endif + +${_KERNEL.${_K}}.${_S}.gz: ${_KERNEL.${_K}}.${_S} + -rm -f ${.TARGET} + gzip -9c ${.ALLSRC} > ${.TARGET} + +.endfor # } + +.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) KERNELSYMS+= ${_KERNEL.${_K}}.symbols.gz .endif -.if defined(MDSET.${_FILENAME}.post) -_POST.${_KERNEL.${_K}}:= ${MDSET.${_FILENAME}.post} +.if defined(MDSET_POST.${_FILENAME}) +_POST.${_KERNEL.${_K}}:= ${MDSET_POST.${_FILENAME}} .endif -${_KERNEL.${_K}}.gz: .NOTMAIN ${KERNOBJDIR}/${_K}/netbsd ${_I} +${_KERNEL.${_K}}: .NOTMAIN ${KERNOBJDIR}/${_K}/netbsd ${_I} @echo "mdsetimage: ${KERNOBJDIR}/${_K}/netbsd" @echo " with: ${_I}" @echo " into: ${.TARGET}" - @rm -f ${.TARGET:R} ${.TARGET:R}.symbols.gz - @cp ${KERNOBJDIR}/${_K}/netbsd ${.TARGET:R} - ${MDSETIMAGE} -v ${.TARGET:R} ${_I} -.if !defined(MDSET.${_FILENAME}.nosymbols) - ${NM} ${.TARGET:R} | gzip -9 > ${.TARGET:R}.symbols.gz + @rm -f ${.TARGET} ${.TARGET}.symbols.gz + @cp ${KERNOBJDIR}/${_K}/netbsd ${.TARGET} + ${MDSETIMAGE} -v ${.TARGET} ${_I} +.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) + ${NM} ${.TARGET} | gzip -9 > ${.TARGET}.symbols.gz .endif - ${STRIP} ${.TARGET:R} -.if defined(_POST.${.TARGET:R}) - ${_POST.${.TARGET:R}} + ${STRIP} ${.TARGET} +.if defined(MDSET_POST.${_FILENAME}) + ${_POST.${.TARGET}} .endif - gzip -9f ${.TARGET:R} + +${_KERNEL.${_K}}.gz: ${_KERNEL.${_K}} + -rm -f ${.TARGET} + gzip -9c ${.ALLSRC} > ${.TARGET} CLEANFILES+= ${_KERNEL.${_K}} diff --git a/distrib/evbarm/instkernel/instkernel/Makefile b/distrib/evbarm/instkernel/instkernel/Makefile index 351dc64a4e38..1114c04630b2 100644 --- a/distrib/evbarm/instkernel/instkernel/Makefile +++ b/distrib/evbarm/instkernel/instkernel/Makefile @@ -1,20 +1,19 @@ -# $NetBSD: Makefile,v 1.6 2002/05/03 15:22:58 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2002/05/08 21:44:55 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= TEAMASA_NPWR_INSTALL ${RAMDISK} - - -MDSET.-.suffixes= srec bin -MDSET.-.post= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET:R}.srec && \ - gzip -9f ${.TARGET:R}.srec ; \ - ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET:R}.bin && \ - gzip -9f ${.TARGET:R}.bin +MDSETTARGETS= TEAMASA_NPWR_INSTALL ${RAMDISK} - MDSET_RELEASEDIR= installation/instkernel +MDSET_SUFFIXES.-= srec create-srec bin create-bin +create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET} +create-bin= ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET} + + .include "${DISTRIBDIR}/common/Makefile.mdset" .include diff --git a/distrib/hp300/instkernel/Makefile b/distrib/hp300/instkernel/Makefile index 4db8d900703d..7402cdfc7260 100644 --- a/distrib/hp300/instkernel/Makefile +++ b/distrib/hp300/instkernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2002/05/02 18:02:34 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2002/05/08 21:44:55 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= RAMDISK ${RAMDISK} - +MDSETTARGETS= RAMDISK ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/hpcmips/Makefile b/distrib/hpcmips/Makefile index f2c5d1b5b315..afc0bb46548d 100644 --- a/distrib/hpcmips/Makefile +++ b/distrib/hpcmips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/05/07 03:34:16 lukem Exp $ +# $NetBSD: Makefile,v 1.21 2002/05/08 21:44:55 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -7,9 +7,9 @@ MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR} MINIROOT= ${MINIROOTOBJ}/miniroot.fs -MDSETTARGETS= RAMDISK ${MINIROOT} netbsd \ - INSTALL_TX3912 ${MINIROOT} netbsd.TX3912 +MDSETTARGETS= RAMDISK ${MINIROOT} netbsd \ + INSTALL_TX3912 ${MINIROOT} netbsd.TX3912 MDSET_RELEASEDIR= installation PBSDBOOTDIR= ${KERNSRCDIR}/arch/${MACHINE}/stand/pbsdboot diff --git a/distrib/i386/floppies/kernel-ramdisk/Makefile b/distrib/i386/floppies/kernel-ramdisk/Makefile index 40331e165715..1df71d0ecfb6 100644 --- a/distrib/i386/floppies/kernel-ramdisk/Makefile +++ b/distrib/i386/floppies/kernel-ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/05/02 18:02:37 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2002/05/08 21:44:56 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -14,12 +14,11 @@ ${V}DIR!= cd ${.CURDIR}/../${F} && ${PRINTOBJDIR} ${V}= ${${V}DIR}/${F}.fs .endfor -MDSETTARGETS= INSTALL ${RAMDISK_B} - \ - INSTALL_LAPTOP ${RAMDISK_B} - \ - INSTALL_SMALL ${RAMDISK_S} - \ - INSTALL_TINY ${RAMDISK_T} - \ - INSTALL_PS2 ${RAMDISK_S} - - +MDSETTARGETS= INSTALL ${RAMDISK_B} - \ + INSTALL_LAPTOP ${RAMDISK_B} - \ + INSTALL_SMALL ${RAMDISK_S} - \ + INSTALL_TINY ${RAMDISK_T} - \ + INSTALL_PS2 ${RAMDISK_S} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/i386/floppies/kernel-rescue/Makefile b/distrib/i386/floppies/kernel-rescue/Makefile index 168d2c0caacc..030946e15474 100644 --- a/distrib/i386/floppies/kernel-rescue/Makefile +++ b/distrib/i386/floppies/kernel-rescue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/05/02 18:02:37 lukem Exp $ +# $NetBSD: Makefile,v 1.18 2002/05/08 21:44:56 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -13,9 +13,8 @@ ${V}DIR!= cd ${.CURDIR}/../${F} && ${PRINTOBJDIR} ${V}= ${${V}DIR}/${F}.fs .endfor -MDSETTARGETS= INSTALL_SMALL ${RAMDISK_S} netbsd.RESCUE_SMALL \ - INSTALL_TINY ${RAMDISK_T} netbsd.RESCUE_TINY - +MDSETTARGETS= INSTALL_SMALL ${RAMDISK_S} netbsd.RESCUE_SMALL \ + INSTALL_TINY ${RAMDISK_T} netbsd.RESCUE_TINY MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/mac68k/instkernel/instkernel/Makefile b/distrib/mac68k/instkernel/instkernel/Makefile index a47902515bf2..b5bf2739c27f 100644 --- a/distrib/mac68k/instkernel/instkernel/Makefile +++ b/distrib/mac68k/instkernel/instkernel/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.15 2002/05/02 18:02:39 lukem Exp $ +# $NetBSD: Makefile,v 1.16 2002/05/08 21:44:56 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} netbsd-INSTALL \ - INSTALLSBC ${RAMDISK} netbsd-INSTALLSBC +MDSETTARGETS= INSTALL ${RAMDISK} netbsd-INSTALL \ + INSTALLSBC ${RAMDISK} netbsd-INSTALLSBC MDSET_RELEASEDIR= installation/instkernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/macppc/floppies/md-kernel/Makefile b/distrib/macppc/floppies/md-kernel/Makefile index 7eb23c6114e9..d70e884779bf 100644 --- a/distrib/macppc/floppies/md-kernel/Makefile +++ b/distrib/macppc/floppies/md-kernel/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.10 2002/05/02 18:02:40 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2002/05/08 21:44:56 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - \ - GENERIC_MD ${RAMDISK} - +MDSETTARGETS= INSTALL ${RAMDISK} - \ + GENERIC_MD ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/mipsco/instkernel/Makefile b/distrib/mipsco/instkernel/Makefile index 211c2144998f..601944873e36 100644 --- a/distrib/mipsco/instkernel/Makefile +++ b/distrib/mipsco/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/05/03 15:22:55 lukem Exp $ +# $NetBSD: Makefile,v 1.14 2002/05/08 21:44:56 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -11,22 +11,22 @@ LISTS= ${.CURDIR}/list MTREECONF= ${DISTRIBDIR}/common/mtree.dot IMAGEENDIAN= be PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs -IMAGEDEPENDS= install.gz ${DESTDIR}/usr/mdec/boot ${PRIMARYBOOT} +IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot ${PRIMARYBOOT} IMAGEPOSTBUILD= ${DESTDIR}/usr/mdec/installboot ${IMAGE} ${PRIMARYBOOT} # XXXDISTRIB RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= RAMDISK ${RAMDISK} install +MDSETTARGETS= RAMDISK ${RAMDISK} netbsd-INSTALL MDSET_RELEASEDIR= binary/kernel -IMAGE_RELEASEDIR= installation/diskimage .if defined(ECOFF_KERNEL) -MDSET.install.suffixes= ecoff -MDSET.install.post= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET:R}.ecoff && \ - gzip -9f ${.TARGET:R}.ecoff +MDSET_SUFFIXES.netbsd-INSTALL= ecoff create-ecoff +create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET} .endif # ECOFF_KERNEL +IMAGE_RELEASEDIR= installation/diskimage + .include "${DISTRIBDIR}/common/Makefile.image" .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/mipsco/instkernel/list b/distrib/mipsco/instkernel/list index 88d8cca1330e..5e190f0f5703 100644 --- a/distrib/mipsco/instkernel/list +++ b/distrib/mipsco/instkernel/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2002/05/03 14:20:55 lukem Exp $ +# $NetBSD: list,v 1.5 2002/05/08 21:44:53 lukem Exp $ COPY ${DESTDIR}/usr/mdec/boot boot -COPY ${OBJDIR}/install.gz netbsd +COPY ${OBJDIR}/netbsd-INSTALL.gz netbsd diff --git a/distrib/mvme68k/instkernel/Makefile b/distrib/mvme68k/instkernel/Makefile index e706b17b25d6..c10d23510be3 100644 --- a/distrib/mvme68k/instkernel/Makefile +++ b/distrib/mvme68k/instkernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2002/05/02 18:02:42 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2002/05/08 21:44:57 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= RAMDISK ${RAMDISK} - +MDSETTARGETS= RAMDISK ${RAMDISK} - MDSET_RELEASEDIR= installation/tapeimage .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/news68k/floppies/ramdisk-kernel/Makefile b/distrib/news68k/floppies/ramdisk-kernel/Makefile index e1b6fe23fa7b..330ce4e4a3d0 100644 --- a/distrib/news68k/floppies/ramdisk-kernel/Makefile +++ b/distrib/news68k/floppies/ramdisk-kernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.11 2002/05/02 18:02:44 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2002/05/08 21:44:57 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - +MDSETTARGETS= INSTALL ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/newsmips/floppies/instkernel/Makefile b/distrib/newsmips/floppies/instkernel/Makefile index 9065dbb229c1..a4b8c572bad5 100644 --- a/distrib/newsmips/floppies/instkernel/Makefile +++ b/distrib/newsmips/floppies/instkernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2002/05/02 18:02:45 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2002/05/08 21:44:57 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - +MDSETTARGETS= INSTALL ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/playstation2/Makefile b/distrib/playstation2/Makefile index 9caf9fc5daa5..0477d4ad9d45 100644 --- a/distrib/playstation2/Makefile +++ b/distrib/playstation2/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.11 2002/05/02 18:02:47 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2002/05/08 21:44:58 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" MINIROOTDIR!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR} MINIROOT= ${MINIROOTDIR}/miniroot.fs -MDSETTARGETS= RAMDISK ${MINIROOT} netbsd +MDSETTARGETS= RAMDISK ${MINIROOT} netbsd MDSET_RELEASEDIR= installation .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/pmax/instkernel/Makefile b/distrib/pmax/instkernel/Makefile index 6238dc66448d..248f69a2171c 100644 --- a/distrib/pmax/instkernel/Makefile +++ b/distrib/pmax/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/05/03 15:22:56 lukem Exp $ +# $NetBSD: Makefile,v 1.33 2002/05/08 21:44:58 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -11,19 +11,19 @@ LISTS= ${.CURDIR}/list MTREECONF= ${DISTRIBDIR}/common/mtree.dot IMAGEENDIAN= le PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs -IMAGEDEPENDS= install.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT} +IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT} IMAGEPOSTBUILD= ${INSTALLBOOT} -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT} RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= RAMDISK ${RAMDISK} install +MDSETTARGETS= RAMDISK ${RAMDISK} netbsd-INSTALL MDSET_RELEASEDIR= binary/kernel -IMAGE_RELEASEDIR= installation/diskimage -MDSET.install.suffixes= ecoff -MDSET.install.post= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET:R}.ecoff && \ - gzip -9f ${.TARGET:R}.ecoff +MDSET_SUFFIXES.netbsd-INSTALL= ecoff create-ecoff +create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET} + +IMAGE_RELEASEDIR= installation/diskimage .include "${DISTRIBDIR}/common/Makefile.image" .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/pmax/instkernel/list b/distrib/pmax/instkernel/list index 1cd4436ffefd..4dc497e2149e 100644 --- a/distrib/pmax/instkernel/list +++ b/distrib/pmax/instkernel/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2002/05/03 14:20:55 lukem Exp $ +# $NetBSD: list,v 1.5 2002/05/08 21:44:53 lukem Exp $ COPY ${DESTDIR}/usr/mdec/boot.pmax boot.pmax -COPY ${OBJDIR}/install.gz netbsd +COPY ${OBJDIR}/netbsd-INSTALL.gz netbsd diff --git a/distrib/prep/floppies/kernel-ramdisk/Makefile b/distrib/prep/floppies/kernel-ramdisk/Makefile index 76a1fa0fa0f5..c55162c4ba40 100644 --- a/distrib/prep/floppies/kernel-ramdisk/Makefile +++ b/distrib/prep/floppies/kernel-ramdisk/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2002/05/02 18:02:50 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2002/05/08 21:44:58 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - +MDSETTARGETS= INSTALL ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/sandpoint/floppies/md-kernel/Makefile b/distrib/sandpoint/floppies/md-kernel/Makefile index 6a72b9eabd2a..dde3b95bcef4 100644 --- a/distrib/sandpoint/floppies/md-kernel/Makefile +++ b/distrib/sandpoint/floppies/md-kernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.6 2002/05/02 18:02:51 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2002/05/08 21:44:58 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - +MDSETTARGETS= INSTALL ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel .include "${DISTRIBDIR}/common/Makefile.mdset" diff --git a/distrib/shark/instkernel/instkernel/Makefile b/distrib/shark/instkernel/instkernel/Makefile index 198a92dba371..856941c8ee5f 100644 --- a/distrib/shark/instkernel/instkernel/Makefile +++ b/distrib/shark/instkernel/instkernel/Makefile @@ -1,18 +1,19 @@ -# $NetBSD: Makefile,v 1.11 2002/05/03 15:22:57 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2002/05/08 21:44:59 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} - - -MDSET.-.post= OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \ - ${KERNSRCDIR}/arch/arm/conf/elf2aout.sh \ - ${.TARGET:R} ${.TARGET:R} +MDSETTARGETS= INSTALL ${RAMDISK} - MDSET_RELEASEDIR= binary/kernel +MDSET_POST.-= OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \ + ${KERNSRCDIR}/arch/arm/conf/elf2aout.sh \ + ${.TARGET} ${.TARGET} + + .include "${DISTRIBDIR}/common/Makefile.mdset" .include diff --git a/distrib/vax/ramdisk-kernel/Makefile b/distrib/vax/ramdisk-kernel/Makefile index 13d83357982d..417f5a7fb0a0 100644 --- a/distrib/vax/ramdisk-kernel/Makefile +++ b/distrib/vax/ramdisk-kernel/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2002/05/02 18:03:01 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2002/05/08 21:44:59 lukem Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs -MDSETTARGETS= INSTALL ${RAMDISK} install.ram +MDSETTARGETS= INSTALL ${RAMDISK} install.ram MDSET_RELEASEDIR= installation/netboot .include "${DISTRIBDIR}/common/Makefile.mdset"