From patchwork Fri Nov 22 19:01:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 53010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E63DCE6918A for ; Fri, 22 Nov 2024 19:01:37 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.32257.1732302094571672005 for ; Fri, 22 Nov 2024 11:01:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mg9yyOo+; spf=pass (domain: gmail.com, ip: 209.85.216.46, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ea2dd09971so2095880a91.3 for ; Fri, 22 Nov 2024 11:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732302094; x=1732906894; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YKG5AZI/SC5T8tVoXd+7sUZ66QZFBOdDanGcV4fazyY=; b=mg9yyOo+WpUp22yLKUB9WYy6zzPFt5zEAxYHN2v10yOwJQVTjS0vJ+DUZQ54kQWtkw mXpsAy5Lpls79MqTl5rkGA9OF044j/zvcuEmRjOASjXl5YCezH67Ri0zduK4GW++MaUh OHh+YinUoCAFftXT1Ag97WXV0fD3Rt+xIi9AssVhwmPSM+zAz92HWWnYQhv6vYGgJb3m FB1u1S5CJQYvcl1yGYmNqMPzzRiaakPhwoKFnFPkE6kGFy9+6qm4bi7+C3Gl06/5OVcg VX+im6ovgADNqENbgp94To2Nw+UpwjduJe0wosk+AZ2AxhvjnpEuvxolaVYxP7wIHiMd Z12Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732302094; x=1732906894; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YKG5AZI/SC5T8tVoXd+7sUZ66QZFBOdDanGcV4fazyY=; b=eMTpCGzzU0qqd+3Czjc43opqMk2p5YtlQAUwD6oOu5XBXbd9e4r4cjtfufBpMHNyNA VpRX11wCPZZCLUgZda2N89y0GHUVMdYVXHyFHTmx/gPGFVseF4MO6SLK1qVnH5uZOxei qRlUG6VnxFXGYgYG2Z9yaRXK5ZF6ErCgZxj0lakXWXuPvnLTLGg+IZUYitVs6hF2dlJe tQ0EGwoJ8hChxqRnlpkghhM04sntRhNqHI354SY5YKpXGw3xn/F0osfOoQFjLW54bU3b 6n28n74wjv009Wi16mykgQAEeGl9eT94B5j5DtCIwQkNB2C8PXcpabQQ1MxadkWFh7x1 QODg== X-Gm-Message-State: AOJu0Yy+OPOp2fxYQeuu0mx/Uznn6XAx8IMECgCHcnbP3cZEt6I+mB9/ LP1O8dBPEMNnfPmEq4eVPXrvJqcVkRMlLeNfrEA418Woim1DLm5bkdGMtw== X-Gm-Gg: ASbGnct5z0ImLeJ8VMGOjT98A5WYdUwlBuR1lYFFrmzrOyrdHqB+pwGSIr9tshKy7QK LqIYqZXkAfgz8X/t84QzpcefAifCbsjp69weVbpjAHa69k01wJD3NbPAVCynHJRKEQngT/nf5Xv NLsCSMaQ9945iykmb2pmcWYywYp4UkW5cEEQ4Bx2rMZU+HTI8cm4vo3rHkQxttuY2Wx4OByWY4+ tuY6zjAj/C8xZv74iUIZUje3oS+0bG3uM6DQIb5hwuPuYI3IGI= X-Google-Smtp-Source: AGHT+IED1Q2jwNiORk8TikyoF0v19ZlPmF3nf4NeMg/UG0ohtzS9XD0x54Foh2UqchueDF6T3L97qA== X-Received: by 2002:a17:90b:1b46:b0:2ea:5fed:4a2b with SMTP id 98e67ed59e1d1-2eb0e2303e4mr5049188a91.15.1732302093720; Fri, 22 Nov 2024 11:01:33 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8201:fd20::1dd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ead04d2cf6sm5500166a91.37.2024.11.22.11.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2024 11:01:33 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 1/4] libdex: Link with libucontext on musl Date: Fri, 22 Nov 2024 11:01:28 -0800 Message-ID: <20241122190131.2810521-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 22 Nov 2024 19:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114006 Fixes errors like below x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: getcontext Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/libdex/libdex_0.8.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-gnome/recipes-gnome/libdex/libdex_0.8.1.bb b/meta-gnome/recipes-gnome/libdex/libdex_0.8.1.bb index 1648639c3e..3ed2f6ccb3 100644 --- a/meta-gnome/recipes-gnome/libdex/libdex_0.8.1.bb +++ b/meta-gnome/recipes-gnome/libdex/libdex_0.8.1.bb @@ -7,6 +7,9 @@ inherit features_check gnomebase upstream-version-is-even gobject-introspection DEPENDS += " \ glib-2.0 \ " +DEPENDS:append:libc-musl = " libucontext" + +LDFLAGS:append:libc-musl = " -lucontext" SRC_URI[archive.sha256sum] = "955475ad3e43aabd6f6f70435264b5ee77bd265bd95545211fee026b08d378a0" From patchwork Fri Nov 22 19:01:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 53012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E23A0E6918D for ; Fri, 22 Nov 2024 19:01:37 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web10.32259.1732302095982836685 for ; Fri, 22 Nov 2024 11:01:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JC/CJdEx; spf=pass (domain: gmail.com, ip: 209.85.215.181, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7f71f2b136eso2072800a12.1 for ; Fri, 22 Nov 2024 11:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732302095; x=1732906895; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3oRGj40YwsAxu5pdjOWLjlzcrREoXDHvXUcpMip8Lnc=; b=JC/CJdExW9USy/++98fs1IcSwr2QO8bPUOCH7khCVqWAgLcWPD68bmZDdsT5MSwRQR BdIQ7ZJ7ueUjA6JiNzP8ZrLOXOblZxarueg1A5cQ33Jco6ajbOC4JvJy07v2ACgrdg/j 5yswvbaqBZbnPFlvbiRRy6JUt2iFX+k4bLfACIW2KtuMMPuOzMFjRYTNhE3n9tE7zS/B Vh+Pq9c4PEYqJEPgLZDFnVWpH0yFANO21r++biTrKKk3HWsxjpsY/N9x5AILr9m04sXG PP9386c7Lmn9EnwQ6VKsKj//ZMpa7kiv7fv4HmnaKXc/oHVm3AteV50u43IgZo7BVzoq KCfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732302095; x=1732906895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3oRGj40YwsAxu5pdjOWLjlzcrREoXDHvXUcpMip8Lnc=; b=B4+DpfAXAwoGxKlOMsIAN7auGorVTa0881xlNO28v+a1YUj8OakncR/FT7FN0VFhfq 2N29XtDEn/QHk0PCdX+ReZvae45X/T4MBxQT4Bts6Zg54H5RaO5bXzV7HZkfFDOF3D0z P5bLVfiXiQw/kWsIYa7ZVzg8WQ24LjMTEGYE0cmB3HCkTir44Yst6K35fr0v8Ty8TYd5 xbfmxXwFAL9K/JGBta7WeHoHSmwJF7WFFcNyM78ncIPok80/1EzHRvqHIhyX0w5kzSw2 UfeSIFZBuAPaP3locP99Is0tsTxF6IS4WWs9VyGMUW5IfFcjsl2Fpmo7JhG06xIm+XsY RPzg== X-Gm-Message-State: AOJu0YzDRhhaL0qpuHZAt1b742f/6feoR0+lAzMbFGCU0TbaZtk8pVaC xNTQr1iRjsBiHKWryEGl+rLhXAS9l30sgzDMBzjK5lzbUJcIgvocz08aQw== X-Gm-Gg: ASbGnctX0KxatL1SWz8+UwKcpGsBnJ5WExa6AvHCIfsfHE3LOuV/gHOz8Tn/bd5/Egi wqNvOsXJkjwZui0GX67YWw5X/BfeTW61jNv8+3dX1yWMEGsQ++78d85L2hYOaNAklvr0QL7owWU G0ELcLkBfr1vUZgyFxVuH2wPl3jrAaEjzs6lbP/Q84A78HGvFXUQQpBY+FqzFH8dgeIRasswmPZ N2Ue667DJkbE0ZbyymDqiFw0/9U67Qpl1xUQ5U6qWxfujZmEEU= X-Google-Smtp-Source: AGHT+IH1GS9YeQrrhgg5+nv4gb5errcooDU4gPwElUqnk+m6SNHsytmDiJAwKHertVEL6g4KEkJxeg== X-Received: by 2002:a17:90b:3502:b0:2ea:4578:46d5 with SMTP id 98e67ed59e1d1-2eb0e526edemr4239326a91.21.1732302094986; Fri, 22 Nov 2024 11:01:34 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8201:fd20::1dd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ead04d2cf6sm5500166a91.37.2024.11.22.11.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2024 11:01:34 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/4] taisei: Fix build with musl Date: Fri, 22 Nov 2024 11:01:29 -0800 Message-ID: <20241122190131.2810521-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241122190131.2810521-1-raj.khem@gmail.com> References: <20241122190131.2810521-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 22 Nov 2024 19:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114007 This patch fixed issue on glibc but regressed on musl Signed-off-by: Khem Raj --- ...armful-Use-overloadable-func-attribu.patch | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch index d1af07416d..09f4be300c 100644 --- a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch +++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch @@ -20,21 +20,39 @@ Signed-off-by: Khem Raj src/util/consideredharmful.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/util/consideredharmful.h b/src/util/consideredharmful.h -index 3fe1f047..c6771956 100644 --- a/src/util/consideredharmful.h +++ b/src/util/consideredharmful.h -@@ -30,11 +30,11 @@ FILE* fopen(); +@@ -8,6 +8,7 @@ + + #pragma once + #include "taisei.h" ++#include "util/compat.h" + + #include + +@@ -24,17 +25,23 @@ PRAGMA(GCC diagnostic ignored "-Wstrict- + // clang generates lots of these warnings with _FORTIFY_SOURCE + PRAGMA(GCC diagnostic ignored "-Wignored-attributes") + ++#ifdef __GLIBC__ ++#define OVERLOADABLE __attribute__((overloadable)) ++#else ++#define OVERLOADABLE ++#endif ++ + #undef fopen + attr_deprecated("Use vfs_open or SDL_RWFromFile instead") + FILE* fopen(); #undef strncat attr_deprecated("This function likely doesn't do what you expect, use strlcat") -char* strncat(); -+char* __attribute__((overloadable)) strncat(); ++char* OVERLOADABLE strncat(); #undef strncpy attr_deprecated("This function likely doesn't do what you expect, use strlcpy") -char* strncpy(); -+char* __attribute__((overloadable)) strncpy(); ++char* OVERLOADABLE strncpy(); #undef errx attr_deprecated("Use log_fatal instead") From patchwork Fri Nov 22 19:01:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 53011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3585E6918E for ; Fri, 22 Nov 2024 19:01:37 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.32541.1732302097224899087 for ; Fri, 22 Nov 2024 11:01:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DfsVQZ/p; spf=pass (domain: gmail.com, ip: 209.85.215.172, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-7f8b01bd40dso1768193a12.0 for ; Fri, 22 Nov 2024 11:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732302096; x=1732906896; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J5DZkQMkuXZEvZjYDh+bMWwIbts83ZHMXc8H8WbZ2yE=; b=DfsVQZ/ppzz4d4bgYEfKcamdfBpFO/Wy5z0m+CAcFJDM5pLrRpfzoqRF9b/zkNb/SO sSoTukV46qqQkjLQkCRSGd/zjYyR6/wCv2nI6e/IBfjL/p/jTcho9wSEDtPiDiwDxiWO CeTsaIj5Wlkil3/4+0TnH7VM5sd4zi/ADQPR9/AkBfSZPzkZiHECA4cMuMq2hwh6OnJJ 9iX6ook+81JNgUHd1Jsr1iGpCtVqca/oqIx2kMYyxZlvEw2ijoLy/4nOPJmOhkOXBbi1 WDudibDOlljWubB978+wPzAjcn1OqDjdh9XYyqj03JRJK7DOwK1elpFqjrCdNMkso6RW gTew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732302096; x=1732906896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J5DZkQMkuXZEvZjYDh+bMWwIbts83ZHMXc8H8WbZ2yE=; b=BI/BuW49PrF0hLYvoWkOLI5oiXX+dL/gVpIxOLcRiIIdDqjBhrPLd5GItj7j9HaREt QEHemFI5Bpud08eZpw6ZlC9GzfW6faGMd8i6ryS8FS/RQ5Zst+kSdfZ8Mqf1IaMared9 L068pwEO7iqzwzphtiReubRfVgFoFYkFKwZ9UxpUm8D0dqac7K+IEbf4anJlC53l2u7d XZjVfZU1aeBqKULARU/TmB3Z/d9qFqwqzM4tzOaWSeGcCRqZl64DsRDIQDOmxBYL290q 2T3g6wRLTrxA4Ctv1gs91/mPetNtoMQtUVdsHoJJ6ZzBwJL3IGvVsBaRtxlefCmSopQV SmNg== X-Gm-Message-State: AOJu0Yxc4AmBsbzAjKUrweJ2SV7RLRo6kOZ1KSMD4NIAYLxMUqWWFSlH DzoaxJTkevFszxD8mYG090SeJRjbhLNEV7eLTydMilDznC8lCHdTMPoLzQ== X-Gm-Gg: ASbGncsixVWygqeOS5PuD8DzRCsRipC6u12qXd0rhTxWZzWjxFpaHErko760GMympyA kIVT9LxgyENmDmWlB9eU9kLik4PQIqwjQaP5Mc6h3/z1JOk7N0xka2n62vByRqT6C6NgJKK6tuc k/HdJsXHR8yjXiSUETXbQwVKTMLoVqARWFJf4zRfa5XETBeiqD53qSPJ4jVR/0iV+h2vNBaQPhZ R+sfD2lHFMDsiKw/sD/D1vfM7UW7dmnZSV40PkwpBTNntH42BM= X-Google-Smtp-Source: AGHT+IEIzGcvmWoqKddvK/Vr7RO7Fy0BK8oPU69gFCLwhu0t8o77x2VpDwaBuVZ+oLYmoNZmqMUqcA== X-Received: by 2002:a17:90b:390f:b0:2ea:4c4d:95a1 with SMTP id 98e67ed59e1d1-2eaebf27a1fmr12949927a91.17.1732302096462; Fri, 22 Nov 2024 11:01:36 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8201:fd20::1dd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ead04d2cf6sm5500166a91.37.2024.11.22.11.01.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2024 11:01:35 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/4] canopenterm: Fix build with musl Date: Fri, 22 Nov 2024 11:01:30 -0800 Message-ID: <20241122190131.2810521-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241122190131.2810521-1-raj.khem@gmail.com> References: <20241122190131.2810521-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 22 Nov 2024 19:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114008 Signed-off-by: Khem Raj --- ...-initialize-msghdr-in-a-portable-way.patch | 42 +++++++++++++++++++ .../canopenterm/canopenterm_1.0.8.bb | 4 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/canopenterm/canopenterm/0001-can_linux-initialize-msghdr-in-a-portable-way.patch diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm/0001-can_linux-initialize-msghdr-in-a-portable-way.patch b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-can_linux-initialize-msghdr-in-a-portable-way.patch new file mode 100644 index 0000000000..09bbd40215 --- /dev/null +++ b/meta-oe/recipes-extended/canopenterm/canopenterm/0001-can_linux-initialize-msghdr-in-a-portable-way.patch @@ -0,0 +1,42 @@ +From 464ed82087b0514694ab69e2808e859cb6f13833 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 22 Nov 2024 10:35:12 -0800 +Subject: [PATCH] can_linux: initialize msghdr in a portable way + +musl has padding bytes inside the msghdr struct which means initializing +full structure will cause wrong assignments, doing partial assignment is +more portable and assign the elements after that + +Fixes +src/core/can_linux.c:362:71: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] + | struct msghdr msg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 }; + | ^~~~ + +Upstream-Status: Submitted [https://github.com/CANopenTerm/CANopenTerm/pull/70] +Signed-off-by: Khem Raj +--- + src/core/can_linux.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/core/can_linux.c b/src/core/can_linux.c +index d8824be..b4e7907 100644 +--- a/src/core/can_linux.c ++++ b/src/core/can_linux.c +@@ -359,11 +359,16 @@ static char** get_can_interfaces(int* count) + int fd; + char buf[BUFFER_SIZE] = { 0 }; + struct iovec iov = { buf, sizeof(buf) }; +- struct msghdr msg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 }; ++ struct msghdr msg = { 0 }; + int len; + int max_interfaces = 10; + int can_count = 0; + char** can_interfaces = (char**)os_calloc(max_interfaces * sizeof(char*), sizeof(char)); ++ ++ msg.msg_name = &sa; ++ msg.msg_namelen = sizeof(sa); ++ msg.msg_iov = &iov; ++ msg.msg_iovlen = 1; + + struct + { diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.8.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.8.bb index 191225bb15..c9bf0af560 100644 --- a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.8.bb +++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.8.bb @@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=10e84ea70e8c3a1fbc462f5424806474" DEPENDS = "libinih libsdl2 lua libsocketcan pocketpy" -SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main" +SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main \ + file://0001-can_linux-initialize-msghdr-in-a-portable-way.patch \ + " SRCREV = "5bc04e09351f68e889381e1912b0445c4f18ee32" S = "${WORKDIR}/git" From patchwork Fri Nov 22 19:01:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 53013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D42ACE6918E for ; Fri, 22 Nov 2024 19:01:47 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.32544.1732302098212569691 for ; Fri, 22 Nov 2024 11:01:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hPysZcsD; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2ea8b039ddcso1995231a91.0 for ; Fri, 22 Nov 2024 11:01:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732302097; x=1732906897; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gXjDjxtBDUONfnFe1kp0IXpY2V463o/GwPTRuuj/rSA=; b=hPysZcsDTca1gzfra+fPnjoGKfzUv8KBoxh0mSaSDaLYqJ9WkX4FPYTmmljeJH/5cd 7HDtFGTSoHu6HUWP+EuMYKPHSk2bAOcEuztqU4iTsetbVYlEBL+HFvIsf5XyHKNsU/CD bVsrQPs/KJlQFoBqmBB1UQ70T+GVuPTKYNTqxF5PzFDHEudoBRzz98Yn3aE0gz8g/uqF JuWUY/A3zPHLMxDkAFnYFmOGik7F+GpS5Ngbri/N8AhBDcJO5lQF+IY1aB3g4k+/Kt6K twLhTYmuhsoBp0fdvt/UqVB4XS7XVY+ldgfS2/AtJfzuCuVvvH6EZqlkfbRvCmvk2c4X a8gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732302097; x=1732906897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gXjDjxtBDUONfnFe1kp0IXpY2V463o/GwPTRuuj/rSA=; b=bMJfrBxkSpEIedS3sePN48Rv1oMrxhXpTQOJ9/YYyePpz3DgFgTtwiafGiV/H43qzc f5PRTXTb6iZlEbPnyW78C/wmLptmT/mNWhWCEzwCbg16SdDyJjvEmK7v9JUKqBmopZUm Iy9+2eKLKR86GnLo1Vrztx8ySTrWhfYG1ejYcFVRpOa7s0jnYUZYLDqZV6eNhEfuR5iN CcCdDXMdVJse/riOgX9IAkbdDg8QU+Vs+Pq4CCZ2BcmEjrxpocdj94KwpnDw61F20AzZ nVhX1Oq9ox7scwQwmSDiyLAf6eM4JwuD6ptBiJWbCiBmhQRgdsm3Hnxgp/1w0DnAP2VV 8QTA== X-Gm-Message-State: AOJu0YwmzzBEbSY3eDjL2WmXFkg/Ybq/X7k+X7nePJFsiwPpGp+01VoD PKzZIOxkEZ60vfYZWXYCRC1pX4Yqfyda1jt1BNUOOHbEBG+R+i1gXxiMzA== X-Gm-Gg: ASbGncvAgTMW3uZdILDhZ8FFCtr+lCPBZm5xWHBSBtTNNvmZTqicJ1fH9P+KaVe8p9o dqSZ8i4eXJHAGPEK3PoOUST3iqLBbhMh6EKCQ8TTtIA56LqgYGGBTZPiS3lEFMERRCINF2iasO+ /UB8h0ggg3jEXAjxUtBzcGpYqKUK3+9UfQKzlY6JqiNg9kH3DT1x6z6nIsfZ9cwdNO27t+WPGwa emWM7+yzV5keCw+CIRN0JEYeNSSjqnoIJi+2KtzuCWmmK65Zfs= X-Google-Smtp-Source: AGHT+IEJ7Vp0zjSTFXi8pvpGHHZMRzT5dH17spkwsgmrRpueMdK6Rqun0f7Ohu9qotWnM6dS0TjiIg== X-Received: by 2002:a17:90b:38cc:b0:2ea:3f34:f18e with SMTP id 98e67ed59e1d1-2eb0e866c8emr4090800a91.23.1732302097231; Fri, 22 Nov 2024 11:01:37 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8201:fd20::1dd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ead04d2cf6sm5500166a91.37.2024.11.22.11.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2024 11:01:36 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 4/4] keepalived: Backport fix to build with musl Date: Fri, 22 Nov 2024 11:01:31 -0800 Message-ID: <20241122190131.2810521-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241122190131.2810521-1-raj.khem@gmail.com> References: <20241122190131.2810521-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 22 Nov 2024 19:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114009 Signed-off-by: Khem Raj --- ...clude-linux-if_ether.h-if-not-needed.patch | 34 +++++++++++++++++++ .../keepalived/keepalived_2.3.2.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch new file mode 100644 index 0000000000..f6a38668ee --- /dev/null +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch @@ -0,0 +1,34 @@ +From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Thu, 7 Nov 2024 11:09:43 +0000 +Subject: [PATCH] vrrp: Don't include if not needed + +The musl headers do not allow including both and + since they both define struct ethhdr. + +It is likely that we do not need to include at all +since with both glibc and musl including is sufficient, +but removing is for another day. + +Upstream-Status: Backport [https://github.com/acassen/keepalived/commit/f129c588f7c8a66e595d8ae96a43d585018e79cd] +Signed-off-by: Quentin Armitage +--- + keepalived/vrrp/vrrp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c +index 96b2c4c8..4b06e387 100644 +--- a/keepalived/vrrp/vrrp.c ++++ b/keepalived/vrrp/vrrp.c +@@ -40,8 +40,10 @@ + #include + #include + #include +-#include + #include ++#if !defined ETH_HLEN || !defined ETH_ZLEN ++#include /* This may not be needed at all - try removing and see if any issues raised */ ++#endif + #ifdef _NETWORK_TIMESTAMP_ + #include + #endif diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb index 2cb76e6d41..c0a2e57bfb 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ + file://0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch \ " SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"