Browse Source

Mismatch between the sets list and what's in DESTDIR should not be fatal

to sysmerge sum files generation.
discussed by deraadt@
OPENBSD_5_6
ajacoutot 10 years ago
parent
commit
4287f8a51a
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/etc/Makefile

+ 3
- 3
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.368 2014/07/13 12:14:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.369 2014/07/13 13:01:48 ajacoutot Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -260,12 +260,12 @@ distribution:
ETCLIST=`mktemp /tmp/_etclist.XXXXXXXXXX` || exit 1; \ ETCLIST=`mktemp /tmp/_etclist.XXXXXXXXXX` || exit 1; \
sort ../distrib/sets/lists/etc/{mi,md.${MACHINE}} > $${ETCLIST}; \ sort ../distrib/sets/lists/etc/{mi,md.${MACHINE}} > $${ETCLIST}; \
cd ${DESTDIR} && \ cd ${DESTDIR} && \
xargs sha256 -h ${DESTDIR}/var/db/sysmerge/etcsum < $${ETCLIST}
xargs sha256 -h ${DESTDIR}/var/db/sysmerge/etcsum < $${ETCLIST} || true; \
rm -f $${ETCLIST} rm -f $${ETCLIST}
EGLIST=`mktemp /tmp/_eglist.XXXXXXXXXX` || exit 1; \ EGLIST=`mktemp /tmp/_eglist.XXXXXXXXXX` || exit 1; \
grep -h '/etc/examples/' ../distrib/sets/lists/base/{mi,md.${MACHINE}} | sort > $${EGLIST}; \ grep -h '/etc/examples/' ../distrib/sets/lists/base/{mi,md.${MACHINE}} | sort > $${EGLIST}; \
cd ${DESTDIR} && \ cd ${DESTDIR} && \
xargs sha256 -h ${DESTDIR}/var/db/sysmerge/examplessum < $${EGLIST}; \
xargs sha256 -h ${DESTDIR}/var/db/sysmerge/examplessum < $${EGLIST} || true; \
rm -f $${EGLIST} rm -f $${EGLIST}
distrib-dirs: distrib-dirs:


Loading…
Cancel
Save