Module Name: src
Committed By: yamt
Date: Thu May 22 11:37:21 UTC 2014
Modified Files:
src/rescue [yamt-pagecache]: Makefile list list.pdisk
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.6.1 src/rescue/Makefile
cvs rdiff -u -r1.42.2.1 -r1.42.2.2 src/rescue/list
cvs rdiff -u -r1.1 -r1.1.54.1 src/rescue/list.pdisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.27 src/rescue/Makefile:1.27.6.1
--- src/rescue/Makefile:1.27 Wed Mar 10 23:13:10 2010
+++ src/rescue/Makefile Thu May 22 11:37:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/03/10 23:13:10 abs Exp $
+# $NetBSD: Makefile,v 1.27.6.1 2014/05/22 11:37:21 yamt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,7 +6,7 @@
WARNS= 1
# XXX
.if ${MACHINE_ARCH} != "m68000"
-DBG= -Os
+DBG+= -Os
.endif
CRUNCHGEN_FLAGS=-d "${DBG}"
@@ -19,13 +19,20 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig pdisk
+.for f in ldconfig
PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
LISTS+= ${.CURDIR}/list.${f}
.endif
.endfor
+.for f in pdisk
+PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin && ${MAKE} -V PROG
+.if (${PROG_${f}} != "")
+LISTS+= ${.CURDIR}/list.${f}
+.endif
+.endfor
+
.if ${USE_INET6} != "no"
LISTS+= ${.CURDIR}/list.inet6
.endif
@@ -40,6 +47,9 @@ LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bi
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 && ${PRINTOBJDIR}
PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
+SMB_LIBDIR!= cd ${NETBSDSRCDIR}/external/bsd/smbfs/lib/libsmb && ${PRINTOBJDIR}
+PARSELISTENV+= SMB_LIBDIR=${SMB_LIBDIR}
+
# Specially built objects to override the behaviour of
# various library functions
#
Index: src/rescue/list
diff -u src/rescue/list:1.42.2.1 src/rescue/list:1.42.2.2
--- src/rescue/list:1.42.2.1 Tue Oct 30 18:59:24 2012
+++ src/rescue/list Thu May 22 11:37:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.42.2.1 2012/10/30 18:59:24 yamt Exp $
+# $NetBSD: list,v 1.42.2.2 2014/05/22 11:37:21 yamt Exp $
SRCDIRS bin
@@ -86,6 +86,8 @@ PROG mount_null
PROG mount_overlay
PROG mount_procfs
PROG mount_smbfs
+SPECIAL mount_smbfs srcdir external/bsd/smbfs/sbin/mount_smbfs
+LIBS ${SMB_LIBDIR}/libsmb.a
PROG mount_tmpfs
PROG mount_umap
PROG mount_union
@@ -130,7 +132,7 @@ PROG less more
SPECIAL less srcdir external/bsd/less/bin/less
PROG vi ex
-SPECIAL vi srcdir usr.bin/nvi/build
+SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi
SRCDIRS usr.sbin
Index: src/rescue/list.pdisk
diff -u src/rescue/list.pdisk:1.1 src/rescue/list.pdisk:1.1.54.1
--- src/rescue/list.pdisk:1.1 Thu Aug 22 01:23:47 2002
+++ src/rescue/list.pdisk Thu May 22 11:37:21 2014
@@ -1,3 +1,4 @@
-# $NetBSD: list.pdisk,v 1.1 2002/08/22 01:23:47 lukem Exp $
+# $NetBSD: list.pdisk,v 1.1.54.1 2014/05/22 11:37:21 yamt Exp $
PROG pdisk
+SPECIAL pdisk srcdir external/bsd/pdisk/bin
