From owner-svn-src-all@freebsd.org Tue Sep 22 21:31:44 2020 Return-Path: Delivered-To: svn-src-all@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 740173F7EDE; Tue, 22 Sep 2020 21:31:44 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (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 4BwvdX0yDLz3RNs; Tue, 22 Sep 2020 21:31:44 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oi1-f174.google.com with SMTP id n2so22672078oij.1; Tue, 22 Sep 2020 14:31:44 -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=dxE+iGUwDm9ToM1XH/+86QVhbiPGS5QxuSkJpUl9GG8=; b=d8n+jMNNvLvF4sRZJT/6/CXbOmvLeMIm0Nim4v/H9NyuwAoS8YZeHLaEMoQpXEFEwm x8bw/4+kAgXjoFwll/5uSKo6tO2G2JxevwIeL8dNvcFohZN1iUOAM9I5kq6UGgP1S22L 4JOD5gYFoSRaEhjdkKc/lWl64a3tCrbAojLPwkrJHO/hk34xV3EQ4r79XS++QGN0G9Bc Ymusn9dKjk5HwuDy/UYbnrpUznqsnld43/0E2a/EQjiz50HGk3x+BlGfAaafZS/w67KF Iwy8K5ip7tWZagN0KxMVeQ0xKhShU3w5vEIdp7b5rEdl2BulP+HItHVffDCAdiku6xpJ 4tLA== X-Gm-Message-State: AOAM53318Y7bu8UsZAIAc3EZfKg7b212k/6+iL1kmyY3hO0z1/kgqbyJ MOipUQgEw+Kh/pAGZyzTfJPwm9dK6tZhv1SopAFfJGhq X-Google-Smtp-Source: ABdhPJzRdSvdMSbHDG6fq6L+RBTkmbxP2gS1xHGq4bpqoSTJvP9i9shYcnXbG9DvJLl4y7mlS5PfvCoR4OGgIXiG820= X-Received: by 2002:a05:6808:555:: with SMTP id i21mr3697496oig.55.1600810302919; Tue, 22 Sep 2020 14:31:42 -0700 (PDT) MIME-Version: 1.0 References: <202009112049.08BKnavL032212@repo.freebsd.org> In-Reply-To: From: Alan Somers Date: Tue, 22 Sep 2020 15:31:31 -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: 4BwvdX0yDLz3RNs X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 21:31:44 -0000 +1. On Tue, Sep 22, 2020 at 3:27 PM Kyle Evans wrote: > 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 >