Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib Adjust for sysinst move.
details: https://anonhg.NetBSD.org/src/rev/916fe31f7bc0
branches: trunk
changeset: 331002:916fe31f7bc0
user: dholland <dholland%NetBSD.org@localhost>
date: Sat Jul 26 19:34:08 2014 +0000
description:
Adjust for sysinst move.
diffstat:
distrib/amd64/cdroms/Makefile.cdrom | 4 ++--
distrib/amd64/installimage/Makefile | 4 ++--
distrib/common/list.sysinst | 4 ++--
distrib/common/list.sysinst.en | 4 ++--
distrib/i386/cdroms/Makefile.cdrom | 4 ++--
distrib/i386/installimage/Makefile | 4 ++--
distrib/ofppc/ramdisks/common/list.sysinst | 4 ++--
distrib/sparc64/cdroms/installcd/Makefile | 4 ++--
distrib/vax/cdroms/installcd/Makefile | 4 ++--
9 files changed, 18 insertions(+), 18 deletions(-)
diffs (150 lines):
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom Sat Jul 26 19:34:08 2014 +0000
@@ -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.
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/amd64/installimage/Makefile
--- a/distrib/amd64/installimage/Makefile Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/amd64/installimage/Makefile Sat Jul 26 19:34:08 2014 +0000
@@ -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 @@
< ${.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= \
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/common/list.sysinst
--- a/distrib/common/list.sysinst Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/common/list.sysinst Sat Jul 26 19:34:08 2014 +0000
@@ -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
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/common/list.sysinst.en
--- a/distrib/common/list.sysinst.en Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/common/list.sysinst.en Sat Jul 26 19:34:08 2014 +0000
@@ -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}
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom Sat Jul 26 19:34:08 2014 +0000
@@ -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.
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/i386/installimage/Makefile
--- a/distrib/i386/installimage/Makefile Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/i386/installimage/Makefile Sat Jul 26 19:34:08 2014 +0000
@@ -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 @@
< ${.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= \
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/ofppc/ramdisks/common/list.sysinst
--- a/distrib/ofppc/ramdisks/common/list.sysinst Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/ofppc/ramdisks/common/list.sysinst Sat Jul 26 19:34:08 2014 +0000
@@ -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
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Sat Jul 26 19:34:08 2014 +0000
@@ -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}
diff -r 4d75d549b287 -r 916fe31f7bc0 distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile Sat Jul 26 19:32:37 2014 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile Sat Jul 26 19:34:08 2014 +0000
@@ -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 @@
# 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:
Home |
Main Index |
Thread Index |
Old Index