Module Name: src
Committed By: roy
Date: Fri Jul 26 10:34:26 UTC 2019
Modified Files:
src/distrib/sets/lists/misc: mi
src/external/bsd/dhcpcd/examples/hooks: Makefile
Log Message:
Stop installing 10-wpa_supplicant.
Only install 50-ypbind when MKYP=yes.
Partially addresses PR install/54351.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/dhcpcd/examples/hooks/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.212 src/distrib/sets/lists/misc/mi:1.213
--- src/distrib/sets/lists/misc/mi:1.212 Sat May 4 17:03:39 2019
+++ src/distrib/sets/lists/misc/mi Fri Jul 26 10:34:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.212 2019/05/04 17:03:39 sevan Exp $
+# $NetBSD: mi,v 1.213 2019/07/26 10:34:26 roy Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1363,10 +1363,10 @@
./usr/share/examples/atf/tests-results.css misc-atf-examples share,atf,!kyua
./usr/share/examples/atf/tests-results.css misc-obsolete share,kyua,obsolete
./usr/share/examples/dhcp/dhcpd.conf misc-dhcpd-examples share
-./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant misc-dhcpcd-examples share
+./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant misc-dhcpcd-examples obsolete
./usr/share/examples/dhcpcd/hooks/15-timezone misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/29-lookup-hostname misc-dhcpcd-examples share
-./usr/share/examples/dhcpcd/hooks/50-ypbind misc-dhcpcd-examples share
+./usr/share/examples/dhcpcd/hooks/50-ypbind misc-dhcpcd-examples share,yp
./usr/share/examples/disktab/disktab misc-sys-examples share
./usr/share/examples/emul/linux/etc/LINUX_MAKEDEV misc-sys-examples share
./usr/share/examples/emul/svr4/etc/SVR4_MAKEDEV misc-obsolete obsolete
Index: src/external/bsd/dhcpcd/examples/hooks/Makefile
diff -u src/external/bsd/dhcpcd/examples/hooks/Makefile:1.1 src/external/bsd/dhcpcd/examples/hooks/Makefile:1.2
--- src/external/bsd/dhcpcd/examples/hooks/Makefile:1.1 Sun Apr 2 20:18:37 2017
+++ src/external/bsd/dhcpcd/examples/hooks/Makefile Fri Jul 26 10:34:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/26 10:34:26 roy Exp $
#
.include <bsd.own.mk>
@@ -7,11 +7,13 @@
.PATH: ${DIST}/hooks
.if ${MKSHARE} != "no"
-FILES= 10-wpa_supplicant 15-timezone 29-lookup-hostname
-FILES+= 50-ypbind
+FILES= 15-timezone 29-lookup-hostname
+.if ${MKYP} != "no"
FILESBUILD_50-ypbind= YES
+FILES+= 50-ypbind
CLEANFILES+= 50-ypbind
+.endif
FILESDIR= /usr/share/examples/dhcpcd/hooks
