Module Name: src
Committed By: martin
Date: Wed Sep 12 13:44:05 UTC 2018
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h main.c
Log Message:
Try to properly guess a path on the ftp server for pkg binaries
and use that as default.
Assume for $N.99 (current) we can use $N.0. Otherwise strip all
RC*/STABLE* annotations and just use the plain numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/main.c
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.10 src/usr.sbin/sysinst/Makefile.inc:1.11
--- src/usr.sbin/sysinst/Makefile.inc:1.10 Wed Sep 5 12:01:52 2018
+++ src/usr.sbin/sysinst/Makefile.inc Wed Sep 12 13:44:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2018/09/05 12:01:52 martin Exp $
+# $NetBSD: Makefile.inc,v 1.11 2018/09/12 13:44:05 martin Exp $
#
# Makefile for sysinst
@@ -61,10 +61,13 @@ CPPFLAGS+= -DSYSINST_FTP_HOST=\"nyftp.Ne
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"nycdn.NetBSD.org\"
.if (${DISTRIBVER:M*.99.*})
CPPFLAGS+= -DREL_PATH=\"HEAD\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/\.99\.[0-9]*[_A-Z]*$//}.0\""
.elif (${DISTRIBVER:M*.[0-9].[0-9]*})
CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//:S/./-/}\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.elif (${DISTRIBVER:M*.[0-9]*})
CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//}\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.endif
.endif
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.16 src/usr.sbin/sysinst/defs.h:1.17
--- src/usr.sbin/sysinst/defs.h:1.16 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/defs.h Wed Sep 12 13:44:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.16 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: defs.h,v 1.17 2018/09/12 13:44:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -367,6 +367,10 @@ int clean_xfer_dir;
#define SYSINST_PKG_DIR "pub/pkgsrc/packages/NetBSD"
#endif
+#if !defined(PKG_SUBDIR)
+#define PKG_SUBDIR REL
+#endif
+
#if !defined(SYSINST_PKGSRC_HOST)
#define SYSINST_PKGSRC_HOST SYSINST_PKG_HOST
#endif
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.8 src/usr.sbin/sysinst/main.c:1.9
--- src/usr.sbin/sysinst/main.c:1.8 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/main.c Wed Sep 12 13:44:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: main.c,v 1.9 2018/09/12 13:44:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -112,7 +112,7 @@ static const struct f_arg fflagopts[] =
{"pkg host", SYSINST_PKG_HOST, pkg.xfer_host[XFER_FTP], sizeof pkg.xfer_host[XFER_FTP]},
{"pkg http host", SYSINST_PKG_HTTP_HOST, pkg.xfer_host[XFER_HTTP], sizeof pkg.xfer_host[XFER_HTTP]},
{"pkg dir", SYSINST_PKG_DIR, pkg.dir, sizeof pkg.dir},
- {"pkg prefix", "/" MACH "/" REL "/All", pkg_dir, sizeof pkg_dir},
+ {"pkg prefix", "/" MACH "/" PKG_SUBDIR "/All", pkg_dir, sizeof pkg_dir},
{"pkg user", "ftp", pkg.user, sizeof pkg.user},
{"pkg pass", "", pkg.pass, sizeof pkg.pass},
{"pkg proxy", "", pkg.proxy, sizeof pkg.proxy},
