From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 13 Jul 2014 13:01:48 +0000 (+0000)
Subject: Mismatch between the sets list and what's in DESTDIR should not be fatal
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6e240f41f55f31aa00f10c6880b416d4fdf31f6b;p=openbsd

Mismatch between the sets list and what's in DESTDIR should not be fatal
to sysmerge sum files generation.

discussed by deraadt@
---

diff --git a/etc/Makefile b/etc/Makefile
index 6a564b83053..47c212027d2 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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
 LOCALTIME=	Canada/Mountain
@@ -260,12 +260,12 @@ distribution:
 	ETCLIST=`mktemp /tmp/_etclist.XXXXXXXXXX` || exit 1; \
 	sort ../distrib/sets/lists/etc/{mi,md.${MACHINE}} > $${ETCLIST}; \
 	cd ${DESTDIR} && \
-		xargs sha256 -h ${DESTDIR}/var/db/sysmerge/etcsum < $${ETCLIST}
+		xargs sha256 -h ${DESTDIR}/var/db/sysmerge/etcsum < $${ETCLIST} || true; \
 	rm -f $${ETCLIST}
 	EGLIST=`mktemp /tmp/_eglist.XXXXXXXXXX` || exit 1; \
 	grep -h '/etc/examples/' ../distrib/sets/lists/base/{mi,md.${MACHINE}} | sort > $${EGLIST}; \
 	cd ${DESTDIR} && \
-		xargs sha256 -h ${DESTDIR}/var/db/sysmerge/examplessum < $${EGLIST}; \
+		xargs sha256 -h ${DESTDIR}/var/db/sysmerge/examplessum < $${EGLIST} || true; \
 	rm -f $${EGLIST}
 
 distrib-dirs: