Date: Wed, 23 Sep 2020 01:04:26 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366042 - in head/stand: i386/zfsboot libsa Message-ID: <202009230104.08N14QIe053739@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Sep 23 01:04:25 2020 New Revision: 366042 URL: https://svnweb.freebsd.org/changeset/base/366042 Log: 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 Modified: head/stand/i386/zfsboot/Makefile head/stand/libsa/Makefile Modified: head/stand/i386/zfsboot/Makefile ============================================================================== --- head/stand/i386/zfsboot/Makefile Wed Sep 23 00:32:50 2020 (r366041) +++ head/stand/i386/zfsboot/Makefile Wed Sep 23 01:04:25 2020 (r366042) @@ -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} Modified: head/stand/libsa/Makefile ============================================================================== --- head/stand/libsa/Makefile Wed Sep 23 00:32:50 2020 (r366041) +++ head/stand/libsa/Makefile Wed Sep 23 01:04:25 2020 (r366042) @@ -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; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009230104.08N14QIe053739>