Invoke ${PAX} with '-O' so that various errors don't hang the make
or the command with an interactive question. (This also prevents weird problems if a directory element of '-f path' is missing and 'make -j N' is being used).
This commit is contained in:
parent
084ae1f838
commit
d9aa9519e8
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.image,v 1.17 2002/05/09 09:21:25 lukem Exp $
|
||||
# $NetBSD: Makefile.image,v 1.18 2002/12/21 15:54:48 lukem Exp $
|
||||
#
|
||||
# Makefile snippet to build a tree from the provided lists,
|
||||
# and make an ffs file system image from that tree
|
||||
@ -101,7 +101,7 @@ CLEANFILES+= ${IMAGE} ${IMAGE}.gz ${IMAGE}.tmp
|
||||
.if defined(IMAGETAR) # {
|
||||
${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${IMAGEDEPENDS}
|
||||
( cd ${WORKDIR}; \
|
||||
GZIP=-9 ${PAX} -N ${NETBSDSRCDIR}/etc -wdzM < ${.OBJDIR}/${WORKSPEC} \
|
||||
GZIP=-9 ${PAX} -ON ${NETBSDSRCDIR}/etc -wdzM <${.OBJDIR}/${WORKSPEC} \
|
||||
) > ${.TARGET}.tmp \
|
||||
&& mv ${.TARGET}.tmp ${.TARGET}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $NetBSD: buildfloppies.sh,v 1.3 2002/05/04 01:34:37 lukem Exp $
|
||||
# $NetBSD: buildfloppies.sh,v 1.4 2002/12/21 15:54:49 lukem Exp $
|
||||
#
|
||||
# Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
# All rights reserved.
|
||||
@ -100,7 +100,7 @@ rm -f ${floppybase}?${suffix}
|
||||
# create tar file
|
||||
#
|
||||
dd if=/dev/zero of=${floppy} bs=8k count=1 2>/dev/null
|
||||
${PAX} -w ${files} >> ${floppy} || exit 1
|
||||
${PAX} -O -w ${files} >> ${floppy} || exit 1
|
||||
# XXX: use pax metafile and set perms?
|
||||
if [ -n "$instboot" ]; then
|
||||
instboot=$( echo $instboot | sed -e s/@IMAGE@/${floppy}/ )
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $NetBSD: maketars,v 1.31 2002/12/19 12:33:10 lukem Exp $
|
||||
# $NetBSD: maketars,v 1.32 2002/12/21 15:54:49 lukem Exp $
|
||||
#
|
||||
# Make release tar files for some or all lists. Usage:
|
||||
# maketars [-b] [-x] [-a arch] [-m machine] [-s setsdir]
|
||||
@ -158,11 +158,11 @@ for setname in $lists; do
|
||||
|
||||
if [ -n "$installdir" ]; then
|
||||
( cd $dest ; \
|
||||
${PAX} -rwpe -d -N${etcdir} ${metalog:+-M} \
|
||||
${PAX} -O -rwpe -d -N${etcdir} ${metalog:+-M} \
|
||||
$installdir < ${SDIR}/plist.$setname )
|
||||
else
|
||||
( cd $dest ; \
|
||||
${PAX} -w -d -z -N${etcdir} ${metalog:+-M} \
|
||||
${PAX} -O -w -d -z -N${etcdir} ${metalog:+-M} \
|
||||
< ${SDIR}/plist.$setname ) > ${tars}/$out
|
||||
fi
|
||||
es=$(($es + $?))
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.9 2002/05/05 21:24:51 jdolecek Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2002/12/21 15:54:50 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
|
||||
@ -24,7 +24,7 @@ boot.vax: ${DESTDIR}/usr/mdec/boot
|
||||
|
||||
${IMAGE}: ${IMAGEDEPENDS}
|
||||
cat ${XXBOOT} > ${IMAGE}.tmp
|
||||
${PAX} -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16
|
||||
${PAX} -O -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16
|
||||
dd if=${IMAGE}.tmp of=${IMAGE} bs=${IMAGESIZE} conv=sync
|
||||
|
||||
release: check_RELEASEDIR .WAIT ${IMAGE}
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.1 2002/11/03 02:13:20 isaki Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2002/12/21 15:54:50 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
|
||||
@ -14,7 +14,7 @@ CLEANFILES+= ${archive}.tar.gz ${MEMBER_${archive}}
|
||||
realall:
|
||||
.for archive in ${ARCHIVES}
|
||||
${UUDECODE} ${.CURDIR}/${archive}.uue
|
||||
${PAX} -zrvpp -f ${archive}.tar.gz
|
||||
${PAX} -O -zrvpp -f ${archive}.tar.gz
|
||||
.endfor
|
||||
|
||||
release:
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.237 2002/12/19 23:04:26 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.238 2002/12/21 15:54:51 lukem Exp $
|
||||
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
|
||||
|
||||
# Environment variables without default values:
|
||||
@ -406,7 +406,7 @@ kernset-${configfile}:
|
||||
echo "./$${kernel}.$${s} type=file"; \
|
||||
fi; \
|
||||
done; \
|
||||
done ) | GZIP=-9 ${PAX} -zw \
|
||||
done ) | GZIP=-9 ${PAX} -O -zw \
|
||||
-M -N ${NETBSDSRCDIR}/etc \
|
||||
-f ${RELEASEDIR}/binary/sets/kern-${configfile}.tgz
|
||||
.endfor # KERNEL_SETS # }
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.30 2002/12/19 10:56:39 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.31 2002/12/21 15:54:51 lukem Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -91,8 +91,8 @@ afterinstall: ${DATA} ${REDO}
|
||||
"%s type=file mode=0444 uname=${BINOWN} gname=${BINGRP}\n" ; \
|
||||
) > ${TZBUILDSPEC}
|
||||
cd ${TZBUILDDIR} && \
|
||||
${PAX} -rw ${UNPRIVED:D:U-pe} -M -N ${NETBSDSRCDIR}/etc ${TZDIR} \
|
||||
< ${TZBUILDSPEC}
|
||||
${PAX} -O -rw ${UNPRIVED:D:U-pe} -M -N ${NETBSDSRCDIR}/etc ${TZDIR} \
|
||||
< ${TZBUILDSPEC}
|
||||
.if defined(UNPRIVED)
|
||||
sed -e "s|^\.|./${TZDIR}|g" -e "s|//|/|g" < ${TZBUILDSPEC} | \
|
||||
${CAT} -l >>${METALOG}
|
||||
|
Loading…
Reference in New Issue
Block a user