From a5ebda464e5035f228695b1bf9f6e3ce223d706d Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 23 Sep 2020 01:04:25 +0000 Subject: [PATCH] Work around cp breakage in current from last week There was a small window cp was broken. Work around this by using :> instead of cp /dev/null. Ideally, we'd keep the cp /dev/null in the build as a regression test, but doing so breaks people that upgraded during the cp breakage and this is simpler than bootstrapping a working cp since there's no good __FreeBSD_version sign posts for that. Suggested by: lots of people Too stubborn for his own good: imp --- stand/i386/zfsboot/Makefile | 2 +- stand/libsa/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile index ff315abc0efb..7e362b43a39c 100644 --- a/stand/i386/zfsboot/Makefile +++ b/stand/i386/zfsboot/Makefile @@ -81,7 +81,7 @@ zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN} -o ${.TARGET} -P 1 zfsboot.bin zfsboot.ldr: - cp /dev/null ${.TARGET} + :> ${.TARGET} zfsboot.bin: zfsboot.out ${OBJCOPY} -S -O binary zfsboot.out ${.TARGET} diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index effece9e01b2..63cd46a9c54e 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -122,7 +122,7 @@ beforedepend: ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ for i in _time.h _strings.h _string.h; do \ - [ -f xlocale/$$i ] || cp /dev/null xlocale/$$i; \ + [ -f xlocale/$$i ] || :> xlocale/$$i; \ done; \ for i in ${STAND_H_INC}; do \ ln -sf ${SASRC}/stand.h $$i; \