Message ID | 1518055632-11462-5-git-send-email-brett.grandbois@opengear.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zcM6W0ZyKz9rxj for <incoming@patchwork.ozlabs.org>; Thu, 8 Feb 2018 13:08:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="KSnY8dlu"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zcM6V6SJtzF174 for <incoming@patchwork.ozlabs.org>; Thu, 8 Feb 2018 13:08:02 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="KSnY8dlu"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=opengear.com (client-ip=104.47.32.78; helo=nam01-sn1-obe.outbound.protection.outlook.com; envelope-from=brett.grandbois@opengear.com; receiver=<UNKNOWN>) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="KSnY8dlu"; dkim-atps=neutral Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0078.outbound.protection.outlook.com [104.47.32.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zcM611zNHzF160 for <petitboot@lists.ozlabs.org>; Thu, 8 Feb 2018 13:07:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=opengear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=SUTttzAZboWz+onVp+yVQKClKUVXlKc0zxa87ieBniY=; b=KSnY8dluXlxzAL/nWhKEXh56A99HnIuz2aTTtoII7hKUk19Xz04UrIvR4dmTa/qvk1Uw0vpCfSh5N56invlOaWykM0l7Y5uQyG4IZU5TdRpQBtNjTcwR7bkPNnJ/xf1C1df5ncKzTXnj7Bz6dcIjw0CyKBJl6yABEVFVQ7yGrGU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brett.grandbois@opengear.com; Received: from opengear.com (59.167.150.161) by SN6PR1501MB2061.namprd15.prod.outlook.com (2603:10b6:805:e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Thu, 8 Feb 2018 02:07:31 +0000 From: Brett Grandbois <brett.grandbois@opengear.com> To: petitboot@lists.ozlabs.org Subject: [PATCH 4/7] grub2/grub2-parser: accept no whitespace in grub menuentry Date: Thu, 8 Feb 2018 12:07:09 +1000 Message-Id: <1518055632-11462-5-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518055632-11462-1-git-send-email-brett.grandbois@opengear.com> References: <1518055632-11462-1-git-send-email-brett.grandbois@opengear.com> MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: SYXPR01CA0079.ausprd01.prod.outlook.com (2603:10c6:0:2e::12) To SN6PR1501MB2061.namprd15.prod.outlook.com (2603:10b6:805:e::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f50904f-ed88-4c83-e4c8-08d56e98b64f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SN6PR1501MB2061; X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 3:iuPUOrRWY9NKZ/0gLiu9TotksmceNPjl7ThxibRnaBDhO55bG6PCmBon5pd4Kq3pxYSnkzHqvOaZYlbQL7gk9EIIeSp6CJ2IFzRBbTYBo/ywcCmHNwJ9IM/2XdvxpqPFFg+cWmsgt0qxwt0HpqRyK6Pw+z8NikK3ixYeUqzIxDpWxurWYoK5BSEii3XoPGG0SlhPx+4GLE4HPaPXxouU3nq5cVaGSHZnVu5heH+ncs/nV/ZAA1umcdcBvMBD+gFB; 25:LhQTHCsK9WvPm7jKV3EARNerA8jEc9lxRbhzP71ycwdg1RXZPLwViKHD+iMxRrUhvv7oabeFp9AHry07bLGPhbHtiMmNK0PecRVZ0sohONNioD9lcI5YvnpeopXiuFhq2KQZbTkcXZkb/EkZVKcdvxuHFGyWO2lPlBovfPc4hnChMuo6GlGX2hxX2QNtGG5zcCuUJSlHQnoAfzAIivff0qF665aLvHwAEjhVvb0/E2YKrQ27OYLUFTJqEzMrEGV5Q3AE8q6c+mKHk74g+wGwtTRoUGDR4M6Is7ApZ4EiMAIELARihMSMIRevR4oCdHf4gYaH1tfk6rfVLmff5R8zLQ==; 31:a5j6FHYDxWZdM1EuSW0/AZ2HCi19w+YfYWsXKWdGz1VSipAaT/3Cpr3/lYK6c+2E+8qmwrpvx8oSTBycPpIcHsXVkrW4BMXEQWhRgIuBPSEaHygLrsOydBG2VqH5hLSWM2laQXxh8yo4t71MxGpuG4iEldVEKT1sZYNY/8DaZMAaHVZAq8Y9P1ikcCBc0F4GRJ7L19KB+G4bj6S2RGwuCtrCUSWx38tvUA+NDpRBdrw= X-MS-TrafficTypeDiagnostic: SN6PR1501MB2061: X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 20:PbVVk3zmOXMnENAzcj9ffbo9u4PCmuhQz6IODER1BoZCo8QyapHX70gz3be79kc2gGKMkeRfg/qx1y/bHDzFZE5756tFu6lhDKsdczE7anUfFgCSD0vCJ5ZRL2NWClrTk5olBzzY7pU+v4UryhpShKPkHxnuKmEjPofceBL1sDY=; 4:6EtKJJuc429lA/F7QQLN3LZ3dy4MBWwTRxpaK/4HeVCUIFI6NeY88cb2wxFmplaWxqmF2sBW8l9LevsIxsMtl3Q7BLG9J/RceVSA5A1yV9nbbRTpDJTVNh+dGGqC5ijEt/m3Y7j9lD9yq88wSDOrYTPZstBlCErX1UJ4ylKVc2FcUblNg4lZE9NugO9LorEu/2aE6wC4YCd43XtrMY9VBzDo3FYtJEHhIl3zUVzFmbLFRz+xRzs26ZgMpFr5u4Jzxts4KRAOZqyBg53XYlkq9A== X-Microsoft-Antispam-PRVS: <SN6PR1501MB20615F8827CEC7A68B7E355B82F30@SN6PR1501MB2061.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231101)(2400082)(944501161)(10201501046)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:SN6PR1501MB2061; BCL:0; PCL:0; RULEID:; SRVR:SN6PR1501MB2061; X-Forefront-PRVS: 0577AD41D6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39380400002)(376002)(396003)(39840400004)(199004)(189003)(2351001)(76176011)(2361001)(7736002)(478600001)(50466002)(6916009)(2950100002)(50226002)(55016002)(6666003)(2906002)(21086003)(97736004)(6116002)(48376002)(3846002)(69596002)(36756003)(106356001)(68736007)(53936002)(16526019)(26005)(86362001)(33026002)(575784001)(105586002)(386003)(25786009)(316002)(186003)(16586007)(66066001)(81156014)(8676002)(47776003)(8936002)(7696005)(52116002)(59450400001)(305945005)(51416003)(81166006)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR1501MB2061; H:opengear.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: opengear.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR1501MB2061; 23:xvIbKUZ6D1oZidULkfBWdcDGQFkxtd2GifRfpZg?= +5So5FavQW2/+zsqsVOC4z4ba1Dktifkgd46gUbp1oo2N0JX2f9gzjbK9Qxm9CT3zht9Jl9rMCbPIH7nj1A0qwgCQ8jbPI28fZY6L5z6pRJYzipEHBjm0PBURASaQ9BzkIjd7SuisBC6G+3Fa8wEN3EYq5iiFPZVY4tF4yDC+Q6tl3t/L/q6A2dhdLiRyQrNaaWW14o5vNVMeHe5TK64OBAz+MFD62HwM2MPG219+Yr8E+BIrpFHpXII/CjOdLxIYk5DJiluHc/KUxfRCeXrAjEdJlmbCCLRQIFeV4Hlxg3tcNiTGDaIffXY7+zy+fXneeEHyjFPFVBOcJPRde+HFELZJMOUUDHxq/3znWortSvbgtdofjmHboiInFY+CYVHCXx8HzyullLRrDBUYkoD44Ob2+4oaNiE9k3CgtLBrwzWyKYkculYGKw8PmK6iXUnRR153HdZvqXUN3d5t9m4J2pH3keCrLT/p4yN0L1VIXZ2pb/YHlweVyJF/nOct9glVpBu0vkxPSum+z3hAqdyfaQXWIhs6OEObwonG2zy9u4b1fdaiwgXqaduU4Lsz2ZoOo6J+bwGlqk3TSZVMv3So5p1la3BJnNcm2jgdRKCppJaouuAOWEX3fYtYup4uSMSicLnazv2YWoXNFMKWsc26DlQ7E+6w50NR2yoSNVjSu9Qsv4LoQ7p9FPRLgZGDmVpLZj/JdvWVS8OUCl1d+r+a0StcHd6tJahiPWsOVCaWzXD025Kr31gXzcAgk+fajn8yzpFoKmeNst/2r3TyMe5cShoePz7ijjpt6LlpVd3OArI4XYhFYAzL3sNdtemsYsCicGyiJS8vFdjlUuItACPp4V80Df7EC+a9VnIQSW6IFbYvAAndy0dYv5qNXK9DjEKpFZLQDwlyDa3LrVn8korVI+lSlrHdxRL+6L8x6b6dwSTrNL/SaEFUyEfBJ9jmcCMRo2qb+/w1D8RtncuQsJPP4qf3e0f/zHG9hA+PPjgaxbcg0bEK57q3LGWMVtnQlELWz/AhTq1sdGLI5Z7zZlmr1+SZfY3qqUoZJ5IXQ5V3+tUKfILZ4yQfDq3KeAEf63qt59OTgUyC9bSdWlrAdXOuhMY5BFVlCLgL/FTbLZ/gzFG2VM6zmAINMQgztOc9YMMZN8WdjOhy0jvNeVMvDx74TjsWfvU9NjabY6/j69/I1aCK1g== X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 6:sLnAzvWbiNmq14eFdqyotBOgA++JqXaqFB2+3ZvBFk3z73eLblT5oyBRRSA3j0VHVfxHbgWG3Hoqlg0JnS8lZHuDRBltYwwgkStfyXQ4E8zMZIX2JGkPpewYmResqJo1aJwSs1UGMeTWkbu3NfMWY+IAVwvEfVXqqboRUI/qxCDIrsOOP7Cq0JXRLXaXgEsoTA1w86iHyQCysB9K6lbDoBOb7/2AOAiCtVN3wyY5czKEQ7v/X5YgmhdKAgZtHXT24BY69JPDR8MXjwpq54e0zTozubI4aRfo4VldhnnrUvYwRpbdXOMdy+8rU2fiqmBISO+2hFQI3tsDGjJWJx0hHroGXTu4/kiojZijbYcQ6sg=; 5:Rc/CX30TderNr7s4sF5BvP7aMen5dkiDaxcd4D0IbkVGlYiWGT/Uh8ooYtscjlr1vP+/Enq/y63hR5k3frx85l14z4haCN2LkIk6j8IUw/zfQrD9UfGz+8W5A4UlsPtX6UdiG99ph/aLIOrvSTO5+uq/jHLpoLABUhQ2P2n/dA4=; 24:C7UWwp9fDOt2N9Bub2vA4XkKIvd7IzemX8TBR5apbTpQJ3a3fr/khrLzuFu4A99glaXGhugcLqjMTZFWJkjiDKBneSzMwf81i1H1tmiqLcs=; 7:uj7KzYdvbJXxG/usGF8apU/LAPtzU32dIvltKpFRhdKba4Qvmxw0Idq3QyTuFisyPHDWoAw1CSHy4gvvhBJaRLbVKcNyMLL+qeTgJvSz3vIkBWKklckJbCLDl7HEVo/y6OQZ+dhCHrBR2uLKSLh9dqduegtHliLRlMWm7km2aRJYYqdQjn0Pr5j+gj7lp+g0mamFpoNQjvwheHEiauzO/i3CBXyPbGTXaZC1JMJRAtFCuhYaqDXLtvepCnOeyzjV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2018 02:07:31.0098 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f50904f-ed88-4c83-e4c8-08d56e98b64f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR1501MB2061 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Petitboot bootloader development <petitboot.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/petitboot>, <mailto:petitboot-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/petitboot/> List-Post: <mailto:petitboot@lists.ozlabs.org> List-Help: <mailto:petitboot-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/petitboot>, <mailto:petitboot-request@lists.ozlabs.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" <petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
Series |
Resubmit: Yocto and musl libc fixes, syslinux parser support
|
expand
|
diff --git a/discover/grub2/grub2-parser.y b/discover/grub2/grub2-parser.y index 598f0fe..527a61c 100644 --- a/discover/grub2/grub2-parser.y +++ b/discover/grub2/grub2-parser.y @@ -122,7 +122,7 @@ statement: { | "function" word delim '{' statements '}' { $$ = create_statement_function(parser, $2, $5); } - | "menuentry" words delim + | "menuentry" words delim0 '{' statements '}' { $$ = create_statement_menuentry(parser, $2, $5); }
The Yocto wic grub support will generate a grub.cfg with no whitespace between the ending quote of the menuentry label and the opening bracket. There doesn't seem to be anything in the specification that this is illegal so accept it here. Signed-off-by: Brett Grandbois <brett.grandbois@opengear.com> --- discover/grub2/grub2-parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)