From patchwork Thu Feb 8 02:07:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grandbois, Brett" X-Patchwork-Id: 870708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zcM651vF9z9rxj for ; Thu, 8 Feb 2018 13:07:41 +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="fQUXjpk5"; 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 3zcM645RwCzF16l for ; Thu, 8 Feb 2018 13:07:40 +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="fQUXjpk5"; 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=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="fQUXjpk5"; 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 3zcM5x2v1wzF160 for ; Thu, 8 Feb 2018 13:07:31 +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=VvL351jSlvOBumyLef6rfKjw72SKWJf15RybEntevQ4=; b=fQUXjpk56x6MvzE9Bnjzcc7UlvXcQjoaTY+Pt3/WSZ+HDozHlSVAsHHSIpETQFtGSTE4tGy4IkvKK1qnl64PGo/rpYB9vxQmSbgPF6TvhCo2zXsV48l5+rWDgkA0D414V/8mqQzVHTz+75hdGT/Py5KVJp/7MMaR5eJgoXoV+Q8= 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:26 +0000 From: Brett Grandbois To: petitboot@lists.ozlabs.org Subject: [PATCH 0/7] Resubmit: Yocto and musl libc fixes, syslinux parser support Date: Thu, 8 Feb 2018 12:07:05 +1000 Message-Id: <1518055632-11462-1-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 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: 21eff424-0eae-4800-7c3c-08d56e98b35e 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:lBRRfOTsNWaYn6L4dAEXOhOEBC5Pm8oM42djFV9FDnXbgpYsCTSvY7O2f0Feu4XqQ8reOUrBUuXgaTSttfTixUMyiJWTPZ/fhUR4BaIVXhAF/hn0qjMzBfb26Ib1FLoTczVRhRXnGSdEQQBqzKaCUfPKAT+KqWHXtnzHZHsLLqyQ8NOL40byStuMcdB6jU18Nlvxqwsrjezh0cnkNBmJnOp2w53ye6ftbk9Pmok/LEjXxRvW0LUzw2crFEo51soK; 25:ZKu4Y5yzoQrhZr9nXSQrWy3beVkSLDP84B4aPnT2UL7Z6oVoUNALnY7XrXcSzkFjHssKCuzRMWGDbPXUomnwJepQG1ewvyn/0aM3FvYzkghdklAabXU40VjYYgMWvQWIM16ycOiZWigN2tXlX4DbCKvdnd/otVgcGpyVq3pKN3uAT9MGDnnMIz3n+AkLu6sXmawywwwSj7kAVWYfKrp2WUGYutJV8883zdBIVmQkVmqST3bVHebT/jFHeaWrW5uca5OTzQ9vJnECVIrr5QiVzDOWtsAm74zOWrx6+VKW0qbVcj7vHF25mF4jrnCvFmfZ2Quxps0+15AYjPINgTjpMg==; 31:drN67Wn89hB58YasqiKzYnJRvpVdRMogcbQfx9OVmZZf+XSVYuCGQCor7vbfynOQhUWyieguACpYziqybOuESPFS3JdXa55E0WdmRzWzEbeK5ldxp1xH/K2cHfOeM16Ox+IhJq1/V18e5oijRG6s5Y5cUVIM7mPfEai8wc2RgAaHuPXcDyxjqdj6BXATQuoby3YvygjyoKAPXR5u6p8JSeTOp+nIslPJjcxsaYCrATk= X-MS-TrafficTypeDiagnostic: SN6PR1501MB2061: X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 20:eEjwQdCOi39vhHzRt8SghbeZAX8qs51m+v21E7aIKd8J7mmZruQiMHOjH3cMZm4bml0mzSKWEvvXXUXnI7sgwdSxvykExmS1/lGLwJDJowS85WfYPHVMPF7POqK4Bqz9mC5UIQlVAsuMhBk6rRIbL2zODa6l6NUwEgTSA3z9Hmw=; 4:UuYFMcNR02HmZdbI6AFnc0hQEgSdtpFYPsiLrlNMcDmaCmY3cPCQek7BtdbgkOY3At3q/jUuHZ7bhypht0uFroMfTlnv2iTzT2JAnf2RivFSI/lbwCNM92gGfJZqp/03uC9x7RPVia4f1KqNKYkvEycnFvs+3Vh9t0y/ShRsshUJGwBx/N69lmCdKblJSkQuDT4EtNXnRbbfCYNzJBX+aVyFeo1Wn8kwiOVgZqedJMT7goJy1xSO4vVJjb5BAe08Nl5XiSC9s81CDsz3xxVx+UNcehYBq72DqqDMA9m3QvaqgxjJjKdPQr+dPHCdulXy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); 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)(2361001)(7736002)(16799955002)(478600001)(50466002)(6916009)(50226002)(55016002)(6666003)(2906002)(21086003)(97736004)(6306002)(6116002)(48376002)(3846002)(69596002)(36756003)(15188155005)(106356001)(68736007)(53936002)(16526019)(966005)(26005)(86362001)(33026002)(105586002)(386003)(25786009)(316002)(186003)(16586007)(66066001)(81156014)(8676002)(47776003)(8936002)(7696005)(52116002)(305945005)(51416003)(81166006)(347745004)(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:ffLkLJmhJChiR7iFkfKpR4hGTZ+i8gsbJMrieTk?= eXN8YFZ/OEjHXWIOMtFyAO1rWGtWZV/czXimPPk/1Xr5KhmV9AI1ehNrQQ3w6gV/EhTQgp35JoQDwyHRchFzXBk9XBNhtIVvCsiUQgHRqPD55bjURt+eJ/QtT1kKQoaTb7DvHdOLmeIKBwN8kD22dQ55AdCgstm3G4VN5gS3Om51HOxVZDDEcc/ZqFeuROWfUeMUtgfwKVl7TjllbuPQu9N24ag/uBQ6+HGTknAxced7BFS5E02qhkQDCLNI81Zk7/z2edBu2rp7U28+5ei5t/DYmQaZ6Gent6GKJ/hDjHi9DKVygYNj9/7OD7Se8eGAd+b7jOLMx9e/gqI61+KOzpEjpnYUGnWrIBEYxiAAEmYpv4mIcD3gKWYeggLD2KH3va/0PSuvoD+svkPGknyfhsUzzktx1eqaqmpN6w2qTnwsAXCcjeJMr95O4XX85dTAya65HKE5C45+nHhWYOWqBNUaBJWLamaD1nY0bP2nPH9gJfd8Bf0E+G8apueTBe0wlCoz1mgCzHj2vQAbS9vv988ry4mOLgDqxFY0NNI2uzFOAswRrhjUK5hK3uUX6rkL/JOLZ8rFeGo1k1cUta5Q5IKXjxQe4pKFd/su29glIwljrJ4Ln44dWkq1SGrKZ15hhoSnPwQu2SbQrfHuZn5vD6tpV3f6cn9KL5EuWjvN1hYJhkS5l6Zjq5F48ltmZgkjKnPx0dNjQcvT1xpOMZs8YdJbM+C7wcmyh9PC2AwOa0exG1L38KmcOVg7ReQ2CEBPOYBfo3F34FkhSqDB7mwTh84O7RBJTCm4C3Gl0fuM1XYfP9fRpWtx+MUGr1P40+Vbcw7Dn0HtL+0GC2Lg+5NuRuEZhNhKdtlps2IKmNTW3XgM6SDBCZ3u8OGFqaF6ZEXXPmiqJxpvCBhUcULRAiBeoiu48X98r/WJofU9QzOb5fZEjWv9KJ5zKYQ3FF8V/SWLzbeVp2bgBCl+jo93iOP2vrScVluHroKcc63tPcZIYgu3KCxKIVGv7Rs7cPIsQ1C3mEq3rpRe1MecHhTB+eX3MpuFA7AzGU+guakg8prfNc+236bXivFU7sOn2p4HslP2xsp38YvrNbawsD4Htcgc17x5kbFtOM/a6w4sC8Wuf3AwOQChmlXOnwredIdKXiv96uaDfhvWQt9DtPHofwgwxSsfhkoByjOoIvIHveZFkuQlMvw== X-Microsoft-Exchange-Diagnostics: 1; SN6PR1501MB2061; 6:x+B9tl/fggWG7gRAkZ91Mt6CZxQprbET9fILZg5FzGX2J4fDw/E8jz+PvocCQJQhuQHT6lMX4JkAemMU42s7NS6ssefAyGtWYQJ7feXo7QV1ihDOhrPCqmqUaHlMsVEgZcLjHPQIm2Zt6gm0ylIuC63KSxKA3+1mvSXWNo+bnSwM6o26vt4A9DtA+H/ASwg2IsNrSkR8Wh1EULhBJPPvhSRhMtfpJQq3H46aefB+ltsbRQ8XvEWmfd3AnfV87QFspSHowgMwUBnNp0rfkkFpvebS8aO5xk8X/S6wnRa/WaGTG+J9GA2Hb7fcrQzWjbJqza/+Sx5y8T6ehgjS0zPb0lzJVMgIckrRnH3CEzS2Ggw=; 5:/dqkU+E4o10cf5jla4zHcat+7rYs4B6JoZNsbvJq6NBmdScYzU1bptwu8QZoq3OQzV7B/nZN1VLCRwL52QzF9ckOn6PTSagwqffZly5AZ1JTG5Ho7H0In6hvBanUY2Zjp0XlpB7wmiatzZ8yDyz55O+xPTQJXscFVCRpqffRvSg=; 24:WoWpneRRfL9L53C8bGZXoYxgPoTQ9w2MBRf757ig1Tq/pRBAaW2BkdjInXUcTgJ3awAPGgX9sFpT6MrVZqKqWPYebLQyngLio6bOY9dFecw=; 7:sGCaXsQzgC4THHqLeaiaCm2DGuz35cBd0mTyaND+Du1Ei3VzFNPf8mxJujQArbV34V9+8VHOJ2fc8Z3wu0rg0GZmx62Xahc1iqy06t8rUk6RPIrDzY7+X2vGwXohTf0qH5dPZT1iFUxS2CgMQF0W9E37fwCexlRvG7jQdWxtBlpnEnbM62UhJXCwT88Yp8F6/liUdOnW6dGH/x7ShFcF3F56VhTgzsrOOahN/CsqDiKyvkpoMJEti6ltbJk7GPUf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2018 02:07:26.0722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21eff424-0eae-4800-7c3c-08d56e98b35e 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Hi Sam, Resubmitting this due to some STMP server issues we were having likely would have labeled the prior attempt as junk. Various minor fixes for building and running in a Yocto-based musl libc environment. Add parser support for SYSLINUX following the specifcation: http://www.syslinux.org/wiki/index.php?title=SYSLINUX#How_do_I_Configure_SYSLINUX.3F Brett Grandbois (7): discover/pb-discover: #include for musl libc ncurses/nc-cui: musl libc fixes ncurses/nc-cui: fix unreferenced assertion variable grub2/grub2-parser: accept no whitespace in grub menuentry grub2/grub2: add Yocto paths to default grub2 conf search paths test/parser: test no whitespace on grub menuentry syslinux: add syslinux parser support discover/Makefile.am | 3 +- discover/grub2/grub2-parser.y | 2 +- discover/grub2/grub2.c | 2 + discover/pb-discover.c | 1 + discover/syslinux-parser.c | 486 +++++++++++++++++++++++++++ test/parser/Makefile.am | 14 +- test/parser/data/syslinux-include-nest-1.cfg | 7 + test/parser/data/syslinux-include-nest-2.cfg | 6 + test/parser/data/syslinux-include-root.cfg | 18 + test/parser/test-grub2-single-yocto.c | 38 +++ test/parser/test-syslinux-explicit.c | 41 +++ test/parser/test-syslinux-global-append.c | 56 +++ test/parser/test-syslinux-nested-config.c | 41 +++ test/parser/test-syslinux-single-yocto.c | 36 ++ ui/ncurses/nc-cui.c | 6 +- 15 files changed, 751 insertions(+), 6 deletions(-) create mode 100644 discover/syslinux-parser.c create mode 100644 test/parser/data/syslinux-include-nest-1.cfg create mode 100644 test/parser/data/syslinux-include-nest-2.cfg create mode 100644 test/parser/data/syslinux-include-root.cfg create mode 100644 test/parser/test-grub2-single-yocto.c create mode 100644 test/parser/test-syslinux-explicit.c create mode 100644 test/parser/test-syslinux-global-append.c create mode 100644 test/parser/test-syslinux-nested-config.c create mode 100644 test/parser/test-syslinux-single-yocto.c