Module Name: src
Committed By: martin
Date: Sun Dec 16 11:36:08 UTC 2018
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h main.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.13 -r1.14 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.14 src/usr.sbin/sysinst/Makefile.inc:1.15
--- src/usr.sbin/sysinst/Makefile.inc:1.14 Sat Oct 6 18:45:37 2018
+++ src/usr.sbin/sysinst/Makefile.inc Sun Dec 16 11:36:08 2018
@@ -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 @@ CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.C
${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
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.28 src/usr.sbin/sysinst/defs.h:1.29
--- src/usr.sbin/sysinst/defs.h:1.28 Tue Nov 27 17:13:41 2018
+++ src/usr.sbin/sysinst/defs.h Sun Dec 16 11:36:08 2018
@@ -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 @@ int clean_xfer_dir;
#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
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.13 src/usr.sbin/sysinst/main.c:1.14
--- src/usr.sbin/sysinst/main.c:1.13 Wed Nov 7 21:20:23 2018
+++ src/usr.sbin/sysinst/main.c Sun Dec 16 11:36:08 2018
@@ -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 @@ struct f_arg {
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 @@ 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 "/" 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},
