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 \ From patchwork Mon Mar 11 00:30:49 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: 10846507 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 C9C8D1823 for ; Mon, 11 Mar 2019 00:35:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9DC928E7F for ; Mon, 11 Mar 2019 00:35:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9863628E88; Mon, 11 Mar 2019 00:35:32 +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 2F21728E7F for ; Mon, 11 Mar 2019 00:35:32 +0000 (UTC) Received: from localhost ([127.0.0.1]:53082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38uh-00022g-9t for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Mar 2019 20:35:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38qm-0007eU-DV for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h38qj-0003Va-NK for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h38qj-0003VD-G3 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:25 -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 AEDCBC057E68; Mon, 11 Mar 2019 00:31:24 +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 37F07177AC; Mon, 11 Mar 2019 00:31:20 +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:49 +0100 Message-Id: <20190311003052.13778-3-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.32]); Mon, 11 Mar 2019 00:31:24 +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 2/5] roms/edk2: Avoid bashism in script 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 Use the POSIX '=' to evaluate equality. This fixes building the roms with a dash shell: $ make -C roms efi [...] cp edk2/Build/ArmVirtQemu-ARM/DEBUG_GCC5/FV/QEMU_EFI.fd \ ../pc-bios/edk2-arm-code.fd truncate --size=64M ../pc-bios/edk2-arm-code.fd /bin/sh: 111: [: i686: unexpected operator /bin/sh: 112: [: i686: unexpected operator /bin/sh: 116: [: i686: unexpected operator Signed-off-by: Philippe Mathieu-Daudé --- roms/edk2-funcs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh index 7fc62f074c..402fc126fb 100644 --- a/roms/edk2-funcs.sh +++ b/roms/edk2-funcs.sh @@ -108,8 +108,8 @@ qemu_edk2_get_cross_prefix() host_arch=$(uname -m) - if [ "$gcc_arch" == "$host_arch" ] || - ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then + if [ "$gcc_arch" = "$host_arch" ] || + ( [ "$gcc_arch" = i686 ] && [ "$host_arch" = x86_64 ] ); then # no cross-compiler needed : else From patchwork Mon Mar 11 00:30:50 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: 10846505 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 601821575 for ; Mon, 11 Mar 2019 00:33:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CA0128E88 for ; Mon, 11 Mar 2019 00:33:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40AE928E7F; Mon, 11 Mar 2019 00:33:01 +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 DD37928E7F for ; Mon, 11 Mar 2019 00:33:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:53034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38sG-0000Cv-78 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Mar 2019 20:33:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38qx-0007hr-TE for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h38qw-0003aY-27 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40260) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h38qu-0003ZT-Ov for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:37 -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 4FF614E938; Mon, 11 Mar 2019 00:31:35 +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 4961917A73; Mon, 11 Mar 2019 00:31:24 +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:50 +0100 Message-Id: <20190311003052.13778-4-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.38]); Mon, 11 Mar 2019 00:31:35 +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 3/5] roms/edk2: Pass extra arguments to the build script via EDK2_BUILD_OPTIONS 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 current EDK2 options produce a very verbose output. When building the roms on Continuous Integration systems (such Travis CI) the system limit is quickly reached. Add an variable to optionally pass arguments to the edk2-build.sh script. Example of use: $ EDK2_BUILD_OPTIONS="--quiet --silent" make -C roms efi ... Signed-off-by: Philippe Mathieu-Daudé --- roms/Makefile.edk2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 6c5e9b9eea..70f84b20df 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -44,6 +44,7 @@ submodules: ../pc-bios/edk2-aarch64-code.fd: submodules +./edk2-build.sh \ aarch64 \ + $(EDK2_BUILD_OPTIONS) \ --arch=AARCH64 \ --platform=ArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ @@ -55,6 +56,7 @@ submodules: ../pc-bios/edk2-arm-code.fd: submodules +./edk2-build.sh \ arm \ + $(EDK2_BUILD_OPTIONS) \ --arch=ARM \ --platform=ArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ @@ -66,6 +68,7 @@ submodules: ../pc-bios/edk2-i386-code.fd: submodules +./edk2-build.sh \ i386 \ + $(EDK2_BUILD_OPTIONS) \ --arch=IA32 \ --platform=OvmfPkg/OvmfPkgIa32.dsc \ -D NETWORK_IP6_ENABLE \ @@ -78,6 +81,7 @@ submodules: ../pc-bios/edk2-i386-secure-code.fd: submodules +./edk2-build.sh \ i386 \ + $(EDK2_BUILD_OPTIONS) \ --arch=IA32 \ --platform=OvmfPkg/OvmfPkgIa32.dsc \ -D NETWORK_IP6_ENABLE \ @@ -92,6 +96,7 @@ submodules: ../pc-bios/edk2-x86_64-code.fd: submodules +./edk2-build.sh \ x86_64 \ + $(EDK2_BUILD_OPTIONS) \ --arch=X64 \ --platform=OvmfPkg/OvmfPkgX64.dsc \ -D NETWORK_IP6_ENABLE \ @@ -104,6 +109,7 @@ submodules: ../pc-bios/edk2-x86_64-secure-code.fd: submodules +./edk2-build.sh \ x86_64 \ + $(EDK2_BUILD_OPTIONS) \ --arch=IA32 \ --arch=X64 \ --platform=OvmfPkg/OvmfPkgIa32X64.dsc \ From patchwork Mon Mar 11 00:30:51 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: 10846511 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 5EFD96C2 for ; Mon, 11 Mar 2019 00:35:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A89D28E7F for ; Mon, 11 Mar 2019 00:35:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E8A028E88; Mon, 11 Mar 2019 00:35:49 +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 F02CB28E7F for ; Mon, 11 Mar 2019 00:35:48 +0000 (UTC) Received: from localhost ([127.0.0.1]:53086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38uy-0002E1-7r for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Mar 2019 20:35:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38r0-0007jY-Ri for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h38r0-0003ce-2o for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44914) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h38qz-0003bK-Qu for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:41 -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 608E98666F; Mon, 11 Mar 2019 00:31:39 +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 D4F9E16BE0; Mon, 11 Mar 2019 00:31:35 +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:51 +0100 Message-Id: <20190311003052.13778-5-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.26]); Mon, 11 Mar 2019 00:31:39 +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 4/5] NOTFORMERGE roms/edk2: Use arm-linux-gnueabihf-gcc on Debian based distribs 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 Do not enforce GCCx_ARM_PREFIX=arm-linux-gnu- on Debian based distributions. This is a kludge not meant for merging! Signed-off-by: Philippe Mathieu-Daudé --- roms/edk2-funcs.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh index 402fc126fb..2f1fa2af1a 100644 --- a/roms/edk2-funcs.sh +++ b/roms/edk2-funcs.sh @@ -113,6 +113,11 @@ qemu_edk2_get_cross_prefix() # no cross-compiler needed : else + if [ -f /etc/lsb-release ] && [ "$gcc_arch" = arm ]; then + # XXX kludge for Debian-based distribs + printf 'arm-linux-gnueabihf-\n' + return 0 + fi printf '%s-linux-gnu-\n' "$gcc_arch" fi } From patchwork Mon Mar 11 00:30:52 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: 10846509 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 2AFD61823 for ; Mon, 11 Mar 2019 00:35:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13D7728E7F for ; Mon, 11 Mar 2019 00:35:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04BFF28E88; Mon, 11 Mar 2019 00:35:46 +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 B06B828E7F for ; Mon, 11 Mar 2019 00:35:45 +0000 (UTC) Received: from localhost ([127.0.0.1]:53084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38uv-0002BV-1U for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Mar 2019 20:35:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h38r4-0007la-43 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h38r3-0003eu-BF for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h38r3-0003eS-2J for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:31:45 -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 51CDF3084269; Mon, 11 Mar 2019 00:31:44 +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 2A14817CC5; Mon, 11 Mar 2019 00:31:39 +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:52 +0100 Message-Id: <20190311003052.13778-6-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.40]); Mon, 11 Mar 2019 00:31:44 +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 5/5] .travis.yml: Build and install EDK2 roms 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 Add a job to build and install the EDK2 platform firmware binaries. This job is only triggered if the last commit matches the EDK2 name (case insensitive), or when tag are created (such releases or release candidates). Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.travis.yml b/.travis.yml index e942175dd3..628cc52c99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -258,3 +258,24 @@ matrix: - env: - CONFIG="--disable-system" - TEST_CMD="make -j3 check-tcg V=1" + + + # EDK2 roms builds + - if: tag IS present OR commit_message =~ /(edk2|EDK2)/ + env: + - CONFIG="--disable-system --disable-user --prefix=$PWD/dist" + - EDK2_BUILD_OPTIONS="--quiet --silent" + script: + - git submodule update --init roms/edk2 + - make -j3 + - make -C roms efi -j2 + - make install + addons: + apt: + packages: + - dos2unix + - gcc-aarch64-linux-gnu + - gcc-arm-linux-gnueabihf + - iasl + - nasm + - uuid-dev