From patchwork Sun Jun 27 18:47:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 30749 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EE31F27BC81; Sun, 27 Jun 2021 19:48:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C374527BC78 for ; Sun, 27 Jun 2021 19:48:08 +0100 (BST) Received: from localhost ([::1]:38118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxZp9-0007TH-RB for patchwork@mira.cbaines.net; Sun, 27 Jun 2021 14:48:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxZp4-0007T9-Jm for guix-patches@gnu.org; Sun, 27 Jun 2021 14:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxZp4-00063o-CZ for guix-patches@gnu.org; Sun, 27 Jun 2021 14:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxZp4-0008KP-6C for guix-patches@gnu.org; Sun, 27 Jun 2021 14:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49244] [PATCH] gnu: grub-efi: Only enable the stack protector on x86_64-linux. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Jun 2021 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49244@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162481963331933 (code B ref -1); Sun, 27 Jun 2021 18:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jun 2021 18:47:13 +0000 Received: from localhost ([127.0.0.1]:50392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxZoH-0008Iz-G5 for submit@debbugs.gnu.org; Sun, 27 Jun 2021 14:47:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:53854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxZoF-0008Ir-DW for submit@debbugs.gnu.org; Sun, 27 Jun 2021 14:47:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxZoF-0007Qv-11 for guix-patches@gnu.org; Sun, 27 Jun 2021 14:47:11 -0400 Received: from mira.cbaines.net ([212.71.252.8]:52278) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxZoD-0005YE-Bw for guix-patches@gnu.org; Sun, 27 Jun 2021 14:47:10 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 8888727BC78 for ; Sun, 27 Jun 2021 19:47:08 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 904f5623 for ; Sun, 27 Jun 2021 18:47:08 +0000 (UTC) From: Christopher Baines Date: Sun, 27 Jun 2021 19:47:08 +0100 Message-Id: <20210627184708.17496-1-mail@cbaines.net> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Follow up to 018f95094153660e3041ec160718f0bda286a3dc, as gcc on aarch64-linux doesn't seem to support -mstack-protector-guard=global. * gnu/packages/bootloaders.scm (grub-efi)[arguments]: Only add "--enable-stack-protector" to #:configure-flags when system is x86_64-linux. --- gnu/packages/bootloaders.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e83f21ea63..1ff0348ac7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -303,7 +303,10 @@ menu to select one of the installed operating systems.") ((#:tests? _ #f) #f) ((#:configure-flags flags ''()) `(cons* "--with-platform=efi" - "--enable-stack-protector" ; EFI-only for now + ,@(if (string=? (%current-system) + "x86_64-linux") + '("--enable-stack-protector") ; EFI-only for now + '()) ,flags)) ((#:phases phases) `(modify-phases ,phases