Browse Source

Remove handling of /etc/examples/ files by sysmerge(8). Getting regular messages

about pkg.conf isn't really that helpful and if a big syntax change comes along
well we have current.html.
it was disabled during p2k16 and no one complained so far
discussed with and ok deraadt@
OPENBSD_6_0
ajacoutot 8 years ago
parent
commit
9c2b134bdd
1 changed files with 1 additions and 7 deletions
  1. +1
    -7
      src/etc/Makefile

+ 1
- 7
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.423 2016/05/11 21:52:48 deraadt Exp $
# $OpenBSD: Makefile,v 1.424 2016/05/14 14:44:35 ajacoutot Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -208,15 +208,9 @@ distribution-etc-root-var: distrib-dirs
${DESTDIR}/etc/rc.d ${DESTDIR}/etc/rc.d
cd ${DESTDIR}/var; ln -fs ../tmp cd ${DESTDIR}/var; ln -fs ../tmp
touch ${DESTDIR}/var/sysmerge/etcsum touch ${DESTDIR}/var/sysmerge/etcsum
touch ${DESTDIR}/var/sysmerge/examplessum
cd ${DESTDIR}/ && \ cd ${DESTDIR}/ && \
sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true
cd ${DESTDIR}/ && \
grep -h '/etc/examples/' \
${.CURDIR}/../distrib/sets/lists/base/{mi,md.${MACHINE}} | \
sort | \
xargs sha256 -h ${DESTDIR}/var/sysmerge/examplessum || true
cd ${DESTDIR}/ && \ cd ${DESTDIR}/ && \
sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz


Loading…
Cancel
Save