Module Name: src
Committed By: rin
Date: Sat Jun 29 07:52:16 UTC 2024
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/efiboot: Makefile.efiboot
src/sys/arch/i386/stand/pxeboot: Makefile
Removed Files:
src/sys/arch/i386/stand/libsa: nfs.c
Log Message:
i386: stand: Retire its own nfs.c, and switch to libsa/nfs.c. NFC
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.21 -r0 src/sys/arch/i386/stand/libsa/nfs.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/stand/pxeboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.97 src/sys/arch/i386/stand/Makefile.booters:1.98
--- src/sys/arch/i386/stand/Makefile.booters:1.97 Sat Jun 29 07:38:07 2024
+++ src/sys/arch/i386/stand/Makefile.booters Sat Jun 29 07:52:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.97 2024/06/29 07:38:07 rin Exp $
+# $NetBSD: Makefile.booters,v 1.98 2024/06/29 07:52:16 rin Exp $
NOLIBCSANITIZER=
NOSANITIZER=
@@ -59,6 +59,7 @@ LIBZ= ${ZLIB}
### find out what to use for libsa
SA_AS= library
SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
+SAMISCCPPFLAGS+=-DLIBSA_NFS_IMPLICIT_MOUNT
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
Index: src/sys/arch/i386/stand/efiboot/Makefile.efiboot
diff -u src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.22 src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.23
--- src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.22 Mon Jul 24 01:56:59 2023
+++ src/sys/arch/i386/stand/efiboot/Makefile.efiboot Sat Jun 29 07:52:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.22 2023/07/24 01:56:59 rin Exp $
+# $NetBSD: Makefile.efiboot,v 1.23 2024/06/29 07:52:16 rin Exp $
S= ${.CURDIR}/../../../../..
@@ -21,9 +21,7 @@ LIBI386SRCS= biosdisk.c bootinfo.c booti
LIBI386SRCS+= comio_direct.c
LIBI386SRCS+= diskbuf.c exec.c menuutils.c parseutils.c pread.c
LIBI386SRCS+= exec_multiboot1.c exec_multiboot2.c
-# use our own nfs implementation
-LIBSASRCS+= nfs.c
-SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS} ${LIBSASRCS}
+SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS}
.include <bsd.init.mk>
@@ -86,6 +84,7 @@ GNUEFIARCH?= ${MACHINE_CPU}
CPPFLAGS+= -I${EFIDIR}/inc -I${EFIDIR}/inc/${GNUEFIARCH}
CPPFLAGS+= -I${EFIDIR}/inc/protocol
+SAMISCCPPFLAGS+= -DLIBSA_NFS_IMPLICIT_MOUNT
SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
SAMISCCPPFLAGS+= -DLIBSA_PRINTF_WIDTH_SUPPORT
SAMISCCPPFLAGS+= -D"cdb2devb(bno)=(bno)"
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.28 src/sys/arch/i386/stand/pxeboot/Makefile:1.29
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.28 Fri Sep 27 08:57:10 2019
+++ src/sys/arch/i386/stand/pxeboot/Makefile Sat Jun 29 07:52:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/09/27 08:57:10 gson Exp $
+# $NetBSD: Makefile,v 1.29 2024/06/29 07:52:16 rin Exp $
S= ${.CURDIR}/../../../..
@@ -15,9 +15,6 @@ RELOC= 0x0
SRCS= main.c dev_net.c devopen.c conf.c
SRCS+=exec.c exec_multiboot1.c exec_multiboot2.c pxe.c pxe_call.S
-# use our own nfs implementation
-.PATH: ${.CURDIR}/../libsa
-SRCS+= nfs.c
.include <bsd.init.mk>
