Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify rules so tarfiles always attempt to rebuild (let maketars determine 

whether or not to continue based on METALOG if it choses). Fixes bug where
tar files were rebuilding every other time
This commit is contained in:
jmc 2003-12-29 04:46:18 +00:00
parent 99a9acd89d
commit a481fc8f48
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
distrib/sets/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.38 2003/12/29 03:13:25 lukem Exp $ # $NetBSD: Makefile,v 1.39 2003/12/29 04:46:18 jmc Exp $
# The `all' target must appear before bsd.own.mk is pulled in. # The `all' target must appear before bsd.own.mk is pulled in.
all: all:
@ -69,7 +69,7 @@ checkflist-x11: check_DESTDIR
${SETSENV} ${HOST_SH} ${.CURDIR}/checkflist -x ${CHECKFLIST_FLAGS} ${SETSENV} ${HOST_SH} ${.CURDIR}/checkflist -x ${CHECKFLIST_FLAGS}
.PRECIOUS: maketars .PRECIOUS: maketars
maketars: check_DESTDIR check_RELEASEDIR .WAIT maketarsetup .WAIT ${MAKETARSETS:@.TARS.@${RELEASEDIR}/${MACHINE}/binary/sets/${.TARS.}.tgz@} maketars: check_DESTDIR check_RELEASEDIR .WAIT maketarsetup .WAIT ${MAKETARSETS:@.TARS.@do-${.TARS.}@}
@true @true
maketarsetup: .PHONY maketarsetup: .PHONY
@ -78,12 +78,10 @@ maketarsetup: .PHONY
.endif .endif
mkdir -p ${RELEASEDIR}/${MACHINE}/binary/sets mkdir -p ${RELEASEDIR}/${MACHINE}/binary/sets
for i in BSDSUM CKSUM MD5 SYSVSUM; do \ for i in BSDSUM CKSUM MD5 SYSVSUM; do \
rm -f ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; done rm -f ${RELEASEDIR}/${MACHINE}/binary/sets/$$i ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; done
-[ "${MAKETARSETS}" ] && for i in ${MAKETARSETS}; do \
rm -f ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tgz; done
.for tar in ${MAKETARSETS} .for tar in ${MAKETARSETS}
${RELEASEDIR}/${MACHINE}/binary/sets/${tar}.tgz: do-${tar}: .PHONY
${SETSENV} ${HOST_SH} ${.CURDIR}/maketars -d ${DESTDIR:S,^$,/,} \ ${SETSENV} ${HOST_SH} ${.CURDIR}/maketars -d ${DESTDIR:S,^$,/,} \
${METALOG.unpriv} -N ${NETBSDSRCDIR}/etc \ ${METALOG.unpriv} -N ${NETBSDSRCDIR}/etc \
-t ${RELEASEDIR}/${MACHINE}/binary/sets ${tar} -t ${RELEASEDIR}/${MACHINE}/binary/sets ${tar}
@ -102,7 +100,7 @@ makesums: check_RELEASEDIR .WAIT ${MAKETARSETS:@.TARS.@do-sum-${.TARS.}@}
${RELEASEDIR}/${MACHINE}/binary/sets/$$i; done ${RELEASEDIR}/${MACHINE}/binary/sets/$$i; done
.for tar in ${MAKETARSETS} .for tar in ${MAKETARSETS}
do-sum-${tar}: .PHONY ${RELEASEDIR}/${MACHINE}/binary/sets/${tar}.tgz do-sum-${tar}: .PHONY do-${tar}
${SETSENV} ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/binary/sets ${tar}.tgz ${SETSENV} ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/binary/sets ${tar}.tgz
for i in BSDSUM CKSUM MD5 SYSVSUM; do \ for i in BSDSUM CKSUM MD5 SYSVSUM; do \
${TOOL_CAT} ${RELEASEDIR}/${MACHINE}/binary/sets/$$i >> ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; \ ${TOOL_CAT} ${RELEASEDIR}/${MACHINE}/binary/sets/$$i >> ${RELEASEDIR}/${MACHINE}/binary/sets/$$i.tmp; \