From owner-svn-src-head@freebsd.org Tue Sep 22 21:27:00 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 6C8993F796B; Tue, 22 Sep 2020 21:27:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwvX42Gn5z4g2h; Tue, 22 Sep 2020 21:27:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 29FD61E5CA; Tue, 22 Sep 2020 21:27:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f173.google.com with SMTP id c18so16896830qtw.5; Tue, 22 Sep 2020 14:27:00 -0700 (PDT) X-Gm-Message-State: AOAM530SL/62gP2kxC1y4CzBht0WKwISh7ag04M6Pt/ejGSEecjsLEU0 Qfl6FBvcFdLYiIGYt26aoRpRytBbsxW6gsl3HZg= X-Google-Smtp-Source: ABdhPJwfDMEVQnSvrsP4xRE0k7buv5lBwe2JSG1O4XscoruqIrp0BrFKtCsG8lLlqkUxcwHhRN1thBoW70l7nbx8ow8= X-Received: by 2002:ac8:3f3d:: with SMTP id c58mr6906726qtk.53.1600810019714; Tue, 22 Sep 2020 14:26:59 -0700 (PDT) MIME-Version: 1.0 References: <202009112049.08BKnavL032212@repo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Tue, 22 Sep 2020 16:26:47 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r365643 - head/bin/cp To: Alan Somers Cc: Mateusz Guzik , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" 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:27:00 -0000 I'm running a build at the suggestion of mjg to confirm there aren't any others hiding that can be converted, and I will commit after I've verified that this is it. On Tue, Sep 22, 2020 at 4:02 PM Alan Somers wrote: > > 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