Module Name: src
Committed By: martin
Date: Sun Sep 16 09:15:12 UTC 2018
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h
Log Message:
Now that the build cluster creates stable "latest" links, use them
as default for downloading sets.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/sysinst/defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.11 src/usr.sbin/sysinst/Makefile.inc:1.12
--- src/usr.sbin/sysinst/Makefile.inc:1.11 Wed Sep 12 13:44:05 2018
+++ src/usr.sbin/sysinst/Makefile.inc Sun Sep 16 09:15:12 2018
@@ -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 @@ CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.C
-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
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.17 src/usr.sbin/sysinst/defs.h:1.18
--- src/usr.sbin/sysinst/defs.h:1.17 Wed Sep 12 13:44:05 2018
+++ src/usr.sbin/sysinst/defs.h Sun Sep 16 09:15:12 2018
@@ -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 @@ int clean_xfer_dir;
#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
