Module Name: src Committed By: dholland Date: Sat Jul 26 19:34:08 UTC 2014
Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/amd64/installimage: Makefile src/distrib/common: list.sysinst list.sysinst.en src/distrib/i386/cdroms: Makefile.cdrom src/distrib/i386/installimage: Makefile src/distrib/ofppc/ramdisks/common: list.sysinst src/distrib/sparc64/cdroms/installcd: Makefile src/distrib/vax/cdroms/installcd: Makefile Log Message: Adjust for sysinst move. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r1.12 -r1.13 src/distrib/common/list.sysinst cvs rdiff -u -r1.1 -r1.2 src/distrib/common/list.sysinst.en cvs rdiff -u -r1.29 -r1.30 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/installimage/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/ofppc/ramdisks/common/list.sysinst cvs rdiff -u -r1.17 -r1.18 src/distrib/sparc64/cdroms/installcd/Makefile cvs rdiff -u -r1.7 -r1.8 src/distrib/vax/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/amd64/cdroms/Makefile.cdrom diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.9 src/distrib/amd64/cdroms/Makefile.cdrom:1.10 --- src/distrib/amd64/cdroms/Makefile.cdrom:1.9 Sun May 18 13:06:12 2014 +++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Jul 26 19:34:08 2014 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.cdrom,v 1.9 2014/05/18 13:06:12 martin Exp $ +# $NetBSD: Makefile.cdrom,v 1.10 2014/07/26 19:34:08 dholland Exp $ .include <bsd.own.mk> -SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} # Need multidot for the boot loader to read kernel modules as it doesn't # understand rockridge. Index: src/distrib/amd64/installimage/Makefile diff -u src/distrib/amd64/installimage/Makefile:1.3 src/distrib/amd64/installimage/Makefile:1.4 --- src/distrib/amd64/installimage/Makefile:1.3 Sat Nov 3 14:25:32 2012 +++ src/distrib/amd64/installimage/Makefile Sat Jul 26 19:34:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ +# $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $ .include <bsd.own.mk> @@ -22,7 +22,7 @@ prepare_md_post: < ${.CURDIR}/boot.cfg.in > boot.cfg DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd -SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} SPEC_EXTRA= ${.CURDIR}/spec.inst IMGFILE_EXTRA= \ Index: src/distrib/common/list.sysinst diff -u src/distrib/common/list.sysinst:1.12 src/distrib/common/list.sysinst:1.13 --- src/distrib/common/list.sysinst:1.12 Sat Aug 27 15:42:56 2005 +++ src/distrib/common/list.sysinst Sat Jul 26 19:34:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: list.sysinst,v 1.12 2005/08/27 15:42:56 xtraeme Exp $ +# $NetBSD: list.sysinst,v 1.13 2014/07/26 19:34:08 dholland Exp $ # # list file (c.f. parselist.awk) for sysinst-using install media. # @@ -8,7 +8,7 @@ PROG sysinst PROG usr/bin/progress -SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE} +SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE} # Foreign texts for sysinst COPY ${OBJDIR}/sysinst/sysinstmsgs.fr sysinstmsgs.fr Index: src/distrib/common/list.sysinst.en diff -u src/distrib/common/list.sysinst.en:1.1 src/distrib/common/list.sysinst.en:1.2 --- src/distrib/common/list.sysinst.en:1.1 Sun Apr 18 20:04:26 2004 +++ src/distrib/common/list.sysinst.en Sat Jul 26 19:34:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: list.sysinst.en,v 1.1 2004/04/18 20:04:26 dsl Exp $ +# $NetBSD: list.sysinst.en,v 1.2 2014/07/26 19:34:08 dholland Exp $ # # list file (c.f. parselist.awk) for sysinst-using install media. # @@ -8,4 +8,4 @@ PROG sysinst PROG usr/bin/progress -SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE} +SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE} Index: src/distrib/i386/cdroms/Makefile.cdrom diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.29 src/distrib/i386/cdroms/Makefile.cdrom:1.30 --- src/distrib/i386/cdroms/Makefile.cdrom:1.29 Sun May 18 13:06:12 2014 +++ src/distrib/i386/cdroms/Makefile.cdrom Sat Jul 26 19:34:08 2014 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.cdrom,v 1.29 2014/05/18 13:06:12 martin Exp $ +# $NetBSD: Makefile.cdrom,v 1.30 2014/07/26 19:34:08 dholland Exp $ .include <bsd.own.mk> -SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} # Need multidot for the boot loader to read kernel modules as it doesn't # understand rockridge. Index: src/distrib/i386/installimage/Makefile diff -u src/distrib/i386/installimage/Makefile:1.3 src/distrib/i386/installimage/Makefile:1.4 --- src/distrib/i386/installimage/Makefile:1.3 Sat Nov 3 14:25:33 2012 +++ src/distrib/i386/installimage/Makefile Sat Jul 26 19:34:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $ +# $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $ .include <bsd.own.mk> @@ -22,7 +22,7 @@ prepare_md_post: < ${.CURDIR}/boot.cfg.in > boot.cfg DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd -SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} SPEC_EXTRA= ${.CURDIR}/spec.inst IMGFILE_EXTRA= \ Index: src/distrib/ofppc/ramdisks/common/list.sysinst diff -u src/distrib/ofppc/ramdisks/common/list.sysinst:1.1 src/distrib/ofppc/ramdisks/common/list.sysinst:1.2 --- src/distrib/ofppc/ramdisks/common/list.sysinst:1.1 Wed Jan 2 11:39:03 2008 +++ src/distrib/ofppc/ramdisks/common/list.sysinst Sat Jul 26 19:34:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: list.sysinst,v 1.1 2008/01/02 11:39:03 mrg Exp $ +# $NetBSD: list.sysinst,v 1.2 2014/07/26 19:34:08 dholland Exp $ # # list file (c.f. parselist.awk) for sysinst-using install media. # @@ -8,7 +8,7 @@ PROG sysinst PROG usr/bin/progress -SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE} +SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE} # XXX missing fr and es; otherwise could use MI common list.sysinst. # Foreign texts for sysinst Index: src/distrib/sparc64/cdroms/installcd/Makefile diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.17 src/distrib/sparc64/cdroms/installcd/Makefile:1.18 --- src/distrib/sparc64/cdroms/installcd/Makefile:1.17 Sun May 18 13:06:12 2014 +++ src/distrib/sparc64/cdroms/installcd/Makefile Sat Jul 26 19:34:08 2014 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.17 2014/05/18 13:06:12 martin Exp $ +# $NetBSD: Makefile,v 1.18 2014/07/26 19:34:08 dholland Exp $ CDBASE= sparc64cd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE # for PRINTOBJDIR .include <bsd.own.mk> -SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} CDRELEASE_NOISOS= true CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR} Index: src/distrib/vax/cdroms/installcd/Makefile diff -u src/distrib/vax/cdroms/installcd/Makefile:1.7 src/distrib/vax/cdroms/installcd/Makefile:1.8 --- src/distrib/vax/cdroms/installcd/Makefile:1.7 Wed Jun 4 19:31:57 2014 +++ src/distrib/vax/cdroms/installcd/Makefile Sat Jul 26 19:34:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/06/04 19:31:57 martin Exp $ +# $NetBSD: Makefile,v 1.8 2014/07/26 19:34:08 dholland Exp $ CDBASE= vaxcd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz @@ -9,7 +9,7 @@ CLEANFILES+= fs.spec # for PRINTOBJDIR .include <bsd.own.mk> -SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} # prepare mutliuser install environment image_md_pre: