[src/trunk]: src/usr.sbin/sysinst Separate binary sets and binary pkg prefix ...

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

details:   https://anonhg.NetBSD.org/src/rev/9c89efd5b361
branches:  trunk
changeset: 446737:9c89efd5b361
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 16 11:36:08 2018 +0000

description:
Separate binary sets and binary pkg prefix from the machine, and set
it explicitly for evbarm*, evbmips* and evbsh3 so we get the correct
64bit pkgs on aarch64 and also have working defaults on the other
variants.

diffstat:

 usr.sbin/sysinst/Makefile.inc |  9 ++++++++-
 usr.sbin/sysinst/defs.h       |  9 ++++++++-
 usr.sbin/sysinst/main.c       |  8 ++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diffs (80 lines):

diff -r 0c634baf787e -r 9c89efd5b361 usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Sun Dec 16 10:42:32 2018 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Sun Dec 16 11:36:08 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2018/10/06 18:45:37 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2018/12/16 11:36:08 martin Exp $
 #
 # Makefile for sysinst
 
@@ -57,6 +57,13 @@
                ${NODISKLABEL:D-DNO_DISKLABEL} \
                ${NOPARTMAN:D-DNO_PARTMAN}
 
+.if ${MACHINE} == "evbarm"
+    || ${MACHINE} == "evbmips"
+    || ${MACHINE} == "evbsh3"
+CPPFLAGS+=     -DARCH_SUBDIR="\"${MACHINE}-${MACHINE_ARCH}\""
+CPPFLAGS+=     -DPKG_ARCH_SUBDIR="\"${MACHINE_ARCH}\""
+.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 0c634baf787e -r 9c89efd5b361 usr.sbin/sysinst/defs.h
--- a/usr.sbin/sysinst/defs.h   Sun Dec 16 10:42:32 2018 +0000
+++ b/usr.sbin/sysinst/defs.h   Sun Dec 16 11:36:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.28 2018/11/27 17:13:41 martin Exp $ */
+/*     $NetBSD: defs.h,v 1.29 2018/12/16 11:36:08 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -362,6 +362,13 @@
 #endif
 #endif
 
+#if !defined(ARCH_SUBDIR)
+#define        ARCH_SUBDIR     MACH
+#endif
+#if !defined(PKG_ARCH_SUBDIR)
+#define        PKG_ARCH_SUBDIR MACH
+#endif
+
 #if !defined(SYSINST_PKG_HOST)
 #define SYSINST_PKG_HOST       "ftp.NetBSD.org"
 #endif
diff -r 0c634baf787e -r 9c89efd5b361 usr.sbin/sysinst/main.c
--- a/usr.sbin/sysinst/main.c   Sun Dec 16 10:42:32 2018 +0000
+++ b/usr.sbin/sysinst/main.c   Sun Dec 16 11:36:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.13 2018/11/07 21:20:23 martin Exp $ */
+/*     $NetBSD: main.c,v 1.14 2018/12/16 11:36:08 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -88,13 +88,13 @@
 static const struct f_arg fflagopts[] = {
        {"release", REL, rel, sizeof rel},
        {"machine", MACH, machine, sizeof machine},
-       {"xfer dir", "/usr/INSTALL", xfer_dir, sizeof xfer_dir},
+       {"xfer dir", "/unsr/INSTALL", xfer_dir, sizeof xfer_dir},
        {"ext dir", "", ext_dir_bin, sizeof ext_dir_bin},
        {"ext src dir", "", ext_dir_src, sizeof ext_dir_src},
        {"ftp host", SYSINST_FTP_HOST, ftp.xfer_host[XFER_FTP], sizeof ftp.xfer_host[XFER_FTP]},
        {"http host", SYSINST_HTTP_HOST, ftp.xfer_host[XFER_HTTP], sizeof ftp.xfer_host[XFER_HTTP]},
        {"ftp dir", SYSINST_FTP_DIR, ftp.dir, sizeof ftp.dir},
-       {"ftp prefix", "/" MACH "/binary/sets", set_dir_bin, sizeof set_dir_bin},
+       {"ftp prefix", "/" ARCH_SUBDIR "/binary/sets", set_dir_bin, sizeof set_dir_bin},
        {"ftp src prefix", "/source/sets", set_dir_src, sizeof set_dir_src},
        {"ftp user", "ftp", ftp.user, sizeof ftp.user},
        {"ftp pass", "", ftp.pass, sizeof ftp.pass},
@@ -113,7 +113,7 @@
        {"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 "/" PKG_SUBDIR "/All", pkg_dir, sizeof pkg_dir},
+       {"pkg prefix", "/" PKG_ARCH_SUBDIR "/" 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},