Clean up make release procedure. But just make through

in distrib/mac68k/miniroot.

Reviewed by fredb, briggs
This commit is contained in:
shiba 2002-03-04 16:43:06 +00:00
parent 877cb55678
commit c6fac1444f
9 changed files with 76 additions and 75 deletions

View File

@ -1,5 +1,14 @@
# $NetBSD: Makefile,v 1.4 1999/12/17 20:48:06 fredb Exp $
# $NetBSD: Makefile,v 1.5 2002/03/04 16:43:08 shiba Exp $
SUBDIR= instkernel # miniroot
.include <bsd.subdir.mk>
.ifndef RELEASEDIR
release:
@echo setenv RELEASEDIR first
@false
.else
release:
cd ${.CURDIR}/instkernel/instkernel && ${MAKE} release
.endif

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.2 1999/12/17 20:48:07 fredb Exp $
# $NetBSD: Makefile,v 1.3 2002/03/04 16:43:09 shiba Exp $
SUBDIR= ramdisk instkernel
TARGETS+= release
.include <bsd.subdir.mk>

View File

@ -1,5 +1,6 @@
# $NetBSD: Makefile.inc,v 1.2 2000/06/17 03:16:54 matt Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile.inc,v 1.3 2002/03/04 16:43:09 shiba Exp $
REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
VER!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh
.include "../../../Makefile.inc"
REV!=sh ${KERNSRCDIR}/conf/osrelease.sh -s
VER!=sh ${KERNSRCDIR}/conf/osrelease.sh

View File

@ -1,32 +1,45 @@
# $NetBSD: Makefile,v 1.7 2002/02/09 13:56:50 lukem Exp $
# $NetBSD: Makefile,v 1.8 2002/03/04 16:43:10 shiba Exp $
.include "../../../Makefile.inc"
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
.include <bsd.kernobj.mk>
.include <bsd.own.mk>
RAMDISK!=cd ${.CURDIR}/../ramdisk; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
${MAKE} -s -f-
INSTALL_KERNEL?=INSTALL
MDSETIMAGE?= mdsetimage
KERNEL=${KERNOBJDIR}/${INSTALL_KERNEL}/netbsd
INSTALL_KERNEL?=netbsd-INSTALL
INSTALL_KERNELSBC?=netbsd-INSTALLSBC
KERNEL=${KERNOBJDIR}/INSTALL/netbsd
KERNELSBC=${KERNOBJDIR}/INSTALLSBC/netbsd
all:
cp ${KERNEL} netbsd-${INSTALL_KERNEL}
${MDSETIMAGE} -v netbsd-${INSTALL_KERNEL} ${RAMDISK}
# XXX Doesn't boot with this. Why?
# strip netbsd-${INSTALL_KERNEL}
# XXX Reported not to boot on some machines.
# gzip -9 -f netbsd-${INSTALL_KERNEL}
gzip -f netbsd-${INSTALL_KERNEL}
${INSTALL_KERNEL}.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
cp ${KERNEL} ${INSTALL_KERNEL}
${MDSETIMAGE} -v ${INSTALL_KERNEL} ${RAMDISK}
gzip -f ${INSTALL_KERNEL}
${INSTALL_KERNELSBC}.gz: .NOTMAIN ${KERNOBJDIR}/INSTALLSBC/netbsd ${RAMDISK}
cp ${KERNELSBC} ${INSTALL_KERNELSBC}
${MDSETIMAGE} -v ${INSTALL_KERNELSBC} ${RAMDISK}
gzip -f ${INSTALL_KERNELSBC}
KERNELS=${INSTALL_KERNEL}.gz ${INSTALL_KERNELSBC}.gz
all: ${KERNELS}
release: all
${INSTALL} -d -m 755 ${RELEASEDIR}/installation/instkernel/ \
${RELEASEDIR}/installation/instkernel/
${INSTALL} ${COPY} -o root -g wheel -m 644 ${INSTALL_KERNEL}.gz \
${RELEASEDIR}/installation/instkernel/
${INSTALL} ${COPY} -o root -g wheel -m 644 ${INSTALL_KERNELSBC}.gz \
${RELEASEDIR}/installation/instkernel/
clean cleandir distclean:
rm -f netbsd*
release: all
${INSTALL} -d -m 755 ${RELEASEDIR}/installation/instkernel/
${INSTALL} ${COPY} -m 644 netbsd-${INSTALL_KERNEL}.gz \
${RELEASEDIR}/installation/instkernel/
.include <bsd.kernobj.mk>
.include <bsd.own.mk>
.include <bsd.obj.mk>
.include <bsd.subdir.mk>

View File

@ -1,12 +1,13 @@
# $NetBSD: Makefile,v 1.11 2002/02/05 23:10:02 wormey Exp $
.ifndef NOTESOBJDIR
NOTESOBJDIR!=cd ${.CURDIR}/../../../notes/mac68k; ${MAKE} ${MAKEFLAGS} -V .OBJDIR
.endif
# $NetBSD: Makefile,v 1.12 2002/03/04 16:43:10 shiba Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
.ifndef NOTESOBJDIR
NOTESOBJDIR!=cd ${.CURDIR}/../../../notes/mac68k;${MAKE} ${MAKEFLAGS} -V .OBJDIR
.endif
IMAGE= ramdisk.fs
CBIN= ramdiskbin
@ -27,17 +28,16 @@ MTREECONF= mtree.conf
CRUNCHGEN?= crunchgen
MTREE?= mtree
all: notes ${CBIN}
all: ${CBIN}
dd if=/dev/zero of=${IMAGE} count=5120
vnconfig -v -c ${VND_CDEV} ${IMAGE}
# disklabel -rw ${VND_CDEV} ${DISKTYPE}
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -m 0 -o space -i 5120 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
KERNOBJDIR=${KERNOBJDIR} \
KERNOBJDIR=${KERNOBJDIR} NOTESOBJDIR=${NOTESOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/src/runlist.sh ${.CURDIR}/${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
@ -50,19 +50,18 @@ unconfig:
-vnconfig -u ${VND_DEV}
-/bin/rm -f ${IMAGE}
notes:
cd ${.CURDIR}/../../../notes/mac68k; ${MAKE} ${MAKEFLAGS} INSTALL.more && \
cp ${NOTESOBJDIR}/INSTALL.more ${.OBJDIR}
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
${CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
${MAKE} -f ${CBIN}.mk all
release:
clean cleandir distclean:
/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
*.o *.cro *.c INSTALL.more
if [ -f ${CBIN}.mk ]; then ${MAKE} -f ${CBIN}.mk clean; fi;
rm -f ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache
rm -f *.core *.o *.cro *.c tmplabel
.INTERRUPT: unconfig

View File

@ -1,4 +1,4 @@
# $NetBSD: list,v 1.6 2000/06/07 20:27:20 thorpej Exp $
# $NetBSD: list,v 1.7 2002/03/04 16:43:11 shiba Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@ -87,7 +87,7 @@ COPY ${CURDIR}/dot.profile .profile
COPY ${CURDIR}/dot.hdprofile tmp/.hdprofile
# and a copy of the INSTALL notes
COPY ${OBJDIR}/INSTALL.more INSTALL.more
COPY ${NOTESOBJDIR}/INSTALL.more INSTALL.more
#the lists of obsolete files used by sysinst
SPECIAL sh ${CURDIR}/../../../../distrib/sets/makeobsolete -b -s ${CURDIR}/../../../../distrib/sets -t ./dist

View File

@ -1,5 +1,4 @@
# $NetBSD: Makefile.inc,v 1.2 1999/03/15 20:54:54 is Exp $
# $NetBSD: Makefile.inc,v 1.3 2002/03/04 16:43:11 shiba Exp $
IMAGESIZE?= 5120 # 2.5MB in 512 byte blocks
VND_GEOM?= 512/32/32/5 # (5) 512KB `cylinders'
IMAGESIZE?= 8192 # 4.0MB in 512 byte blocks
NEWFSOPTS?= -i 8192 -B be

View File

@ -1,4 +1,4 @@
# $NetBSD: list,v 1.2 1997/09/23 06:12:22 scottr Exp $
# $NetBSD: list,v 1.3 2002/03/04 16:43:11 shiba Exp $
# mac68k extra's
LINK instbin sbin/dmesg
@ -9,11 +9,12 @@ SYMLINK ../../instbin usr/bin/cut
SYMLINK ../../instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
SYMLINK ../../instbin usr/bin/netstat
SYMLINK ../../instbin usr/bin/rsh
SYMLINK ../../instbin usr/bin/strings
SYMLINK ../../instbin usr/bin/tset usr/bin/reset
#SYMLINK ../../instbin usr/bin/vi
SYMLINK ../../instbin usr/bin/less usr/bin/more
SYMLINK /bin/cat usr/bin/strings
# crunchgen source directory specials
#CRUNCHSPECIAL vi srcdir usr.bin/vi/build
CRUNCHSPECIAL less srcdir usr.bin/less/less
@ -24,11 +25,11 @@ SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
COPY ${DESTDIR}/dev/MAKEDEV.local dev/MAKEDEV.local
SPECIAL cd dev; sh MAKEDEV all
SPECIAL cd dev; sh MAKEDEV raminst
SPECIAL /bin/rm dev/MAKEDEV
# the zoneinfo
COPYDIR ${DESTDIR}/usr/share/zoneinfo usr/share/zoneinfo
#COPYDIR ${DESTDIR}/usr/share/zoneinfo usr/share/zoneinfo
# and the termcap file
COPY ${CURDIR}/../mac68k/miniroot/termcap usr/share/misc/termcap

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.10 2002/02/01 04:57:24 fredb Exp $
# $NetBSD: Makefile.inc,v 1.11 2002/03/04 16:43:06 shiba Exp $
#
# mac68k-specific release building goo
#
@ -11,28 +11,9 @@ INSTALLATION_DIRS+= installation/instkernel
snap_md_post:
.ifndef UPDATE
cd ${.CURDIR}/../distrib/mac68k/instkernel/ramdisk && ${MAKE} ${MAKEFLAGS} clean
cd ${.CURDIR}/../distrib && ${MAKE} cleandir
.endif
cd ${.CURDIR}/../distrib/mac68k/instkernel/ramdisk && ${MAKE} ${MAKEFLAGS}
.ifndef UPDATE
cd ${.CURDIR}/../distrib/mac68k/instkernel/instkernel && ${MAKE} ${MAKEFLAGS} clean
.endif
.for k in ${BUILD_KERNELS}
.ifndef UPDATE
cd ${.CURDIR}/../distrib/mac68k/instkernel/instkernel && \
${MAKE} clean
.endif
cd ${.CURDIR}/../distrib/mac68k/instkernel/instkernel && \
${MAKE} ${MAKEFLAGS} INSTALL_KERNEL=${k} && \
${MAKE} ${MAKEFLAGS} INSTALL_KERNEL=${k} release
.endfor
cd ${KERNOBJDIR}/GENERICSBC && \
GZIP=-9 ${PAX} -zwf \
${RELEASEDIR}/binary/sets/kern_sbc.tgz netbsd
.ifndef UPDATE
cd ${.CURDIR}/../distrib/notes && ${MAKE} clean
.endif
cd ${.CURDIR}/../distrib/notes && \
${MAKE} ${MAKEFLAGS} && \
${MAKE} ${MAKEFLAGS} release
sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/instkernel
cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE}
cd ${.CURDIR}/../distrib/mac68k && ${MAKE} release
cd ${.CURDIR}/../distrib/notes && ${MAKE} release
sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/instkernel '*.gz'