Hi Christos!
The small acorn32 fix for deleting CVS directories ended up being
broken! This is what showed up in the GIT export:
> commit 650fdee30a7ca4ce6677f35bb9f0364f82dfa861
> Author: christos <christos%NetBSD.org@localhost>
> Date: Mon May 24 22:40:44 2021 +0000
>
> PR/56207: Jan-Benedict Glaw: Handle error from find when removing CVS
> directories on a git repo.
>
> diff --git a/distrib/acorn32/stand/Makefile b/distrib/acorn32/stand/Makefile
> index 06de69c0b14f..e03a70c17729 100644
> --- a/distrib/acorn32/stand/Makefile
> +++ b/distrib/acorn32/stand/Makefile
> @@ -1,4 +1,4 @@
> -# $NetBSD: Makefile,v 1.28 2014/01/22 01:03:09 christos Exp $
> +# $NetBSD: Makefile,v 1.29 2021/05/24 22:40:44 christos Exp $
> #
>
> .include <bsd.own.mk>
> @@ -91,9 +91,9 @@ setup_tmp:
> -rm -rf tmp
> mkdir tmp
> cp -R ${.CURDIR}/BtNetBSD tmp/
> - -find tmp -path '*/CVS/*' -type f -exec rm -rf {} \;
> - find tmp -name CVS -type d | xargs rmdir
> - find tmp -name '*.uue' -type f -exec rm -f {} \;
> + -find tmp -path '*/CVS/*' -type f -exec rm -rf {} +
> + -find tmp -name CVS -type d -exec rmdir {} +
> + -find tmp -name '*.uue' -type f -exec rm -f {} +
>
> .PHONY: settypes
> settypes: setup_tmp
Notice the '+' at the end of the `find` lines. That must be a backslash
followed by semicolon. Patch ontop of current HEAD:
diff --git a/distrib/acorn32/stand/Makefile b/distrib/acorn32/stand/Makefile
index e03a70c17729..e40ab7e58731 100644
--- a/distrib/acorn32/stand/Makefile
+++ b/distrib/acorn32/stand/Makefile
@@ -91,9 +91,9 @@ setup_tmp:
-rm -rf tmp
mkdir tmp
cp -R ${.CURDIR}/BtNetBSD tmp/
- -find tmp -path '*/CVS/*' -type f -exec rm -rf {} +
- -find tmp -name CVS -type d -exec rmdir {} +
- -find tmp -name '*.uue' -type f -exec rm -f {} +
+ -find tmp -path '*/CVS/*' -type f -exec rm -rf {} \;
+ -find tmp -name CVS -type d -exec rmdir {} \;
+ -find tmp -name '*.uue' -type f -exec rm -f {} \;
.PHONY: settypes
settypes: setup_tmp
Thanks,
Jan-Benedict
--
Attachment:
signature.asc
Description: PGP signature