From patchwork Wed Nov 14 19:29:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151114 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6086050ljp; Wed, 14 Nov 2018 11:29:47 -0800 (PST) X-Google-Smtp-Source: AJdET5fsCQOcOhObgb50fY4Dmn/F78XxbJsb1v3ansWImw15TB9daqKwhbqAVFNL/1TzXXx//oxi X-Received: by 2002:a0c:9dc6:: with SMTP id p6mr3245475qvf.217.1542223787439; Wed, 14 Nov 2018 11:29:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223787; cv=none; d=google.com; s=arc-20160816; b=09ExtBmkCsF5a23LRU/uABKUznwcyGlhM4m7gOmTyL8P+0FBdTTkPRhqfd4hYGE+OH vFqAvYpDF5jHxAEuUy3Tk8nXQcWF+0b9AdL1vBEoyjN8k4Nh8GS8oVocTNskEGgaJViC +Aq0Kx3maHv+oKCHl9Nbw6rmZlZMXTfOOY5t4K/AH+hFCtsBFvAeG4362qSoie3/08X4 XJCqvkMj0BIJ/RFwWQfFr63RdFrk9upHS67XScKtlqXj7w1q3pdDlDg0Zrw8HppdZdy9 ZjVjc6fGvMOXexdgNC1+axqen/Yh3QaoBD+FkKCzLMBWbYIWecA6I1j61XiE6hKHh8ii +zww== 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=xibdzSEg9XUT2WxS5uoMnZ+qxrUAISOaV5eULHCdfqE=; b=XXmTe1Rin6RVUkpj2KiPhGl2Z/ByqaTFatsCVsTpdDpM9fHzx45hNgziVJk3xsSek7 k5zmi+PUlrlBjlm1XA68Sd+eR7mNrM09VH7zLT6odwcOMZNJpKVLUpr/O6x0CEUXXhdx FpMb8488zrrHt2XUkWbvCtOXALFNvRQIQ7jFnOSCAhhcLI1SdgD4IkHm1e/YmuXeQGYh 6VEBVa35h5rSzKNEd27WzXMXP1HUK1eCiWdoJxIDCDSESsD57J/I0+nIX2utvZJGfzmS VoaalIwnZW0mGhG9daW+Sp6ZbepYODY2Vj5rsLUDbaLzuvZCkAIZIpFw7B7VGap9NQz9 IIGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UMGGmHNS; 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 h123si1898544qkf.66.2018.11.14.11.29.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:29:47 -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=UMGGmHNS; 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]:33849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0rC-0000lW-ML for patch@linaro.org; Wed, 14 Nov 2018 14:29:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qw-0000jY-Ie 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 1gN0qs-0004r2-4y for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qq-0004pq-Ib for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:26 -0500 Received: by mail-wm1-x343.google.com with SMTP id p2-v6so15744959wmc.2 for ; Wed, 14 Nov 2018 11:29:24 -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=q1pSPo5xkjiiyDB6pmm9a5o33fy3CrrRt+c9fBt9G3o=; b=UMGGmHNSsw03dQGI8DqTAtpDR2VB45DZUmxXtRcx8JMx2gIZG5djl/2M0uDydhQgWk SftHav10HAokwG1QOFTgCE6uPdBBkrjsTZJeXUtZKPJCYPqGBLsh9b03pGqi2N47EhWD +Lt6McZxFSyoBqRM2yZj0/e1bUj0pgiLcokWw= 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=q1pSPo5xkjiiyDB6pmm9a5o33fy3CrrRt+c9fBt9G3o=; b=Qe5I9ci8W66eR9YQK3RlSyO1D5924lCka79ooGrR526czEO/CiNLb6SAPiRp4mA4G6 zB69K/oRfCUr0KIUn3io6G9rkp339m9+g/OhWsUUY6U61A79XPf9nC/Bj9l9QcSY1k9D 930uPbKAVW2jN0K0x7cBI0sybH8NhYKvpNSLJo3Fium9yeHtFx3VRny4JDluLjXBB/0P jWOuDwiWYp3tSXdY6OEXJlWcgw0bi/nPvTeVc9BsAoTo4Cf+iqDAhz9on+dLxHDV1k8S WzHP36hrlUMVCfsi/5sXTVSv1LTo5tpBFMZlanCMi8jc/BS8eDnD6O13ydlzCf38g59l c7zQ== X-Gm-Message-State: AGRZ1gLugRRlfkG26UXTEWGxgZ1YC78arGVIU0/ldnrHMCK3jkx0BfeY 81968jvb22DHuH+D8GcWHvW2Vk9M44bPew== X-Received: by 2002:a1c:1c88:: with SMTP id c130-v6mr2993183wmc.115.1542223762824; Wed, 14 Nov 2018 11:29:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:21 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 1/5] grub/verify.h: add include guard Date: Wed, 14 Nov 2018 19:29:15 +0000 Message-Id: <20181114192919.24655-2-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" verify.h was added without include guards. This means compiling anything including both grub/verify.h and grub/lib/cmdline.h fails (at least loader/arm64/linux.c. Add the necessary include guard. Signed-off-by: Leif Lindholm --- include/grub/verify.h | 5 +++++ 1 file changed, 5 insertions(+) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/include/grub/verify.h b/include/grub/verify.h index 79022b422..dedb14a1d 100644 --- a/include/grub/verify.h +++ b/include/grub/verify.h @@ -16,6 +16,9 @@ * along with GRUB. If not, see . */ +#ifndef GRUB_VERIFY_HEADER +#define GRUB_VERIFY_HEADER + #include #include @@ -76,3 +79,5 @@ grub_verifier_unregister (struct grub_file_verifier *ver) grub_err_t grub_verify_string (char *str, enum grub_verify_string_type type); + +#endif /* ! GRUB_VERIFY_HEADER */ From patchwork Wed Nov 14 19:29:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151112 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6085992ljp; Wed, 14 Nov 2018 11:29:43 -0800 (PST) X-Google-Smtp-Source: AJdET5dTSRGz6YBfZDn51MDWVXImGiQqHQc7EJOSMCtZFKbYCajJwgY2sdCy32hWRj3p2Yg0f5up X-Received: by 2002:ae9:e901:: with SMTP id x1mr2977851qkf.332.1542223783569; Wed, 14 Nov 2018 11:29:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223783; cv=none; d=google.com; s=arc-20160816; b=LJRsQtlohlkLZ5XTCearObacJ9LgnXClNzXhty4ews8PqW3Z1ZRHy0VW7Zl5aJBefj bDVKqXsLC0UzI7faz4Kep1rqQoRMz+buxNzK8kQAXWOjbJbca153SXHXBV3n5o0MOium CME06sntOCuk4G6Cm+FgYJ6xNsO0j8cE3cSI5iOFdBddS5Cg1+jZNcCWLyLn0kZ8hYtO vjIoQbwLrWpkVtrY+tY2FW8fUZqd0yNsDS4MRodV+NcgBSh7rFDMc6OZmCoOyKUobtFe 7bzjsNz/eRUIS1n3dT4nOFPCW6BMM8CXf4ZlgOhGh3ZTkVPiqnmtIbXax0jCk5FICQk6 d46w== 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=XAl6XJa7v7zRVmurY/nnHZbyJd3mGzJWGQ3EJEmXFD8=; b=YWSbjI7uihf3ynQ57/cpG43g5UmDTZw46UaDiQe/cu/vIETYBmHuIb9kz37F1bV5Da K/Aqfuyh3WBD7VX3tWdUUgAIB222+DtDX+g53yP3ZCRji+f97A3PrpKFtShBBUAGOKY1 sl5uI+biFwxrqUe0C8cmsg6LJJPJ28yV/PQcywsf+3HTk/I/s0LwpqKO5fEWQKT/pzDE 7Hu8QmQbow82XtOQIXigWDHOegq3BwGTrxLdy5EFS8z8avd//6IYIqU7Is7Sz/HjJtcN yfBPE4mWN8eMGTp72L0NaghC+vWsJgyaCrADSVsEJAxdQLD8m0Nua2ivAFdAUmUTIb/i 0GLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IMNlSVn1; 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 s24si6146757qta.136.2018.11.14.11.29.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:29:43 -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=IMNlSVn1; 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]:33847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0r8-0000js-TC for patch@linaro.org; Wed, 14 Nov 2018 14:29:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qw-0000jW-Ho for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN0qs-0004rC-94 for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qs-0004qY-3Y for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:26 -0500 Received: by mail-wm1-x342.google.com with SMTP id f10-v6so16530128wme.3 for ; Wed, 14 Nov 2018 11:29:25 -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=6KVR067qvb5Booq3gXsoyOTOo5QFqsFGhLnB6NaK+xM=; b=IMNlSVn1mPcHhs1EB5jiZEJwXxUs0n91snogCNbU1fOA3FWuJI0ULt13mQHMnlL6l2 duYyC+3oit65FSfcUUuAU7R3MsVkT9WFAhalDkeoOiB7x+dnoJjCVEmiCbbHZLhO8z1F +iCJk0zQ0Qsviy97++z82HNqJI+8dSHmcep4A= 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=6KVR067qvb5Booq3gXsoyOTOo5QFqsFGhLnB6NaK+xM=; b=S2mJidVYvx9DzCQoTZgVjlGD+kOsna4G6K0wwdLsw3wcVEZ4bls4JQFmGgCYLCm4tu PbYqtO+pHnWsJSgjNR1RVHsZDaGKK15sj+BMORGp9qYW2jtEOww+LwHWU7QZHLRZCC+G PohKpRK18BX/pMI9YvEGLCHdBjryz/HcaHwFldoTBH6Thz9ktHfkq9K87Sbr6I1BNmMa tPQvapewYpXOLY02AUHZvszGdPP4LKeq/9BQifp6+zRJF1AaWRZjL9SKZvKJx7G7TJ74 68BLep3bt0FYytkwS5Fy1pBUPqvB8jmTOw0dYKGYO/OkiQ5wKIYPt4WVs3oAvChDvAgF mgYA== X-Gm-Message-State: AGRZ1gKLaF+PQzwluKWhdTOVrJpB6axNkCkPxY2rJ+3uWwFYO1wW+o2g 8BiKaGIeRRa+DuSPbYAOuYkNOpCQCCqSiA== X-Received: by 2002:a1c:9855:: with SMTP id a82mr1686254wme.20.1542223764366; Wed, 14 Nov 2018 11:29:24 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:23 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 2/5] file.h: add device tree file type Date: Wed, 14 Nov 2018 19:29:16 +0000 Message-Id: <20181114192919.24655-3-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::342 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 api change of grub_file_open for adding verifiers did not include a type for device tree blobs. Add GRUB_FILE_TYPE_DEVICE_TREE_IMAGE to the grub_file_type enum. Signed-off-by: Leif Lindholm --- include/grub/file.h | 2 ++ 1 file changed, 2 insertions(+) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/include/grub/file.h b/include/grub/file.h index 19dda67f6..9aae46355 100644 --- a/include/grub/file.h +++ b/include/grub/file.h @@ -69,6 +69,8 @@ enum grub_file_type GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE, + GRUB_FILE_TYPE_DEVICE_TREE_IMAGE, + /* File holding signature. */ GRUB_FILE_TYPE_SIGNATURE, /* File holding public key to verify signature once. */ From patchwork Wed Nov 14 19:29:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151113 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6086020ljp; Wed, 14 Nov 2018 11:29:46 -0800 (PST) X-Google-Smtp-Source: AJdET5f1ZeTUlhtQKG03oAy03o5UPjzCU6ZE+F5UZ21rb7nP8PLthfdH56N0i7j+KfwJ0tLUY1Dj X-Received: by 2002:a0c:8264:: with SMTP id h91mr3265400qva.116.1542223786084; Wed, 14 Nov 2018 11:29:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223786; cv=none; d=google.com; s=arc-20160816; b=nvSmnNKEMf0FcxlWA4wWdn+KVkaO02FcPLlUrPlcUR2NDtnusxkx4q8YmfrVt+SP5F GmVxGSQGJjbUSgzcIYAjJ53pzGhOlUz9kwOHgREhtzsCivuHdvkZ6fFRUAIutMulOJJV n6Ke56uABOuRwj2yeqxJMAtNpWgPR0bL5OhRXPpOh0Ak3IWVZK0b28zIzg/EUtWe/SMS 9498alVU5moVG0MH5Vvkl9TwHtupwb+RzCuqcW3RmJN9AzGW9bnH15mzEfpQMClhLp4I sJNppTVSSePmwSEVnM6FhbjgwZHyv5CyPghVxNtkl7NUJv6DsS0A58chYZ2288nEQz16 geJg== 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=w4DJ7teM9SpqZBp/5ll/bUgt0fskWTPbmq5Sp5T1MJo=; b=PphokZ98Y0fEln4vHZufp2eYNIRr+4SX6/KWW+RjbfqqPMsoQR58YYFhIRgx9x6W2F 91BBSEjGL65cMwZKanGSGrTh6PTmH/5vGnSIYVggcTjS2ZUjWfk+vTPjxg87r1KfQSMO 449HFNzk9qU3KvakEecyTWGxYGHmMs34uCpIL7+jxWKUX8uN7DlgZ4TK6l3DRo9B/pU9 7B/rIvsb7Ygq/2IqjjAoTg7/8I9Be06m/AiWBlmtX3SEidQM/XEzs4VRBm3EXfaru+mq swdyfE11BJ6cckaNhqZWBKQ96RKIImZFrrL424tE3uWp5kHRlVwn3OaQ5+KWyqdnBy8F nRMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NNC3MIC4; 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 4si693879qtw.283.2018.11.14.11.29.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:29:46 -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=NNC3MIC4; 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]:33848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0rB-0000kj-Bh for patch@linaro.org; Wed, 14 Nov 2018 14:29:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qx-0000jd-4R for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN0qw-0004t2-2E for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qu-0004rX-5v for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:29 -0500 Received: by mail-wm1-x342.google.com with SMTP id w7-v6so16560078wmc.1 for ; Wed, 14 Nov 2018 11:29:26 -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=AhOBDkzr+kKrHwpbikobvBmHmhSF7Xc/JeJYP1+vQkU=; b=NNC3MIC4UdIk/FP1P9ma7Qv2ez6Biqo6eBylQwnaSPb+1FzKLYXDuE1HscaBvoRnEV VLkjqYseFD4ftzly+nbipcwYI3MEiwxBEYXrQKNg4YI9YEuwqFvYynCH0k6i22O0IIbm E5vJmhEsjk8CiuQClew0Vz9fZuqTghtWXLujk= 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=AhOBDkzr+kKrHwpbikobvBmHmhSF7Xc/JeJYP1+vQkU=; b=g+tERaoyv2ATerlNCZ4CbWIpNuR5rN4PQhtcLaJrxlXdFg70wni1CdE25uB4jPiqBR UxhApu1DixBgGXfTT/KNGzj9Hin1apNldCKrM0QpMG6IB1T8XhtPRIPzvc3aAUGn9rpj WL8vS6FSRuliz1AVXDRjEdrARQ+xyuZ23Yn9Lls80D7AHrL7vTJln72lVy+3ryj48/nT Su3UXQctQVchfe3fk71sQLGzcNGrr3fdYfoKIX2CPCJywAG4Bm/bNWAhjBMzDEGqpNfV t23Enp1iH1ct72FVdM+jLgc6kPMzv2o0pxDIZpKebTU7z6Ti81tiSU6F5SgGk4YZZhlb ZAfQ== X-Gm-Message-State: AGRZ1gLTzSAsDfcE4TmnPvUBTVkqAjInX3Qh+/iw5w+VrAtP1GggRgWI rmjoRGFF8XJlW5uVPGGjt5Y/I6qHQy1vYQ== X-Received: by 2002:a7b:ca53:: with SMTP id m19-v6mr2940371wml.47.1542223765737; Wed, 14 Nov 2018 11:29:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:24 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 3/5] loader/efi/fdt.c: fixup grub_file_open call Date: Wed, 14 Nov 2018 19:29:17 +0000 Message-Id: <20181114192919.24655-4-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::342 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 api of grub_file_open, but did not fix up all users. Add the file type GRUB_FILE_TYPE_DEVICE_TREE_IMAGE to the "devicetree" command handler call. Signed-off-by: Leif Lindholm --- grub-core/loader/efi/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/efi/fdt.c b/grub-core/loader/efi/fdt.c index a4c6e8036..a18ca8ccb 100644 --- a/grub-core/loader/efi/fdt.c +++ b/grub-core/loader/efi/fdt.c @@ -123,7 +123,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), return GRUB_ERR_NONE; } - dtb = grub_file_open (argv[0]); + dtb = grub_file_open (argv[0], GRUB_FILE_TYPE_DEVICE_TREE_IMAGE); if (!dtb) goto out; From patchwork Wed Nov 14 19:29:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 151116 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6087089ljp; Wed, 14 Nov 2018 11:30:56 -0800 (PST) X-Google-Smtp-Source: AJdET5d+py3KPt314+y6bTgBDW7cdn9Fy/xNiFk75Z12KFWaHeKea9tiqrFId/qK0K9W48ena0Xj X-Received: by 2002:a37:a9cf:: with SMTP id s198mr2898229qke.274.1542223856161; Wed, 14 Nov 2018 11:30:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223856; cv=none; d=google.com; s=arc-20160816; b=XvV2kvkmPr0KmvJHqyKi8EffSlZISlBbGcWu3bwC9CN0CzqugjfvTe1DxwU9L00L4C nAkKFeNPW3tGvaM2FAOHH3LWqEZoyk26fpoxpIapxZL+idNWgf5ei68lS5rYmMsErEfT Jyo5jSuX5a3ZYf+5lYYpojRUCZw7ZTwcldp9AKTuBWkDiKsBVwYoUvzPbgyBFO7B29AP zogdEYOMsTEO/MqbfLmHtTSPYuFQ6t1fb4q4504ghudSoGSZTe8xJrOvOXk0b6G03dWv aya/ac/v5wSO1S/zS79Ube5TBNLlrci4wbtwEyHS/CFAAgrj2W/94On+EGGaHaj4pAE+ 9cew== 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=fFM+IeXusYVii1Gs6t8w1OQMIk7qMQOgXyWWiTYlxeA=; b=UcelxwDGDCUq+ztt/ZnTnz4yG+bG6u+JeJGcRHAcbpxf1E8r1vf/GOvZWOljribXI5 KlcwdUskD1Bo7JIgX5w25YJxdOw3k+8381VgerH69sI+GOMaGaGVdEUTJ37tiHOR6diK I2+q9UgqzOktoBkVrf6wwJhQPJhLKWsQnhGYAaYjgbNF9hB3frUmUaUrY198QUMNMhOT 3Zag1oP4yRk2tB6qiPNbewAd6+5cXoHZ0V/YcK8+4crsw9gNZAVB3CejTxHr7Q4EL2o+ CzS89nycez8Mk5hnIYJWa7FTUgZO/9OVF8Z9O5/MyA70JTQQWLQalu2us+7idPYcAyh8 fDgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ejT082T+; 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 x189-v6si1818881qkc.167.2018.11.14.11.30.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Nov 2018 11:30:56 -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=ejT082T+; 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]:33859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0sJ-0001fQ-Ld for patch@linaro.org; Wed, 14 Nov 2018 14:30:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN0qx-0000jm-Jd 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-0004tZ-Ii for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:31 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN0qw-0004rw-0m for grub-devel@gnu.org; Wed, 14 Nov 2018 14:29:30 -0500 Received: by mail-wr1-x444.google.com with SMTP id r10so1053120wrs.10 for ; Wed, 14 Nov 2018 11:29:28 -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=a/mEJg9wqh1E6lQ7qxfFDyyCI5laFJUVbEtQyYHaFWA=; b=ejT082T+IZxyhJ8nV+p6uNghKgnc0wZMDy7k21XuN8v2oD2NDP88MN2Pjryh/6XxcX pKJhP9yU66ehDmkzUXsFMTa0dI8cA6X8NTKHTbxDqRmegVAfP9FwpqERC8RGTrl6LU9v vxqZtE5rSiR0op3I6ulNcxgMBkZqF1/Ug8XAY= 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=a/mEJg9wqh1E6lQ7qxfFDyyCI5laFJUVbEtQyYHaFWA=; b=nWwlkCmAe9LxXN+7PJ1j+JXJuz3AJOTGqjUHay+NSUhCk8IB5o7rJlav2mY/DjlLua /FGtweaUAN8L04K9oGu9V6y+m151mqj6YT3oFKWMoKhb5pccFpyh5NT3RtaVFTOM6xLa ZGt4Vol9uTb71aP7ZF201oalw3CfQbsF2jkSXQRFrPpMDoAOfvPjwAwXS5A2MpqYJSDb unz+Wgh465WWc0F828Qj0ECLsjn/uzr0EqD4mSVtpxHdoB5oAl/Ez1YFGrm5yL92R1if gAYkB+r7fiXH04XIekTbcKk8x1NV/Azit99QxEespRrb8ycHU5Q0wiOZTTBAUY8wL1Xz sFow== X-Gm-Message-State: AGRZ1gJC/nlVvT/pxmmOqRz9lZZyYOrMi8tqOQ0vpDQVLcd84+L3C/le 36Eg+k2BOhegV4dftT77GBJMgdxPExSGUQ== X-Received: by 2002:a5d:6a8d:: with SMTP id s13-v6mr3212227wru.179.1542223767132; Wed, 14 Nov 2018 11:29:27 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:29:25 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 4/5] arm64/efi: fix breakage caused by verifiers Date: Wed, 14 Nov 2018 19:29:18 +0000 Message-Id: <20181114192919.24655-5-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::444 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" - add variable "err" (used but not defined) - add GRUB_FILE_TYPE_LINUX_KERNEL to grub_file_open call Signed-off-by: Leif Lindholm --- grub-core/loader/arm64/linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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/arm64/linux.c b/grub-core/loader/arm64/linux.c index b8315b53f..c37295c0b 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -288,6 +288,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), { grub_file_t file = 0; struct linux_armxx_kernel_header lh; + grub_err_t err; grub_dl_ref (my_mod); @@ -297,7 +298,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; 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;