Punt custom dhcpcd hooks in favour up upstream hooks trunk
authorroy <roy@NetBSD.org>
Sat, 13 Sep 2014 10:18:24 +0000
branchtrunk
changeset 230106 3e5ac355c7b2
parent 230105 5588ab7b9454
child 230107 6377ec458f6a
Punt custom dhcpcd hooks in favour up upstream hooks
distrib/amd64/cdroms/Makefile.cdrom
distrib/amd64/installimage/Makefile
distrib/amd64/installimage/spec.inst
distrib/i386/cdroms/Makefile.cdrom
distrib/i386/installimage/Makefile
distrib/i386/installimage/spec.inst
distrib/sparc64/cdroms/installcd/Makefile
distrib/vax/cdroms/installcd/Makefile
--- a/distrib/amd64/cdroms/Makefile.cdrom	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom	Sat Sep 13 10:18:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.11 2014/08/14 16:27:17 riastradh Exp $
+# $NetBSD: Makefile.cdrom,v 1.12 2014/09/13 10:18:24 roy Exp $
 
 .include <bsd.own.mk>
 
@@ -65,9 +65,6 @@
 CDRUNTIME+=	./usr/share/locale
 
 image_md_pre:
-	${MKDIR} cdrom/libexec/dhcpcd-hooks
-	${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
-	${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
 	${MKDIR} cdrom/etc
 	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
 	${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
--- a/distrib/amd64/installimage/Makefile	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/amd64/installimage/Makefile	Sat Sep 13 10:18:24 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $
+#	$NetBSD: Makefile,v 1.5 2014/09/13 10:18:24 roy Exp $
 
 .include <bsd.own.mk>
 
@@ -26,8 +26,6 @@
 
 SPEC_EXTRA=		${.CURDIR}/spec.inst
 IMGFILE_EXTRA=								\
-	${DISTRIBDIR}/common/10-resolv.conf	libexec/dhcpcd-hooks	\
-	${DISTRIBDIR}/common/99-print-sysinst	libexec/dhcpcd-hooks	\
 	${.CURDIR}/etc.ttys		etc/ttys			\
 	${.CURDIR}/etc.rc		etc/rc				\
 	${.CURDIR}/install.sh		.				\
--- a/distrib/amd64/installimage/spec.inst	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/amd64/installimage/spec.inst	Sat Sep 13 10:18:24 2014 +0000
@@ -1,10 +1,7 @@
-# $NetBSD: spec.inst,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $
 ./mnt2			type=dir mode=0755 uname=root gname=wheel
 ./targetroot		type=dir mode=0755 uname=root gname=wheel
 
-./libexec/dhcpcd-hooks/10-resolv.conf	type=file mode=0444 uname=root gname=wheel
-./libexec/dhcpcd-hooks/99-print-sysinst	type=file mode=0444 uname=root gname=wheel
-
 ./install.sh		type=file mode=0755 uname=root gname=wheel
 ./sysinst		type=file mode=0755 uname=root gname=wheel
 ./sysinstmsgs.de	type=file mode=0444 uname=root gname=wheel
--- a/distrib/i386/cdroms/Makefile.cdrom	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom	Sat Sep 13 10:18:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.31 2014/08/14 16:27:18 riastradh Exp $
+# $NetBSD: Makefile.cdrom,v 1.32 2014/09/13 10:18:24 roy Exp $
 
 .include <bsd.own.mk>
 
@@ -65,9 +65,6 @@
 CDRUNTIME+=	./usr/share/locale
 
 image_md_pre:
-	${MKDIR} cdrom/libexec/dhcpcd-hooks
-	${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
-	${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
 	${MKDIR} cdrom/etc
 	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
 	${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
--- a/distrib/i386/installimage/Makefile	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/i386/installimage/Makefile	Sat Sep 13 10:18:24 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $
+#	$NetBSD: Makefile,v 1.5 2014/09/13 10:18:24 roy Exp $
 
 .include <bsd.own.mk>
 
@@ -26,8 +26,6 @@
 
 SPEC_EXTRA=		${.CURDIR}/spec.inst
 IMGFILE_EXTRA=								\
-	${DISTRIBDIR}/common/10-resolv.conf	libexec/dhcpcd-hooks	\
-	${DISTRIBDIR}/common/99-print-sysinst	libexec/dhcpcd-hooks	\
 	${.CURDIR}/etc.ttys		etc/ttys			\
 	${.CURDIR}/etc.rc		etc/rc				\
 	${.CURDIR}/install.sh		.				\
--- a/distrib/i386/installimage/spec.inst	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/i386/installimage/spec.inst	Sat Sep 13 10:18:24 2014 +0000
@@ -1,10 +1,7 @@
-# $NetBSD: spec.inst,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $
 ./mnt2			type=dir mode=0755 uname=root gname=wheel
 ./targetroot		type=dir mode=0755 uname=root gname=wheel
 
-./libexec/dhcpcd-hooks/10-resolv.conf	type=file mode=0444 uname=root gname=wheel
-./libexec/dhcpcd-hooks/99-print-sysinst	type=file mode=0444 uname=root gname=wheel
-
 ./install.sh		type=file mode=0755 uname=root gname=wheel
 ./sysinst		type=file mode=0755 uname=root gname=wheel
 ./sysinstmsgs.de	type=file mode=0444 uname=root gname=wheel
--- a/distrib/sparc64/cdroms/installcd/Makefile	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile	Sat Sep 13 10:18:24 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2014/08/14 16:27:18 riastradh Exp $
+#	$NetBSD: Makefile,v 1.20 2014/09/13 10:18:24 roy Exp $
 CDBASE=		sparc64cd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
 
@@ -68,9 +68,6 @@
 CDRUNTIME+=	./usr/share/locale
 
 image_md_pre:
-	${RM} -rf cdrom/libexec/dhcpcd-hooks/*
-	${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
-	${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
 	${MKDIR} cdrom/etc
 	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
 	${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
--- a/distrib/vax/cdroms/installcd/Makefile	Sat Sep 13 09:46:12 2014 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile	Sat Sep 13 10:18:24 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2014/08/14 16:27:18 riastradh Exp $
+#	$NetBSD: Makefile,v 1.10 2014/09/13 10:18:24 roy Exp $
 CDBASE=		vaxcd			# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
 CDKERNELS=	${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz	netbsd.gz
@@ -17,10 +17,6 @@
 	${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
 	${RM} -f bootxx.${MACHINE}
 	${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
-	${RM} -rf cdrom/libexec/dhcpcd-hooks/*
-	${MKDIR} -p cdrom/libexec/dhcpcd-hooks
-	${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
-	${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
 	${MKDIR} cdrom/etc
 	${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
 	${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys