From patchwork Fri Sep 11 09:39:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dagg Stompler X-Patchwork-Id: 1362335 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=M2zLWufY; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BnrLq5WqLz9sTC for ; Fri, 11 Sep 2020 19:39:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E0E2859D2; Fri, 11 Sep 2020 09:39:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9SmCIkVaFo2R; Fri, 11 Sep 2020 09:39:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A480F87215; Fri, 11 Sep 2020 09:39:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id ECD901BF2BE for ; Fri, 11 Sep 2020 09:39:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E93C987215 for ; Fri, 11 Sep 2020 09:39:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tXvgHWHXaCaI for ; Fri, 11 Sep 2020 09:39:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3FE76859D2 for ; Fri, 11 Sep 2020 09:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1599817164; bh=GC3pCxvxDbSUDckrxfhNlysHhVl75K0o8rrGjZ56kbQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=M2zLWufYL8my6nwXLMSMsXSaC7rm3QgDKRWQEJJX1RRgBxco8da8Cn8aLsw9Irxro 6PWK6r9wZHGSjYRRbV6mcUrNom+4uTn0pF/JuW3V71bkmuMNwBcYG9+/yeOaqdBa7S YWzxG3HXO20XgxIRDXPcC3t5fmMpltz/rg+d0tTE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([176.231.67.221]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1M5wLZ-1k9Gs438rz-007Ute for ; Fri, 11 Sep 2020 11:39:23 +0200 From: Dagg Stompler To: buildroot@buildroot.org Date: Fri, 11 Sep 2020 12:39:22 +0300 Message-Id: <20200911093922.8298-1-daggs@gmx.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:8an3fqjbT6ToDjEicqtiAsRYj7kM7zeY4pFXqV70Ache9tqIcVp 64ROGRyurX4FKjTuKgzhwtmx+C9uHrpbYukQphCcxrswz+BTDdmC91x1aQDOZXQ98PAs7NT kxG6Iy2436SlUrHNFRz5qb7OvHZaDYiSXkA5R/tv4ug8cHoPxjNmmM3ybCoplqS+CHTq//p h3pJUVDq5igOZURHPPwQw== X-UI-Out-Filterresults: notjunk:1;V03:K0:AI63zVatPq0=:7ipMWaDBWdSrsgWwjKSHkB b6AWVyJ+fRZpAHof17Q0FOxGCUyGq6WwdUSqfsMfz7odEOtBeV3UODnHaJF5MKyC7rTrmU7Te /xkmYSdeRXbqeXIpLV7l4H35gd+FWFLk+gnHQJtetlBL2AvWPgtBRRnfaA754LtBC4CXO61lX D6KaumCgNC/HFcA/ODAO64yZApQ2b3Wol0OD39yU2d5eMVyp1x2eRx5vj36FJbMoFLHx2/S19 AwNSY0y9G4r0mouX9agArrqiqFl+RANvIOX2vt+1Syke0wsnULYrdFjbVFEkX4yroDCyQbchy JgQ8pP9v+4dFsuTyZS7lw7BNWfubNG63vKKdS4SyXlBQPj4bCXkrpmKf6VCkM2lMUU6MJW8vS PbEYZCudkFmy8SAheYceCK4rSbbALH4bm879C81DMtKQJ8CFg4IdbFr7iRzQAaFqnOn4afI71 nPzdl6EjDlj3tCw+pJjaU32msgnO1pH9t6TVYoMVikccj2S5BVvHV3l2MhMxViTczKZbMDe+6 7NnyL9Pv1jM5IaZk/xwgO+6fQaNGEnVXIUKHbtm0CXmQtPjc3Y/ayaJM2Fo0pGLly3nlKIctN URqtkpsO+ZQcXru9kxR38BvkWNgJaqyG589hK4XcZ3Vl9VJiFWlsArlNFsPD4AfXmZ/Nn4BMr K6KoCYVM+PXJ5AKKwhu9CGxD9gqmYBNqmlidZiFx2sNH+77hJY6j3KGWaRmLh1t+sCv3LJewK YlOZNtjFebBWQomJZ2bif35ARsQAP7onff3S+7GaVmdmo+I7AvReyXBv+zHt489AZfHqnmOT3 ZFDj+Hzrvs6HNQTkvrHUYgHtA462jD4NrtOuSqcBYuUAX5jwVTfx1HyzYgdQWwHXvEUAxVPqx ZbNyyG+RnGAFF2neEpKhx+G/M/xpyAeH4PoxiUWVjp+FvoTsGbImLwm7iOB7CF3xM/oQHRo1i w4nzOyao1C4WYsxxSA7H54Ma5bv18NWTAQl3Yp2ZROnc23TipBdpHJGaprxOqO/CL6+FTKH1v IRUKDt9zPOy9bQSwLlVUoAOoIg/jEeVqgH4Ns5uljaWgHmtqi+mmoMbZ2b2kFDXT0NEBG+pdO L8zAmHkl7xORm/MYzyeDEMKzVQk168ZXifV6Kz/adjOvVrdp+TPlARiGu5Ikp1IssjPq7HZuO sQrrzz99VVX/UyZHBypft/HEBbA2bs2ChzSVHdurhvzkvM63037GkQ2GXQbfapnXWt9jWPOnx rQrFLyYpmH5+c8bC0 Subject: [Buildroot] [PATCH] meson-tools: fix autobuild failure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" fix the code so it won't use non std C conevention. fixes: - http://autobuild.buildroot.net/results/602d474a12cf2400e4f38ffad903758d7fd9f2f5 - http://autobuild.buildroot.net/results/65cfe582ce60fcff18afd008c3d469471ffb0e49 Signed-off-by: Dagg Stompler --- ...l-remove-non-std-C-convention-in-for.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch -- 2.28.0 diff --git a/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch b/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch new file mode 100644 index 0000000000..0ee38416f9 --- /dev/null +++ b/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch @@ -0,0 +1,50 @@ +From 7c5475187d1bdf861360ffd8bc1aaea84a341db3 Mon Sep 17 00:00:00 2001 +From: Dagg Stompler +Date: Fri, 11 Sep 2020 12:28:52 +0300 +Subject: [PATCH] amlbootenc-gxl: remove non std C convention in for + +not all compilers have c99 or gnu99 enabled, so try not to use a +non std C convention in for call loops + +Signed-off-by: Dagg Stompler +--- + amlbootenc-gxl.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/amlbootenc-gxl.c b/amlbootenc-gxl.c +index 3695e13..233563d 100644 +--- a/amlbootenc-gxl.c ++++ b/amlbootenc-gxl.c +@@ -51,6 +51,7 @@ static int boot_enc(const char *input, const char *output) + ._unknown3 = 0x02000000, + .sig2 = AMLOGIC_C_SIGNATURE, + }; ++ int i; + + assert(sizeof(hdr) == 0x100); + +@@ -130,10 +131,10 @@ static int boot_enc(const char *input, const char *output) + memcpy(hdr.iv, (uint8_t[]){ 0x14, 0x82, 0x5b, 0x1b, 0x10, 0xc1, 0x49, 0x0d, 0x8f, 0x13, 0x0a, 0x99, 0x15, 0x50, 0x1d, 0x37 }, 16); + } + #else +- for (int i = 0; i < sizeof(hdr.key); i++) { ++ for (i = 0; i < sizeof(hdr.key); i++) { + hdr.key[i] = rand(); + } +- for (int i = 0; i < sizeof(hdr.iv); i++) { ++ for (i = 0; i < sizeof(hdr.iv); i++) { + hdr.iv[i] = rand(); + } + #endif +@@ -151,7 +152,7 @@ static int boot_enc(const char *input, const char *output) + AES_cbc_encrypt(src_buf, buf + hdr.first_offset, hdr.block_size, &aes_key, iv, AES_ENCRYPT); + SHA256_Update(&sha256_ctx, buf + hdr.first_offset, hdr.block_size); + +- for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) { ++ for (i = 1; i < hdr.payload_size / hdr.block_size; i++) { + memset(src_buf, 0, hdr.block_size); + fread(src_buf, 1, hdr.block_size, fin); + AES_cbc_encrypt(src_buf, buf + hdr.data_offset + (i - 1) * hdr.block_size, hdr.block_size, &aes_key, iv, AES_ENCRYPT); +-- +2.28.0 +