Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/agc-symver]: src/rescue Pull up fixes from HEAD after pdisk move to exte...



details:   https://anonhg.NetBSD.org/src/rev/577dd6197df4
branches:  agc-symver
changeset: 785633:577dd6197df4
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Mar 28 05:31:22 2013 +0000

description:
Pull up fixes from HEAD after pdisk move to external

diffstat:

 rescue/Makefile   |  11 +++++++++--
 rescue/list.pdisk |   3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r c6ef37af6817 -r 577dd6197df4 rescue/Makefile
--- a/rescue/Makefile   Wed Mar 27 14:57:50 2013 +0000
+++ b/rescue/Makefile   Thu Mar 28 05:31:22 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2010/03/10 23:13:10 abs Exp $
+#      $NetBSD: Makefile,v 1.27.18.1 2013/03/28 05:31:22 agc Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,13 +19,20 @@
 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
diff -r c6ef37af6817 -r 577dd6197df4 rescue/list.pdisk
--- a/rescue/list.pdisk Wed Mar 27 14:57:50 2013 +0000
+++ b/rescue/list.pdisk Thu Mar 28 05:31:22 2013 +0000
@@ -1,3 +1,4 @@
-#      $NetBSD: list.pdisk,v 1.1 2002/08/22 01:23:47 lukem Exp $
+#      $NetBSD: list.pdisk,v 1.1.68.1 2013/03/28 05:31:22 agc Exp $
 
 PROG   pdisk
+SPECIAL pdisk   srcdir  external/bsd/pdisk/bin



Home | Main Index | Thread Index | Old Index