From owner-freebsd-uboot@freebsd.org Sat Feb 13 10:06:44 2021 Return-Path: Delivered-To: freebsd-uboot@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 EAB305477BB for ; Sat, 13 Feb 2021 10:06:44 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Dd5ch6NFWz3p3K for ; Sat, 13 Feb 2021 10:06:44 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id D885D547767; Sat, 13 Feb 2021 10:06:44 +0000 (UTC) Delivered-To: uboot@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 D84C6547AA3 for ; Sat, 13 Feb 2021 10:06:44 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dd5ch5pByz3p7p; Sat, 13 Feb 2021 10:06:44 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from localhost (unknown [212.230.157.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: royger) by smtp.freebsd.org (Postfix) with ESMTPSA id 597DDC05B; Sat, 13 Feb 2021 10:06:44 +0000 (UTC) (envelope-from royger@FreeBSD.org) From: Roger Pau Monne To: u-boot@lists.denx.de Cc: uboot@freebsd.org, Roger Pau Monne Subject: [PATCH 0/2] Fixes for BSD sed compatibility Date: Sat, 13 Feb 2021 11:06:30 +0100 Message-Id: <20210213100632.6249-1-royger@FreeBSD.org> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 10:06:45 -0000 Hello, This series contain two fixes that allow me to build U-Boot with FreeBSD sed instead of GNU sed. Shouldn't introduce any functional change. Thanks, Roger. Roger Pau Monné (2): scripts/check-config.sh: fix to be compatible with BSD sed build/DTC: fix sed usage in DTC command scripts/Makefile.lib | 3 +-- scripts/check-config.sh | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) -- 2.30.1 From owner-freebsd-uboot@freebsd.org Sat Feb 13 10:06:46 2021 Return-Path: Delivered-To: freebsd-uboot@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 E0857547769 for ; Sat, 13 Feb 2021 10:06:46 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Dd5ck60nnz3p5n for ; Sat, 13 Feb 2021 10:06:46 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id CE0605477C2; Sat, 13 Feb 2021 10:06:46 +0000 (UTC) Delivered-To: uboot@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 CDC925479DD for ; Sat, 13 Feb 2021 10:06:46 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dd5ck5RdMz3pGM; Sat, 13 Feb 2021 10:06:46 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from localhost (unknown [212.230.157.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: royger) by smtp.freebsd.org (Postfix) with ESMTPSA id 59062C49A; Sat, 13 Feb 2021 10:06:46 +0000 (UTC) (envelope-from royger@FreeBSD.org) From: Roger Pau Monne To: u-boot@lists.denx.de Cc: uboot@freebsd.org, Roger Pau Monne , Masahiro Yamada , Simon Glass , Michal Simek , Wolfgang Wallner , Jan Kiszka Subject: [PATCH 1/2] scripts/check-config.sh: fix to be compatible with BSD sed Date: Sat, 13 Feb 2021 11:06:31 +0100 Message-Id: <20210213100632.6249-2-royger@FreeBSD.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210213100632.6249-1-royger@FreeBSD.org> References: <20210213100632.6249-1-royger@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 10:06:46 -0000 Fist use extended regexp in order to drop the '\' around the parentheses which is not supported by BSD sed in regular mode. Secondly use [[:blank:]] instead of \s, as the later is a GNU extension. No functional change intended. Signed-off-by: Roger Pau Monné --- Cc: Masahiro Yamada Cc: Simon Glass Cc: Michal Simek Cc: Wolfgang Wallner Cc: Jan Kiszka --- scripts/check-config.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/check-config.sh b/scripts/check-config.sh index 583f7d0963..cc1c9a54d9 100755 --- a/scripts/check-config.sh +++ b/scripts/check-config.sh @@ -39,14 +39,14 @@ new_adhoc="${path}.adhoc" export LC_ALL=C export LC_COLLATE=C -cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \ +cat ${path} |sed -nr 's/^#define (CONFIG_[A-Za-z0-9_]*).*/\1/p' |sort |uniq \ >${configs} comm -23 ${configs} ${whitelist} > ${suspects} -cat `find ${srctree} -name "Kconfig*"` |sed -n \ - -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - -e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ +cat `find ${srctree} -name "Kconfig*"` |sed -nr \ + -e 's/^[[:blank:]]*config *([A-Za-z0-9_]*).*$/CONFIG_\1/p' \ + -e 's/^[[:blank:]]*menuconfig ([A-Za-z0-9_]*).*$/CONFIG_\1/p' \ |sort |uniq > ${ok} comm -23 ${suspects} ${ok} >${new_adhoc} if [ -s ${new_adhoc} ]; then -- 2.30.1 From owner-freebsd-uboot@freebsd.org Sat Feb 13 10:06:48 2021 Return-Path: Delivered-To: freebsd-uboot@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 ECF61547A1C for ; Sat, 13 Feb 2021 10:06:48 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Dd5cm6N9qz3pGP for ; Sat, 13 Feb 2021 10:06:48 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id DAE11547819; Sat, 13 Feb 2021 10:06:48 +0000 (UTC) Delivered-To: uboot@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 DAADF5477C5 for ; Sat, 13 Feb 2021 10:06:48 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dd5cm5zg1z3pJj; Sat, 13 Feb 2021 10:06:48 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from localhost (unknown [212.230.157.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: royger) by smtp.freebsd.org (Postfix) with ESMTPSA id 662E0C05C; Sat, 13 Feb 2021 10:06:48 +0000 (UTC) (envelope-from royger@FreeBSD.org) From: Roger Pau Monne To: u-boot@lists.denx.de Cc: uboot@freebsd.org, Roger Pau Monne , Masahiro Yamada , Simon Glass , Michal Simek , Wolfgang Wallner , Jan Kiszka Subject: [PATCH 2/2] build/DTC: fix sed usage in DTC command Date: Sat, 13 Feb 2021 11:06:32 +0100 Message-Id: <20210213100632.6249-3-royger@FreeBSD.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210213100632.6249-1-royger@FreeBSD.org> References: <20210213100632.6249-1-royger@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 10:06:49 -0000 Current sed usage in the DTC command relies on GNU sed specific -i option which has a slightly different syntax for BSD sed and always expects an extension to be provided in order to create a backup file. Instead drop the cat concatenation done before the sed call and use sed itself to edit and concatenate the files. No functional change intended. Signed-off-by: Roger Pau Monné --- Cc: Masahiro Yamada Cc: Simon Glass Cc: Michal Simek Cc: Wolfgang Wallner Cc: Jan Kiszka --- scripts/Makefile.lib | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 56e9d54242..78543c6dd1 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -326,8 +326,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ -d $(depfile).dtc.tmp $(dtc-tmp) || \ (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \ ; \ - cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) ; \ - sed -i "s:$(pre-tmp):$(<):" $(depfile) + sed "s:$(pre-tmp):$(<):" $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) $(obj)/%.dtb: $(src)/%.dts FORCE $(call if_changed_dep,dtc) -- 2.30.1 From owner-freebsd-uboot@freebsd.org Sat Feb 13 16:43:11 2021 Return-Path: Delivered-To: freebsd-uboot@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 75717531B18 for ; Sat, 13 Feb 2021 16:43:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DdGQ709X1z4jFM for ; Sat, 13 Feb 2021 16:43:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 05B595314FD; Sat, 13 Feb 2021 16:43:11 +0000 (UTC) Delivered-To: uboot@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 057D95316E9 for ; Sat, 13 Feb 2021 16:43:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 4DdGQ66bddz4jCB for ; Sat, 13 Feb 2021 16:43:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x830.google.com with SMTP id d3so1999395qtr.10 for ; Sat, 13 Feb 2021 08:43:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=MPlroRqN4CsNKLYr9Z9zoMuH9ZQzUtL4LqouWpm1r7Y=; b=D2HL+2j4a90Fqp/wBWRayouYAesKyk/OcV61/8Z9lt7j9uSyXaMNdzEh7qYMSkZIZ/ 6kQuGsmw1mMDnRSj3cx/jNGvbji+lzqPmEHpgKQlc1tiNHuE/nT8J61bx0RBQLiGyXJ4 YkF1S4pTKlgs55uisrJ4/Q3nU2ZtUHa91FfarZYt8HTKY0pTnbUKWMOjJEB8rjj/cFy2 Yx3h/J7rRJElXKAq9Kz9nX2TxFpQfcKFgPVJk174Xg5GzVr0s48vjwDVK3adlKN2BX6G fdDW3NE3415hpptv7BUJVfYjHAyW9hP5EEMUvbyt4/gn5We4iLnTSEmLTRcdjRK1277u RV5g== 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=MPlroRqN4CsNKLYr9Z9zoMuH9ZQzUtL4LqouWpm1r7Y=; b=o0rs5+pJbyu6lfyY+wV1yn1Olve7xqnXDvKMGbkj6wfXDlxZphPEh4hh4rLyQIdqj2 GQvHRbY+9TGQk4Lg3wtRN+bTyAjzFFZSQy1Y/tGeY8x97mbntXrC0E9zUqOwV3TN5Xzr J9VLfz3zqcvgTl1X69QSvBynHSYM/hB5xMjNOHy+2kKG/RHWospR2Vnpsacrm5Q1/2Lz aspWjEcotoF4mfjnQ5F+BNU58VhomNyNnQiFGKckMUvwZb/pvpBm6U4ijSEaF6PLs6ct 3JXXwGbgzyxzatLFzurLBXri+PlRGz8BQr9TnJeVQU4s4D5D4rf0RCXFPO6lr6o1e/om pbdw== X-Gm-Message-State: AOAM530BxjxvHD4uGof7DQKg1wl8AazI3mtuer5X2xJZQDRIzY7CW3hi VG5MlnstPKaVnFzpPVHQYgy1Rdcl7IQGxXmEuw4rXg== X-Google-Smtp-Source: ABdhPJy37fVghZw6m3YdAfHKaR1K1RBzv1yZ6xxbXdQwmbnb7Xs4L6/c22D48xz8SuKqIAdZrSBqtXtNZNy4+TQMZBs= X-Received: by 2002:a05:622a:90:: with SMTP id o16mr7209056qtw.49.1613234589625; Sat, 13 Feb 2021 08:43:09 -0800 (PST) MIME-Version: 1.0 References: <20210213100632.6249-1-royger@FreeBSD.org> <20210213100632.6249-2-royger@FreeBSD.org> In-Reply-To: <20210213100632.6249-2-royger@FreeBSD.org> From: Warner Losh Date: Sat, 13 Feb 2021 09:42:58 -0700 Message-ID: Subject: Re: [PATCH 1/2] scripts/check-config.sh: fix to be compatible with BSD sed To: Roger Pau Monne Cc: U-Boot Mailing List , uboot@freebsd.org, Masahiro Yamada , Simon Glass , Michal Simek , Wolfgang Wallner , Jan Kiszka X-Rspamd-Queue-Id: 4DdGQ66bddz4jCB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 16:43:11 -0000 On Sat, Feb 13, 2021 at 3:06 AM Roger Pau Monne wrote: > Fist use extended regexp in order to drop the '\' around the > parentheses which is not supported by BSD sed in regular mode. > > Secondly use [[:blank:]] instead of \s, as the later is a GNU > extension. > > No functional change intended. > > Signed-off-by: Roger Pau Monn=C3=A9 > Reviewed by: Warner Losh > --- > Cc: Masahiro Yamada > Cc: Simon Glass > Cc: Michal Simek > Cc: Wolfgang Wallner > Cc: Jan Kiszka > --- > scripts/check-config.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/scripts/check-config.sh b/scripts/check-config.sh > index 583f7d0963..cc1c9a54d9 100755 > --- a/scripts/check-config.sh > +++ b/scripts/check-config.sh > @@ -39,14 +39,14 @@ new_adhoc=3D"${path}.adhoc" > export LC_ALL=3DC > export LC_COLLATE=3DC > > -cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort > |uniq \ > +cat ${path} |sed -nr 's/^#define (CONFIG_[A-Za-z0-9_]*).*/\1/p' |sort > |uniq \ > >${configs} > > comm -23 ${configs} ${whitelist} > ${suspects} > > -cat `find ${srctree} -name "Kconfig*"` |sed -n \ > - -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ > - -e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ > +cat `find ${srctree} -name "Kconfig*"` |sed -nr \ > + -e 's/^[[:blank:]]*config *([A-Za-z0-9_]*).*$/CONFIG_\1/p' \ > + -e 's/^[[:blank:]]*menuconfig ([A-Za-z0-9_]*).*$/CONFIG_\1/p' \ > |sort |uniq > ${ok} > comm -23 ${suspects} ${ok} >${new_adhoc} > if [ -s ${new_adhoc} ]; then > -- > 2.30.1 > > _______________________________________________ > freebsd-uboot@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-uboot > To unsubscribe, send any mail to "freebsd-uboot-unsubscribe@freebsd.org" > From owner-freebsd-uboot@freebsd.org Sat Feb 13 16:44:03 2021 Return-Path: Delivered-To: freebsd-uboot@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 6700B5319E4 for ; Sat, 13 Feb 2021 16:44:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DdGR70SJ8z4jWR for ; Sat, 13 Feb 2021 16:44:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 0F96A531B33; Sat, 13 Feb 2021 16:44:03 +0000 (UTC) Delivered-To: uboot@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 0F56C5319E3 for ; Sat, 13 Feb 2021 16:44:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (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 4DdGR66fRlz4jCR for ; Sat, 13 Feb 2021 16:44:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2b.google.com with SMTP id q8so1284990qvx.11 for ; Sat, 13 Feb 2021 08:44:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5bEmwyfik7ls96Sv9nY00NmyhTA6psXAaruswAocKMc=; b=XfSw+LpsAUbcl7p5lzKwrozbz3pIeCRNB1+nXWNMxY6lM8cP5TGf1mBt6b12aXRrhU LZR+DUKPze8d0CjzaE6HTmtcVZzRy93m4DcdabvNo361Y0OMfFfbW8tBTXNBSXG87jCy Cn/heaGjKCC3toMXatizXRy7fa1+0I66GQL2h/7Rm6Kzmtlnt7UGYIhOlJz0j40Klw3m q/EH6mlDy6VcJS4DZnzk5TCMxzfwRwYkOgA9WnNF7YnGonVj6rV3fcH/X6IJBNgD+iPK 5VXcc035uf53y7EaY3SpwVmOwyz2MdA2wyIlkr4b9RGbGX4u1IdKYQG7AGEi+41OAakL uKEg== 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=5bEmwyfik7ls96Sv9nY00NmyhTA6psXAaruswAocKMc=; b=q579RuznaigeXtQKh9xh7ukHQBDvUCmNHy8OPqcX0c+FufUw8uz+TYWKELVwJ3gWC8 qYRjheINvkOSjLBWcR8qd563CWO9Y+x6DEHo9Uu2B0h5957M5H1WvZcqN9HRuUI/D+1A trkj1FrDz/jLhybO9dIEGQF7berf36xREOdgGUfTw1w/K+axNPDM6hg5NpWVcra8OQso +Py3uToF2+5KMXBdv5157exhVyhO8sMp7TXWvSvz6LA+zPhQmoCZi1rvNcic4Y1gbkoU mNJF7zoWdDDQIsShXmPADkh4AGRLDfMUHdd5pF0JH8SZOZGZOWICeH4JrhyZNOYfCcIu MnLg== X-Gm-Message-State: AOAM533gwS1HH5mKk8tPUqSAYNbz0+QzeURlfe7hYrZoXUHv43qMGEvG rWyVRki4aPS7zWEnuSftT5o2cb7BSH7hrNufgKi3KA== X-Google-Smtp-Source: ABdhPJwJf0iqMROTrLV55Axx8k6X4mShL18hduV7Y2xfqCej7+7IslXvbYRA/ghPotUhn+wrMeD45E+r0wN1Vt/hrW8= X-Received: by 2002:a05:6214:606:: with SMTP id z6mr7423235qvw.62.1613234641899; Sat, 13 Feb 2021 08:44:01 -0800 (PST) MIME-Version: 1.0 References: <20210213100632.6249-1-royger@FreeBSD.org> <20210213100632.6249-3-royger@FreeBSD.org> In-Reply-To: <20210213100632.6249-3-royger@FreeBSD.org> From: Warner Losh Date: Sat, 13 Feb 2021 09:43:51 -0700 Message-ID: Subject: Re: [PATCH 2/2] build/DTC: fix sed usage in DTC command To: Roger Pau Monne Cc: U-Boot Mailing List , uboot@freebsd.org, Masahiro Yamada , Simon Glass , Michal Simek , Wolfgang Wallner , Jan Kiszka X-Rspamd-Queue-Id: 4DdGR66fRlz4jCR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-uboot@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of uboot with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 16:44:03 -0000 On Sat, Feb 13, 2021 at 3:06 AM Roger Pau Monne wrote: > Current sed usage in the DTC command relies on GNU sed specific -i > option which has a slightly different syntax for BSD sed and always > expects an extension to be provided in order to create a backup file. > > Instead drop the cat concatenation done before the sed call and use > sed itself to edit and concatenate the files. > > No functional change intended. > > Signed-off-by: Roger Pau Monn=C3=A9 > Reviewed by: Warner Losh > --- > Cc: Masahiro Yamada > Cc: Simon Glass > Cc: Michal Simek > Cc: Wolfgang Wallner > Cc: Jan Kiszka > --- > scripts/Makefile.lib | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 56e9d54242..78543c6dd1 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -326,8 +326,7 @@ cmd_dtc =3D mkdir -p $(dir ${dtc-tmp}) ; \ > -d $(depfile).dtc.tmp $(dtc-tmp) || \ > (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false= ) > \ > ; \ > - cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) ; \ > - sed -i "s:$(pre-tmp):$(<):" $(depfile) > + sed "s:$(pre-tmp):$(<):" $(depfile).pre.tmp $(depfile).dtc.tmp > > $(depfile) > > $(obj)/%.dtb: $(src)/%.dts FORCE > $(call if_changed_dep,dtc) > -- > 2.30.1 > > _______________________________________________ > freebsd-uboot@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-uboot > To unsubscribe, send any mail to "freebsd-uboot-unsubscribe@freebsd.org" >