From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Jan 2022 15:08:51 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nDRvn-00G5pu-Pc for lore@lore.pengutronix.de; Fri, 28 Jan 2022 15:08:51 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nDRvm-00032P-Sj; Fri, 28 Jan 2022 15:08:50 +0100 Received: from mail-db5eur01on0603.outbound.protection.outlook.com ([2a01:111:f400:fe02::603] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDRvY-00032G-BP for ptxdist@pengutronix.de; Fri, 28 Jan 2022 15:08:38 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dZF7/KCIGfcIc123fxl5+2nhuBkLDpOPJ/cl2PXBeJjSc2zvNsPjsFBmmEBF8unJxLuqv2MVGo8GhUZ8JEii4RJGbSFsz2gouEUa6xJOFkajPKWzFc0mBVnuLtxCEYkxFXXV3b8ZO5PPgG7putwS0q0JyoeB0HuMr2PozX0pPAzzASGZ66rcWw+D0xeC1ryEhkXPbjMejyzYQDTR7ECdtVthhuc5clg9j7f2dGwhchsMkHuzT0ZYFz+hfICjzxiWFf7B8CKKWTs5qkBPbLtNThmk1OhwHfmZNYmqMhCdqyyNGY177RFjT9XwOFSoUSIr97PRuQhZmnyWLh1+TkQt3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KVUnxjGFsFhh9T8ZSuoyooEsCREnsgfwqhq0+vO4TLw=; b=c+i5gZEbON07/6n1OG1yVjhjqspWkiag0VUVZrZsfk981LNsHN7qe7+CKpNg6vYjG89rVY8/g5GM0znzDUVe1ilZ+Eu2gZEhffpY1npBy9Y791P/glOVSwkKaev36Fi22idXfam6yblo2BB1xLuQA7J0gAInyIKo68KdFYtNhIpMRvqkw5RK6xvPUsrc/G6a/nY8Us6HwzfAY8gJSkrPo9xQeXiRUN8Y8ppbios58kHcpCIkQp34kaBkaKaKmiGWzgr6Er35Zj+hX+qzdyP9d+gw+vj1JLYuPXzXqauXdhOvH39hSL9RubGjEUJn/1YKdes6fNjYRICSbvNwxA7t+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KVUnxjGFsFhh9T8ZSuoyooEsCREnsgfwqhq0+vO4TLw=; b=TMnfwI0k7I4cOXVSPfEWFYiRBkQR4lUlLnwnTcIfsi3X0nTgP0cD/FWnimYLS/9L/bMbHj0sasvrk/lYmauZGfRrQT25eFd8uwHDh54tH4Gg4qQV0TJiY4jbjKKUFa3EhMh2PR+F4L6q591C7caR3XwbgnnZKrUq3UdXYbx5TVE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DB9P251MB0235.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:2ce::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.11; Fri, 28 Jan 2022 14:08:33 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe%4]) with mapi id 15.20.4930.015; Fri, 28 Jan 2022 14:08:33 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Fri, 28 Jan 2022 15:08:26 +0100 Message-Id: <20220128140826.1937080-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: GV3P280CA0087.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::14) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af52179f-7c8d-4e00-7771-08d9e267ab33 X-MS-TrafficTypeDiagnostic: DB9P251MB0235:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XSRxwCtcPnMMSP8sO5P5BV1uVRCeLIXuRI/aR37d90aTaFEKd4CR6xH7IBWkfFW5hgFoRE8qo3+7mn//iF926GYAt5Gqt1Z9bMr97cdOqzbHVRA2rzLFXYeNZ45xJyxDwTFZyDobZZPkcgEfYy1eXyiiJU8sGbN4K2LFeP1diuATHC0drX37TA1xGlnfAfo8QVve+m5n4mbTdEROsSxAY7rPZEqJ/V+KfwYq7/oKKORfL2gtRhsMfFRcPCwxwKUDd06xy6jo8B8r3A1Shwa/yyrV6NRQybCZ+3KSY4CCsXKwqSPoe57tLuaxiSnJ+67ASjdAbl4arXpMJarjAZJQ29iT14rTLD+nTEo7gsklJCjHAujwc7ZqDnQ/aTuziGo9DXalNQAN2bdzFlzmczqZqQhiwmWGVPyXvLxcwZzFVYf/6iwKMETNF1Uz8UxkgO9EzJ1gJnOMsqjWPw/iUFxqsPwVN3BBuInw75Owul1sde9Nh/clT0g5Wel7zIcO43DkH+tHNe7B2Gq5D3n0CRU4rnhy7jEGvXKH3G0iklaOIJEHSF328DKKNwfvAKwkX4EzAhHKUzZRuQJaizL2ROg5ykkqhu87z52HINsrwnifnnMMD4yqvohp/0a2YFtcGVuhOvOcJ8RValxwY2HTfXJSuR82etS9Fl9/8OJWHNCRqZ+dFOLWeMYwCq1ftpKcJIwx2A05tfAUHtMCD2hpNuQ4A875X4WM2UK/Ep711ziL2lWw08LWLPa0ncOwYy1qS7yT6N+0VZMuMaxoV92/+bGc5/tBmdkzISgxHCGSsroRhD8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(376002)(136003)(39830400003)(346002)(396003)(366004)(66556008)(38350700002)(8676002)(38100700002)(966005)(6506007)(1076003)(2616005)(66476007)(6486002)(26005)(8936002)(6916009)(508600001)(52116002)(86362001)(36756003)(83380400001)(6512007)(316002)(66946007)(6666004)(5660300002)(2906002)(44832011)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1K8/sMqNcs/mlxVEmh8K8D76o2KztZ9T1JoAXYTLWB4qte8h74n6YroFoJfL?= =?us-ascii?Q?6XXbjEeyrfrBrDCprYX7dTnNCrIxjOLqSpdjc9PcpH0DmllmSGmPXaHHceDR?= =?us-ascii?Q?NNbttOlKSPaBLUnXngAGQsDemK+1novA0onLvul5U0SOoGlvgJGMeZAPonIz?= =?us-ascii?Q?ut1Pqpr6aOHiAcO1TYrwmCbBNt0JNhSh3UScmn9mKPMoLbohM56YlA8psRdX?= =?us-ascii?Q?6e7LoIMp1LW62R2j3oT1apuM9EBqFYGPq8f3yLy1PPPcjG/xm+mPwT7Lq43d?= =?us-ascii?Q?YkpQ384kcclklOXf3nMQbWQ+i4V3wSZ40+Ptf76wcq4evAi9xrfDXxHVOPRK?= =?us-ascii?Q?yTipdqEgTOl7bB1P/rHi73ksj9wwDlxRF25DucqTOQvaDllntHhmipXOnGT/?= =?us-ascii?Q?6eAPh4FXOLAY8rcFcnu+I8KjUmeINAHZJAegilff8D6XM5PeIsou4OA3K7QV?= =?us-ascii?Q?oi+wEnOjfI2gzE44v9+E3BaZwQDHBdRYPFfPj5qiLIa7L0elyB+2nTdnDOZT?= =?us-ascii?Q?FPhg5GezRA1S+266Ji5vIDnCXoaw7w9xzbGPDu12KB1tTxxuv8vWh829qM+T?= =?us-ascii?Q?ZNlfgIzNbQl+9sl7qOHuCHlyCqWh/txhLBf+Eb4S2J5zcTXCZl6Ei0Hxe3Fy?= =?us-ascii?Q?sxnxhrFOXxqQupqNZZbYSwlxZvWe5B2JcKlOUj0x5MnorE0eejGjMJ0JtlhF?= =?us-ascii?Q?cV7kB0IgELeiQeO1nW37pq6ZSXicbHwiLt0m1dVY2WPCS3byiAopXqqST9qI?= =?us-ascii?Q?ZvroChoiDFelKNt1Ckutf6eym8lcEJgUWyrK65JQcS3o7AaORW28GC5sje6U?= =?us-ascii?Q?3cKjWrSmjtzr35ouBmGzXu97Ls1YmmxwGAohNrfFq98ILpHq9DKDfUEXgTMp?= =?us-ascii?Q?vDy49xNpZaU+uuN3K7eNrde1JdZn4T7oeKMIkQiHBawzJHVgOYcgC7vYAE2u?= =?us-ascii?Q?Qu2JFh6LMt8sG0GKK2JTCdZO3meuOoFEdtrIbM3jOs/ECVQv8EHSWASx0X5K?= =?us-ascii?Q?YoOnxOAaGu4CCYL4fLjU4yPSAtmfaEkpqyQA+Uxr1DBQOrRGoyeWsm6MpC80?= =?us-ascii?Q?7i0PIJm/E668gunxudnmiTWPlaccknxvnIvpx/If8cCSmlnic/B5btB2ojCA?= =?us-ascii?Q?XsKEmLCv1GlWlg5FdFJuWsRsTejLLH+C00jTssykHkl+JMbnzWHbgDJO3HJw?= =?us-ascii?Q?ZJ2fKU8UrFQwoAn9AP2GuP5bUVBLItDc7ndauYFce4w7lTaa0HRcLbyLj9fO?= =?us-ascii?Q?HVMlykL20K5Dgq8K4sIvdqPiCRgT/ikVbYPGwUcs+h9Abev1KXO/Z+cE+ndG?= =?us-ascii?Q?zHW5B0e0EphpPgR1Jc9/9PpxxrqtN93pg5xan+XS0gArVFgbqXb6qsz7mh5e?= =?us-ascii?Q?WSuNvjAmxlNpYDqXXH8JL8wF0OJZNPLsPFP5jCY5rynBUmFI4rmbDxCwc4Op?= =?us-ascii?Q?T7BfR09Jvw/kFwgpgNKlKDWsNNayuMiW7PuUtqh7KswmcfLsRuti4ILzby1Z?= =?us-ascii?Q?gnk56nR+CfeDHL+Z2clKl8/WNv90NPFzSvW/186N6ppEaremJ/BiO4N0Qwst?= =?us-ascii?Q?DeeBE9JVCKeYkeLg4FJgH6Fd95X8UldmS01/oaaDDe/iNAEHfnGju2BJkTsU?= =?us-ascii?Q?o8Xu9dZgkiiNspF3oherskTKlRnD5ohtXnLwwT8GIkjghRHbWYNZ2SIuAvbn?= =?us-ascii?Q?iWCqpq5U0Wh6BubNHAPP7L++KGw=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: af52179f-7c8d-4e00-7771-08d9e267ab33 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2022 14:08:33.2515 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1o0d2ngx7HHCnwNSwwrGAv3+RXkSLtCRjxJtVt+7EsvEZowqmXLBRLUrlhyMyuoiBhx7YBBl0mHfwbk81MKEDbR+Ani6Nfjlf0LQItsHRes= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P251MB0235 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] efivar: Version bump 37 -> 38. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false * Contains approx 2 years worth of fixes, including a lot of compile error fixes. So drop old patchset. * Add Wno-error to the efivar make env. Signed-off-by: Christian Melki --- ..._guid-handle-misaligned-guid-pointer.patch | 55 ------ ...es-Werror-address-of-packed-member-c.patch | 167 ------------------ patches/efivar-37/series | 5 - rules/efivar.make | 10 +- 4 files changed, 7 insertions(+), 230 deletions(-) delete mode 100644 patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch delete mode 100644 patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch delete mode 100644 patches/efivar-37/series diff --git a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch deleted file mode 100644 index 89e913a74..000000000 --- a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Peter Jones -Date: Mon, 7 Jan 2019 10:30:59 -0500 -Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers - safely. - -GCC 9 adds -Werror=address-of-packed-member, which causes us to see the -build error reported at - https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . - -That bug report shows us the following: - -In file included from dp.c:26: -dp.h: In function 'format_vendor_helper': -dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] - 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ -dp.h:74:25: note: in definition of macro 'format_guid' - 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ - | ^~~~ -cc1: all warnings being treated as errors - -This patch makes format_guid() use a local variable as a bounce buffer -in the case that the guid we're passed is aligned as chaotic neutral. - -Note that this only fixes this instance and there may be others that bz -didn't show because it exited too soon, and I don't have a gcc 9 build -in front of me right now. - -Signed-off-by: Peter Jones ---- - src/dp.h | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/dp.h b/src/dp.h -index aa4e3902992d..20cb608d05f7 100644 ---- a/src/dp.h -+++ b/src/dp.h -@@ -70,8 +70,15 @@ - #define format_guid(buf, size, off, dp_type, guid) ({ \ - int _rc; \ - char *_guidstr = NULL; \ -- \ -- _rc = efi_guid_to_str(guid, &_guidstr); \ -+ efi_guid_t _guid; \ -+ const efi_guid_t * const _guid_p = \ -+ likely(__alignof__(guid) == sizeof(guid)) \ -+ ? guid \ -+ : &_guid; \ -+ \ -+ if (unlikely(__alignof__(guid) == sizeof(guid))) \ -+ memmove(&_guid, guid, sizeof(_guid)); \ -+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ - if (_rc < 0) { \ - efi_error("could not build %s GUID DP string", \ - dp_type); \ diff --git a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch deleted file mode 100644 index 7653bd80a..000000000 --- a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch +++ /dev/null @@ -1,167 +0,0 @@ -From: Peter Jones -Date: Thu, 21 Feb 2019 15:20:12 -0500 -Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. - -This gets rid of all the places GCC 9's -Werror=address-of-packed-member -flags as problematic. - -Fixes github issue #123 - -Signed-off-by: Peter Jones ---- - src/dp-message.c | 6 ++++-- - src/dp.h | 12 ++++-------- - src/guid.c | 2 +- - src/include/efivar/efivar.h | 2 +- - src/ucs2.h | 27 +++++++++++++++++++-------- - 5 files changed, 29 insertions(+), 20 deletions(-) - -diff --git a/src/dp-message.c b/src/dp-message.c -index 3724e5f57bdb..9f964663de86 100644 ---- a/src/dp-message.c -+++ b/src/dp-message.c -@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) - ) / sizeof(efi_ip_addr_t); - format(buf, size, off, "Dns", "Dns("); - for (int i=0; i < end; i++) { -- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; -+ efi_ip_addr_t addr; -+ -+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); - if (i != 0) - format(buf, size, off, "Dns", ","); - format_ip_addr(buf, size, off, "Dns", -- dp->dns.is_ipv6, addr); -+ dp->dns.is_ipv6, &addr); - } - format(buf, size, off, "Dns", ")"); - break; -diff --git a/src/dp.h b/src/dp.h -index 20cb608d05f7..1f921d524aaf 100644 ---- a/src/dp.h -+++ b/src/dp.h -@@ -71,13 +71,9 @@ - int _rc; \ - char *_guidstr = NULL; \ - efi_guid_t _guid; \ -- const efi_guid_t * const _guid_p = \ -- likely(__alignof__(guid) == sizeof(guid)) \ -- ? guid \ -- : &_guid; \ -- \ -- if (unlikely(__alignof__(guid) == sizeof(guid))) \ -- memmove(&_guid, guid, sizeof(_guid)); \ -+ const efi_guid_t * const _guid_p = &_guid; \ -+ \ -+ memmove(&_guid, guid, sizeof(_guid)); \ - _rc = efi_guid_to_str(_guid_p, &_guidstr); \ - if (_rc < 0) { \ - efi_error("could not build %s GUID DP string", \ -@@ -86,7 +82,7 @@ - _guidstr = onstack(_guidstr, \ - strlen(_guidstr)+1); \ - _rc = format(buf, size, off, dp_type, "%s", \ -- _guidstr); \ -+ _guidstr); \ - } \ - _rc; \ - }) -diff --git a/src/guid.c b/src/guid.c -index 306c9ff8287c..3156b3b7c60a 100644 ---- a/src/guid.c -+++ b/src/guid.c -@@ -31,7 +31,7 @@ - extern const efi_guid_t efi_guid_zero; - - int NONNULL(1, 2) PUBLIC --efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) -+efi_guid_cmp(const void * const a, const void * const b) - { - return memcmp(a, b, sizeof (efi_guid_t)); - } -diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h -index 316891ccae9c..ad6449d9d938 100644 ---- a/src/include/efivar/efivar.h -+++ b/src/include/efivar/efivar.h -@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) - - extern int efi_guid_is_zero(const efi_guid_t *guid); - extern int efi_guid_is_empty(const efi_guid_t *guid); --extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); -+extern int efi_guid_cmp(const void * const a, const void * const b); - - /* import / export functions */ - typedef struct efi_variable efi_variable_t; -diff --git a/src/ucs2.h b/src/ucs2.h -index dbb59004b7c0..edd8367b4bcc 100644 ---- a/src/ucs2.h -+++ b/src/ucs2.h -@@ -23,16 +23,21 @@ - (((val) & ((mask) << (shift))) >> (shift)) - - static inline size_t UNUSED --ucs2len(const uint16_t * const s, ssize_t limit) -+ucs2len(const void *vs, ssize_t limit) - { - ssize_t i; -- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) -+ const uint16_t *s = vs; -+ const uint8_t *s8 = vs; -+ -+ for (i = 0; -+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; -+ i++, s8 += 2, s++) - ; - return i; - } - - static inline size_t UNUSED --ucs2size(const uint16_t * const s, ssize_t limit) -+ucs2size(const void *s, ssize_t limit) - { - size_t rc = ucs2len(s, limit); - rc *= sizeof (uint16_t); -@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) - } - - static inline unsigned char * UNUSED --ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) -+ucs2_to_utf8(const void * const voidchars, ssize_t limit) - { - ssize_t i, j; - unsigned char *ret; -+ const uint16_t * const chars = voidchars; - - if (limit < 0) - limit = ucs2len(chars, -1); -@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) - } - - static inline ssize_t UNUSED NONNULL(4) --utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) -+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) - { - ssize_t req; - ssize_t i, j; -+ uint16_t *ucs2 = ucs2void; -+ uint16_t val16; - - if (!ucs2 && size > 0) { - errno = EINVAL; -@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) - val = utf8[i] & 0x7f; - i += 1; - } -- ucs2[j] = val; -+ val16 = val; -+ ucs2[j] = val16; -+ } -+ if (terminate) { -+ val16 = 0; -+ ucs2[j++] = val16; - } -- if (terminate) -- ucs2[j++] = (uint16_t)0; - return j; - }; - diff --git a/patches/efivar-37/series b/patches/efivar-37/series deleted file mode 100644 index e6f14fec2..000000000 --- a/patches/efivar-37/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch -0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch -# cbb8f240dc2a442323107d34454fa178 - git-ptx-patches magic diff --git a/rules/efivar.make b/rules/efivar.make index db0ed001f..95a759f94 100644 --- a/rules/efivar.make +++ b/rules/efivar.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_EFIVAR) += efivar # # Paths and names # -EFIVAR_VERSION := 37 -EFIVAR_MD5 := 9f067275c5f7aafdd75bfb364280ac9c +EFIVAR_VERSION := 38 +EFIVAR_MD5 := 243fdbc48440212695cb9c6e6fd0f44f EFIVAR := efivar-$(EFIVAR_VERSION) EFIVAR_SUFFIX := tar.bz2 EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX) @@ -28,7 +28,11 @@ EFIVAR_LICENSE := LGPL-2.1-only # ---------------------------------------------------------------------------- EFIVAR_CONF_TOOL := NO -EFIVAR_MAKE_ENV := $(CROSS_ENV) PTXDIST_ICECC=$(PTXDIST_ICERUN) +EFIVAR_MAKE_ENV := \ + $(CROSS_ENV) \ + ERRORS="-Wno-error" \ + PTXDIST_ICECC=$(PTXDIST_ICERUN) + EFIVAR_INSTALL_OPT := libdir="/usr/$(CROSS_LIB_DIR)/" install EFIVAR_CFLAGS := \ -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de