diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2014-08-26 20:19:27 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2014-08-26 20:19:27 +0000 |
| commit | 3168a8b06f15a4f7b719dca5af4701f48608caee (patch) | |
| tree | 6ce1714ddbbf654ed9dd90f3c6d611aaa7dde79f /etc | |
| parent | 1011e5941bf5ceacc24b6fc393a693c653a59a00 (diff) | |
Create etc set during 'make build' and embed it in base set to make
it available during a regular install or upgrade so that it doesn't
need to be independently fetched.
Idea, directions and OK deraadt@
Feedback and Ok halex@ and aja@
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/etc/Makefile b/etc/Makefile index c2fee1cad01..6e72a18f376 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.390 2014/08/26 19:33:48 robert Exp $ +# $OpenBSD: Makefile,v 1.391 2014/08/26 20:19:26 rpe Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -60,8 +60,7 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \ statd spamlogd sndiod tftpd tftpproxy ldomd unbound iscsid -MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ - man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz +MISETS= base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz all clean cleandir depend etc install lint: @@ -215,14 +214,10 @@ distribution-etc-root-var: distrib-dirs ${DESTDIR}/etc/rc.d && \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${RCDAEMONS} \ ${DESTDIR}/etc/rc.d - -distribution: - exec ${SUDO} ${MAKE} distribution-etc-root-var - cd .. && exec ${SUDO} ${MAKE} install touch ${DESTDIR}/usr/share/sysmerge/etcsum touch ${DESTDIR}/usr/share/sysmerge/examplessum ETCLIST=`mktemp /tmp/_etclist.XXXXXXXXXX` || exit 1; \ - sort ../distrib/sets/lists/etc/{mi,md.${MACHINE}} > $${ETCLIST}; \ + sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} > $${ETCLIST}; \ cd ${DESTDIR} && \ xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/etcsum < $${ETCLIST} || true; \ rm -f $${ETCLIST} @@ -231,6 +226,13 @@ distribution: cd ${DESTDIR} && \ xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/examplessum < $${EGLIST} || true; \ rm -f $${EGLIST} + cd ${DESTDIR} && \ + sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ + pax -w -d | gzip -9 > ${DESTDIR}/usr/share/sysmerge/etc.tgz + +distribution: + exec ${SUDO} ${MAKE} distribution-etc-root-var + cd .. && exec ${SUDO} ${MAKE} install distrib-dirs: if [ ! -d ${DESTDIR}/. ]; then \ |