Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src Pull up following revision(s) (requested by gutteridge in...
details: https://anonhg.NetBSD.org/src/rev/5843bbd93c2a
branches: netbsd-9
changeset: 377335:5843bbd93c2a
user: martin <martin%NetBSD.org@localhost>
date: Fri Jul 07 18:46:57 2023 +0000
description:
Pull up following revision(s) (requested by gutteridge in ticket #1663):
external/bsd/dhcpcd/examples/Makefile: revision 1.2
distrib/sets/lists/misc/mi: revision 1.225
external/bsd/dhcpcd/examples/conf/Makefile: revision 1.1
Install a copy of dhcpcd.conf under /usr/share/examples
Addresses PR bin/57487 from Taylor R Campbell.
diffstat:
distrib/sets/lists/misc/mi | 3 ++-
external/bsd/dhcpcd/examples/Makefile | 4 ++--
external/bsd/dhcpcd/examples/conf/Makefile | 14 ++++++++++++++
3 files changed, 18 insertions(+), 3 deletions(-)
diffs (46 lines):
diff -r 269dc5b4e026 -r 5843bbd93c2a distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi Wed Jul 05 16:14:56 2023 +0000
+++ b/distrib/sets/lists/misc/mi Fri Jul 07 18:46:57 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.215 2019/07/26 13:29:36 roy Exp $
+# $NetBSD: mi,v 1.215.2.1 2023/07/07 18:46:57 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1363,6 +1363,7 @@
./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/dhcpcd.conf misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/15-timezone misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/29-lookup-hostname misc-dhcpcd-examples share
diff -r 269dc5b4e026 -r 5843bbd93c2a external/bsd/dhcpcd/examples/Makefile
--- a/external/bsd/dhcpcd/examples/Makefile Wed Jul 05 16:14:56 2023 +0000
+++ b/external/bsd/dhcpcd/examples/Makefile Fri Jul 07 18:46:57 2023 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+# $NetBSD: Makefile,v 1.1.20.1 2023/07/07 18:46:57 martin Exp $
-SUBDIR= hooks
+SUBDIR= conf hooks
.include <bsd.subdir.mk>
diff -r 269dc5b4e026 -r 5843bbd93c2a external/bsd/dhcpcd/examples/conf/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/dhcpcd/examples/conf/Makefile Fri Jul 07 18:46:57 2023 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.4.2 2023/07/07 18:46:57 martin Exp $
+
+.include <bsd.own.mk>
+
+.include "../../Makefile.inc"
+.PATH: ${DIST}/src
+
+.if ${MKSHARE} != "no"
+FILES= dhcpcd.conf
+
+FILESDIR= /usr/share/examples/dhcpcd/
+.endif
+
+.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index