qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unbreak release after recent sysmerge sum file changes.

Browse Source 
quikly discussed with deraadt@ todd@ matthieu@
other fallout can be worked in tree
This commit is contained in:
ajacoutot 2014-07-16 21:38:36 +00:00
parent 8992205bf8
commit c7cf8e7d1b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2014/07/11 13:45:54 matthieu Exp $ # $OpenBSD: Makefile,v 1.60 2014/07/16 21:38:36 ajacoutot Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@ -110,12 +110,12 @@ release-install:
${XCONFIG} ${DESTDIR}/etc/X11 ; \ ${XCONFIG} ${DESTDIR}/etc/X11 ; \
fi fi
.endif .endif
touch ${DESTDIR}/var/db/sysmerge/xetcsum touch ${DESTDIR}/usr/share/sysmerge/xetcsum
TMPSUM=`mktemp /tmp/_xetcsum.XXXXXXXXXX` || exit 1; \ XETCLIST=`mktemp /tmp/_xetcsum.XXXXXXXXXX` || exit 1; \
sort distrib/sets/lists/xetc/{mi,md.${MACHINE}} > $${TMPSUM}; \ sort distrib/sets/lists/xetc/{mi,md.${MACHINE}} > $${XETCLIST}; \
cd ${DESTDIR} && \ cd ${DESTDIR} && \
xargs cksum < $${TMPSUM} > ${DESTDIR}/var/db/sysmerge/xetcsum; \ xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/xetcsum < $${XETCLIST} || true; \
rm -f $${TMPSUM} rm -f $${XETCLIST}
dist-rel: dist-rel:
${MAKE} RELEASEDIR=`pwd`/rel DESTDIR=`pwd`/dest dist 2>&1 | tee distlog ${MAKE} RELEASEDIR=`pwd`/rel DESTDIR=`pwd`/dest dist 2>&1 | tee distlog

4
distrib/sets/lists/xetc/mi
View File

@ -111,5 +111,5 @@
./etc/fonts/conf.d/README ./etc/fonts/conf.d/README
./etc/fonts/fonts.conf ./etc/fonts/fonts.conf
./etc/fonts/fonts.dtd ./etc/fonts/fonts.dtd
./var/db/sysmerge ./usr/share/sysmerge
./var/db/sysmerge/xetcsum ./usr/share/sysmerge/xetcsum