Mon May 24 22:40:44 2021 UTC ()
PR/56207: Jan-Benedict Glaw: Handle error from find when removing CVS
directories on a git repo.


(christos)
diff -r1.28 -r1.29 src/distrib/acorn32/stand/Makefile
cvs diff -r1.28 -r1.29 src/distrib/acorn32/stand/Makefile (expand / switch to unified diff)

--- src/distrib/acorn32/stand/Makefile 2014/01/22 01:03:09 1.28
+++ src/distrib/acorn32/stand/Makefile 2021/05/24 22:40:44 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2014/01/22 01:03:09 christos Exp $ 1# $NetBSD: Makefile,v 1.29 2021/05/24 22:40:44 christos Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 5.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
6 6
7.include <bsd.kernobj.mk> 7.include <bsd.kernobj.mk>
8 8
9# we use spark, so that we get filetypes. 9# we use spark, so that we get filetypes.
10ARCHIVE=BtNetBSD.spk 10ARCHIVE=BtNetBSD.spk
11 11
12RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} 12RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
13 13
14BOOTLOADER= ${DESTDIR}/usr/mdec/boot32,ffa 14BOOTLOADER= ${DESTDIR}/usr/mdec/boot32,ffa
@@ -81,29 +81,29 @@ SETTYPE_FILES+=misc/bb_netbsd @@ -81,29 +81,29 @@ SETTYPE_FILES+=misc/bb_netbsd
81SETTYPE_FILE_misc/bb_netbsd=ffb 81SETTYPE_FILE_misc/bb_netbsd=ffb
82 82
83.PATH: ${.CURDIR}/BtNetBSD/!BtNetBSD 83.PATH: ${.CURDIR}/BtNetBSD/!BtNetBSD
84.PATH: ${.CURDIR}/BtNetBSD/!BtNetBSD/native  84.PATH: ${.CURDIR}/BtNetBSD/!BtNetBSD/native
85.PATH: ${.CURDIR}/BtNetBSD/!BtNetBSD/src/Banner 85.PATH: ${.CURDIR}/BtNetBSD/!BtNetBSD/src/Banner
86 86
87${UUDECODE_FILES}: setup_tmp 87${UUDECODE_FILES}: setup_tmp
88 88
89.PHONY: setup_tmp 89.PHONY: setup_tmp
90setup_tmp: 90setup_tmp:
91 -rm -rf tmp 91 -rm -rf tmp
92 mkdir tmp 92 mkdir tmp
93 cp -R ${.CURDIR}/BtNetBSD tmp/ 93 cp -R ${.CURDIR}/BtNetBSD tmp/
94 -find tmp -path '*/CVS/*' -type f -exec rm -rf {} \; 94 -find tmp -path '*/CVS/*' -type f -exec rm -rf {} +
95 find tmp -name CVS -type d | xargs rmdir 95 -find tmp -name CVS -type d -exec rmdir {} +
96 find tmp -name '*.uue' -type f -exec rm -f {} \; 96 -find tmp -name '*.uue' -type f -exec rm -f {} +
97 97
98.PHONY: settypes 98.PHONY: settypes
99settypes: setup_tmp 99settypes: setup_tmp
100.for file in ${SETTYPE_FILES} 100.for file in ${SETTYPE_FILES}
101. if ${SETTYPE_FILE_${file}} == ffb 101. if ${SETTYPE_FILE_${file}} == ffb
102 ${TOOL_AWK} '{ printf "%5d %s\n", FNR * 10, $$0 }' \ 102 ${TOOL_AWK} '{ printf "%5d %s\n", FNR * 10, $$0 }' \
103 < tmp/BtNetBSD/${file} > tmp/BtNetBSD/${file}.tmp 103 < tmp/BtNetBSD/${file} > tmp/BtNetBSD/${file}.tmp
104 mv tmp/BtNetBSD/${file}.tmp tmp/BtNetBSD/${file} 104 mv tmp/BtNetBSD/${file}.tmp tmp/BtNetBSD/${file}
105. endif 105. endif
106 mv tmp/BtNetBSD/${file} tmp/BtNetBSD/${file},${SETTYPE_FILE_${file}} 106 mv tmp/BtNetBSD/${file} tmp/BtNetBSD/${file},${SETTYPE_FILE_${file}}
107.endfor 107.endfor
108 108
109.PHONY: tmp/BtNetBSD 109.PHONY: tmp/BtNetBSD