From patchwork Wed Nov 14 19:29:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151117 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6088277ljp; Wed, 14 Nov 2018 11:31:57 -0800 (PST) X-Google-Smtp-Source: AJdET5cfnFvqiEcakPkidYHc5FV7J+PDGpOZpbZv4/A4/0dkx5SLFBW0ZMUlzAUNL6sJBF5OMmkj X-Received: by 2002:a37:62d3:: with SMTP id w202mr2964669qkb.357.1542223917140; Wed, 14 Nov 2018 11:31:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223917; cv=none; d=google.com; s=arc-20160816; b=ivWSvtbKxm+cg0Elan2GahgcQD+SV8nl+gCPArADxQaoLv0BV03QJroKsfHIaD3Fm0 4olUiOu/w6r+qTcIyPMQFXevLYqbWpBOqh+dHYH/mi7/LDjuUZJ1wTvTeqgjKJjD/5d0 MkV8D4KqiZvkKQ3G307B26RrqJ5gGkmeCnBOsGbxdKvckyJIN5Z/Zojy4at355wIk31r sF0msXtRSPtPiGdqmfIkF+RZN5m+wCPS/EvXOAwVWHilvCwsgrQbmvz5am0bs4rNFCvY o12rVqh/UyPWGZIY1MGsSNyCDUQODutwiIWXp5m+kNH0bNd4puDJkvZ4+8/piAfy6lKv 6pEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature; bh=bNsMW3bRbfYgjk+aV0nHE++UODN16Ql7gaysj9xpo3M=; b=EDucj08NNg+KTB7FcoEFC5iY4ajlcpiHLqdjuHiqnDqWM5clRu7QHHv1oWbiPOIQbL TSEs0z6PjDx31ZycJjpiTeRelYDhohMvESjSCPI96F/mJcnYMaR/r5369siej0cPVeRl ME2PwHuS1PmfOaKoWcjln8JTHn3jwwqaDYHGpQOPQmJs2UJC97vNfFS/ULHZMgjcTcQb 2dam8X9TV6nlRiCtOvOvAOVCbOPuOXkNYHy6Pc0mARv3/c15kVwRJgQr7Pu4OTkU0cXg Ho22lQ360fGFALMDF4rhhCtLZ1PQR5gv4B2XxEigti9w6XIPLpzuwpBOZeKaSZOuCG7G ahag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Akc8iwKu; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y65si12897914qtd.327.2018.11.14.11.31.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:31:57 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Akc8iwKu; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0tI-0002Af-Ct for patch@linaro.org; Wed, 14 Nov 2018 14:31:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qx-0000jn-LT for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN0qw-0004tj-JN for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:31 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54416) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qw-0004sW-1F for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: by mail-wm1-x343.google.com with SMTP id r63-v6so16650944wma.4 for ; Wed, 14 Nov 2018 11:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nQ0RyAh6reTTfG8KaLQwP+s/j4BfTHpNGJi34ZJAQpA=; b=Akc8iwKuoZmTMCjKKKuOwEKWXTS3tdLHoiTI8SHOm6Eg/Xa5KW8xOMY686TXzex5qw u+CNg61zdEBc8mORhH/Y4Ph86il2mQ2JT/BM4r3OsK/jrDygq+aAhJFV+bpPitOXOsHL YeeWK2GQ5V5k9Zj24A+BwskRHobccbH6uuXGI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nQ0RyAh6reTTfG8KaLQwP+s/j4BfTHpNGJi34ZJAQpA=; b=tIb73vqamWeRlg8RRS4Am4iqXGUgeME/BLR59mY2F+GE1HBI3x/Im4ca0//1awkuXe o1NBLEI7QG/5mOKAJ5CzTNx6gU+UITJcb5WOR3XpAC2T3caCBxC9sgCVSl+JZIbLSfu8 a82TKV/P9cTnvvTFptn7Z/IQM22gNz/yxifBxqLksPWzmAWeEWLU4AlF7Ab/PI4/Ezcj yTKX5vJJPfeT713E0a56K1Mj5kmsZ45CD96WsF2BmWVg6pkyiyV+b+Zg7qYwxvc3mZqv LyQ518JtxnsHmB34Tk4nU2faq+55qfvDQLfqulhtL09mA6CqlvSRprBzk81MHjgibGzG Qnqw== X-Gm-Message-State: AGRZ1gLinyl3eXsuPZc0L3Gv+AkAnNxLljYas5iPh8VMqacKZo/7dp2B yhahJn6IPN+mne9Ivq/NZJ4CVTKuBfuWIw== X-Received: by 2002:a1c:9b4b:: with SMTP id d72-v6mr2946787wme.72.1542223768476; Wed, 14 Nov 2018 11:29:28 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id 127sm6260278wmb.4.2018.11.14.11.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:27 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 5/5] arm-uboot, ia64, sparc64: fix up grub_file_open calls Date: Wed, 14 Nov 2018 19:29:19 +0000 Message-Id: <20181114192919.24655-6-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181114192919.24655-1-leif.lindholm@linaro.org> References: <20181114192919.24655-1-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: dkiper@net-space.pl MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" The verifiers framework changed the grub_file_open interface, breaking all non-x86 linux loaders. Add file types to the grub_file_open calls to make them build again. Signed-off-by: Leif Lindholm --- Bundling these changes together in a single patch, since I haven't actually tested these. grub-core/loader/arm/linux.c | 6 +++--- grub-core/loader/ia64/efi/linux.c | 2 +- grub-core/loader/sparc64/ieee1275/linux.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c index 80293fb1f..67ed79359 100644 --- a/grub-core/loader/arm/linux.c +++ b/grub-core/loader/arm/linux.c @@ -363,7 +363,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), if (argc == 0) return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); - file = grub_file_open (argv[0]); + file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL); if (!file) goto fail; @@ -408,7 +408,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), if (argc == 0) return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); - file = grub_file_open (argv[0]); + file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_INITRD); if (!file) return grub_errno; @@ -471,7 +471,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), if (argc != 1) return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); - dtb = grub_file_open (argv[0]); + dtb = grub_file_open (argv[0], GRUB_FILE_TYPE_DEVICE_TREE_IMAGE); if (!dtb) return grub_errno; diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c index 6477d70f0..639a1f379 100644 --- a/grub-core/loader/ia64/efi/linux.c +++ b/grub-core/loader/ia64/efi/linux.c @@ -460,7 +460,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), goto fail; } - file = grub_file_open (argv[0]); + file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL); if (! file) goto fail; diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c index abe46faa0..bb47ee0cc 100644 --- a/grub-core/loader/sparc64/ieee1275/linux.c +++ b/grub-core/loader/sparc64/ieee1275/linux.c @@ -306,7 +306,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), goto out; } - file = grub_file_open (argv[0]); + file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL); if (!file) goto out;