[src/trunk]: src/usr.sbin/sysinst Now that the build cluster creates stable "...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/52d3f5a442b6
branches:  trunk
changeset: 835914:52d3f5a442b6
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 16 09:15:12 2018 +0000

description:
Now that the build cluster creates stable "latest" links, use them
as default for downloading sets.

diffstat:

 usr.sbin/sysinst/Makefile.inc |  5 +----
 usr.sbin/sysinst/defs.h       |  6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r 3ad87107a4fb -r 52d3f5a442b6 usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Sun Sep 16 06:09:01 2018 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Sun Sep 16 09:15:12 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 2018/09/12 13:44:05 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2018/09/16 09:15:12 martin Exp $
 #
 # Makefile for sysinst
 
@@ -50,9 +50,6 @@
                -DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
                ${NODISKLABEL:D-DNO_DISKLABEL}
 
-.if (defined(BUILDID))
-COPTS+=        -DBUILDID=\"${BUILDID}\"
-.endif
 .if defined(NETBSD_OFFICIAL_RELEASE) && ${NETBSD_OFFICIAL_RELEASE} == "yes"
 CPPFLAGS+= -DSYSINST_FTP_HOST=\"ftp.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
 CPPFLAGS+= -DSYSINST_HTTP_HOST=\"cdn.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
diff -r 3ad87107a4fb -r 52d3f5a442b6 usr.sbin/sysinst/defs.h
--- a/usr.sbin/sysinst/defs.h   Sun Sep 16 06:09:01 2018 +0000
+++ b/usr.sbin/sysinst/defs.h   Sun Sep 16 09:15:12 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.17 2018/09/12 13:44:05 martin Exp $ */
+/*     $NetBSD: defs.h,v 1.18 2018/09/16 09:15:12 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -347,10 +347,8 @@
 #if !defined(SYSINST_FTP_DIR)
 #if defined(NETBSD_OFFICIAL_RELEASE)
 #define SYSINST_FTP_DIR                "pub/NetBSD/NetBSD-" REL
-#elif defined(BUILDID) && defined(REL_PATH)
-#define SYSINST_FTP_DIR                "pub/NetBSD-daily/" REL_PATH "/" BUILDID
 #elif defined(REL_PATH)
-#define SYSINST_FTP_DIR                "pub/NetBSD-daily/" REL_PATH
+#define SYSINST_FTP_DIR                "pub/NetBSD-daily/" REL_PATH "/latest"
 #else
 #define SYSINST_FTP_DIR                "pub/NetBSD/NetBSD-" REL
 #endif