From owner-svn-src-head@freebsd.org Tue Sep 22 21:02:05 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8D5043F708C; Tue, 22 Sep 2020 21:02:05 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwtzK1tyWz4d6c; Tue, 22 Sep 2020 21:02:05 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-lf1-f54.google.com with SMTP id u8so19607660lff.1; Tue, 22 Sep 2020 14:02:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=S3S3uuNSvJ5vICDiQesD3Z+0oYF2YgYf8sBm7aDEYYs=; b=WuyFyTRU9c55CYXrMb1MRJXAsaWNQDTuBQ33tqQXLWlsBpncmijE6IW6mWChQKhAXZ 2HHeU6LVbJt9Mj7qaynxCDcP77Z83Prewrwp/n+PQqGOFQl7TDNi6Q8Ut4j+tPeuNKLF ygH6g/srBFzTr7EyJdl8YasnvHPE8GIKIHjT2vxdCCOvRiS83hscFDXzf2o98Bp4QWH7 p9Twust1bmDwQFfViJLHdMMH2JUmts6lSANSq451Mdlbu85YfLY7aCpzZrRlugjcr7Pt h7+4zqzp1REahNRLfximeZXSNfuNjsCTveDeu3G5eSFUR7bNMXFPobfR8seKGDGK1Zz2 89kg== X-Gm-Message-State: AOAM531zDoXslLEYHDHkXjOznHLNaSWkXZFQgEZnhCQlD6jqILmgggCU YxLJIWFQk3QlYIuYqsyECazTFHb1Wpaakgot6ByqvamE X-Google-Smtp-Source: ABdhPJzZUc9LzbpK+GcJtKCaCA+T/nRjlWN4fxLi+w12t0Mw7hBnJbzQwozcFkPcr1/686ZY6PpSy/qHmXRAP/I4RVo= X-Received: by 2002:a19:c46:: with SMTP id 67mr2159696lfm.60.1600808523209; Tue, 22 Sep 2020 14:02:03 -0700 (PDT) MIME-Version: 1.0 References: <202009112049.08BKnavL032212@repo.freebsd.org> In-Reply-To: From: Alan Somers Date: Tue, 22 Sep 2020 15:01:51 -0600 Message-ID: Subject: Re: svn commit: r365643 - head/bin/cp To: Kyle Evans Cc: Mateusz Guzik , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4BwtzK1tyWz4d6c X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 21:02:05 -0000 LGTM. On Tue, Sep 22, 2020 at 2:59 PM Kyle Evans wrote: > Perhaps: > > diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile > index ff315abc0ef..7e362b43a39 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 effece9e01b..63cd46a9c54 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; \ > > > On Tue, Sep 22, 2020 at 3:58 PM Alan Somers wrote: > > > > Looks like two places in stand. Is there any reason why Mateusz's > suggestion wouldn't work? > > > > > rg -g Makefile 'cp.*/dev/null' > > stand/libsa/Makefile > > 125: [ -f xlocale/$$i ] || cp /dev/null xlocale/$$i; \ > > > > stand/i386/zfsboot/Makefile > > 82: cp /dev/null ${.TARGET} > > > > On Tue, Sep 22, 2020 at 2:54 PM Mateusz Guzik wrote: > >> > >> Can we instead add a workaround to the build tree? > >> > >> Where is cp /dev/null coming from anyway? Perhaps this can be patched > >> to touch the target file. > >> > >> On 9/22/20, Alan Somers wrote: > >> > On Tue, Sep 22, 2020 at 2:48 PM Kyle Evans > wrote: > >> > > >> >> On Fri, Sep 11, 2020 at 3:49 PM Alan Somers > wrote: > >> >> > > >> >> > Author: asomers > >> >> > Date: Fri Sep 11 20:49:36 2020 > >> >> > New Revision: 365643 > >> >> > URL: https://svnweb.freebsd.org/changeset/base/365643 > >> >> > > >> >> > Log: > >> >> > cp: fall back to read/write if copy_file_range fails > >> >> > > >> >> > Even though copy_file_range has a file-system agnostic version, > it > >> >> still > >> >> > fails on devfs (perhaps because the file descriptor is > non-seekable?) > >> >> In > >> >> > that case, fallback to old-fashioned read/write. Fixes > >> >> > "cp /dev/null /tmp/null" > >> >> > > >> >> > >> >> Hi, > >> >> > >> >> Any objection to adding a quick UPDATING entry for this? I'm seeing > >> >> occasional reports of this breakage as recent as today on IRC from > >> >> folks that were a little bit thrown off by this because it throws up > >> >> fairly far into the build and looks like a stand build regression > >> >> instead of a cp regression. > >> >> > >> >> Thanks, > >> >> > >> >> Kyle Evans > >> >> > >> > > >> > No objection. Can you suggest the proper wording? > >> > _______________________________________________ > >> > svn-src-all@freebsd.org mailing list > >> > https://lists.freebsd.org/mailman/listinfo/svn-src-all > >> > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org > " > >> > > >> > >> > >> -- > >> Mateusz Guzik >