From patchwork Sun Jan 8 18:11:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 712674 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3txwtH4Vlkz9ssP for ; Tue, 10 Jan 2017 00:27:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9EF30B39B7; Mon, 9 Jan 2017 14:26:59 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kopFmQ7vlfpL; Mon, 9 Jan 2017 14:26:59 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D01E1A761A; Mon, 9 Jan 2017 14:26:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3D5FAB3931 for ; Sun, 8 Jan 2017 19:19:09 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uCk0Ak6aunCh for ; Sun, 8 Jan 2017 19:19:09 +0100 (CET) X-Greylist: delayed 442 seconds by postgrey-1.34 at theia; Sun, 08 Jan 2017 19:19:06 CET X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from lb3-smtp-cloud2.xs4all.net (lb3-smtp-cloud2.xs4all.net [194.109.24.29]) by theia.denx.de (Postfix) with ESMTPS id 090EEA75B7 for ; Sun, 8 Jan 2017 19:19:06 +0100 (CET) Received: from barber.sibelius.xs4all.nl ([83.163.83.176]) by smtp-cloud2.xs4all.net with ESMTP id VuBi1u00B3oFi1v01uBjxK; Sun, 08 Jan 2017 19:11:43 +0100 From: Mark Kettenis To: u-boot@lists.denx.de Date: Sun, 8 Jan 2017 19:11:27 +0100 Message-Id: <20170108181127.55124-1-kettenis@openbsd.org> X-Mailer: git-send-email 2.11.0 X-Mailman-Approved-At: Mon, 09 Jan 2017 14:26:51 +0100 Cc: Mark Kettenis Subject: [U-Boot] [PATCH] Avoid non-portable sed construct X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Using \n in a substitution is a GNU extension. Use the 'G" command instead to insert the desired line. Signed-off-by: Mark Kettenis --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 13c975b8a4..4413e9f98b 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -311,7 +311,7 @@ quiet_cmd_dtc = DTC $@ # Bring in any U-Boot-specific include after the '/dts-v1/;' header cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ cat $< $(if $(u_boot_dtsi),\ - | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \ + | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \