From patchwork Mon Mar 11 00:30:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10846503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C5F01575 for ; Mon, 11 Mar 2019 00:32:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 854CE28E7A for ; Mon, 11 Mar 2019 00:32:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 752D028E82; Mon, 11 Mar 2019 00:32:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1E08728E7A for ; Mon, 11 Mar 2019 00:32:55 +0000 (UTC) Received: from localhost ([127.0.0.1]:53025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38sB-0007hR-6p for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Mar 2019 20:32:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38qf-0007ct-RB for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h38qe-0003T7-Vu for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33184) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h38qe-0003Se-OG for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA825308FE62; Mon, 11 Mar 2019 00:31:19 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE39F17A73; Mon, 11 Mar 2019 00:31:16 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Laszlo Ersek Date: Mon, 11 Mar 2019 01:30:48 +0100 Message-Id: <20190311003052.13778-2-philmd@redhat.com> In-Reply-To: <20190311003052.13778-1-philmd@redhat.com> References: <20190311003052.13778-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 11 Mar 2019 00:31:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] roms/edk2: Avoid bashism in Makefile 'shell' function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , "Michael S . Tsirkin" , =?utf-8?b?TWljaGFsIFByw612b3puw61r?= , Gerd Hoffmann , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The shell builtin 'source' command is a bash extension. Use the '.' portable command. This fix building when /bin/sh is dash (Ubuntu 16): $ make -C roms efi [...] Fd File Name:QEMU_EFI (/source/qemu/roms/edk2/Build/ArmVirtQemu-AARCH64/DEBUG_GCC5/FV/QEMU_EFI.fd) Fd File Name:QEMU_VARS (/source/qemu/roms/edk2/Build/ArmVirtQemu-AARCH64/DEBUG_GCC5/FV/QEMU_VARS.fd) GUID cross reference file can be found at /source/qemu/roms/edk2/Build/ArmVirtQemu-AARCH64/DEBUG_GCC5/FV/Guid.xref - Done - Build end time: 16:33:29, Mar.09 2019 Build total time: 00:03:35 cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_/FV/QEMU_EFI.fd \ ../pc-bios/edk2-aarch64-code.fd cp: cannot stat 'edk2/Build/ArmVirtQemu-AARCH64/DEBUG_/FV/QEMU_EFI.fd': No such file or directory Makefile.edk2:45: recipe for target '../pc-bios/edk2-aarch64-code.fd' failed make[1]: *** [../pc-bios/edk2-aarch64-code.fd] Error 1 make[1]: Leaving directory '/source/qemu/roms' Makefile:148: recipe for target 'efi' failed make: *** [efi] Error 2 make: Leaving directory '/source/qemu/roms' Signed-off-by: Philippe Mathieu-Daudé --- roms/Makefile.edk2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index ad6fff044c..6c5e9b9eea 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -11,7 +11,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT # WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -toolchain = $(shell source ./edk2-funcs.sh && qemu_edk2_get_toolchain $(1)) +toolchain = $(shell . ./edk2-funcs.sh && qemu_edk2_get_toolchain $(1)) licenses := \ edk2/License.txt \