diff options
| author | Warner Losh <imp@FreeBSD.org> | 2020-09-23 01:04:25 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2020-09-23 01:04:25 +0000 |
| commit | a5ebda464e5035f228695b1bf9f6e3ce223d706d (patch) | |
| tree | 54b4889c3399a581b415f40d7cf102f7f29c4713 /stand | |
| parent | c16359cf66897b7088b505af2f7db219700e8d39 (diff) | |
| download | src-test-a5ebda464e5035f228695b1bf9f6e3ce223d706d.tar.gz src-test-a5ebda464e5035f228695b1bf9f6e3ce223d706d.zip | |
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
Notes
Notes:
svn path=/head/; revision=366042
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/i386/zfsboot/Makefile | 2 | ||||
| -rw-r--r-- | stand/libsa/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile index ff315abc0efb7..7e362b43a39cf 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 effece9e01b2a..63cd46a9c54e6 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; \ |