From patchwork Tue Jan 11 15:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2260 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 41CF4C433FE for ; Tue, 11 Jan 2022 15:28:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web12.8805.1641914917688039020 for ; Tue, 11 Jan 2022 07:28:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=vmBpk7N+; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id A96FA801EA; Tue, 11 Jan 2022 16:28:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641914914; bh=xds+4PMZoHKlN+3QYBY1uqlAyK7IAPnvs90bBY75/Gw=; h=From:To:Cc:Subject:Date:From; b=vmBpk7N+Jt/WhZKZR3k9VNTdKJgmZXv4EKTB11cdMqAVyOERvUl3Kv//QWK8YFDi5 /poH1YFWGJaFcApMrZfkasVNZjBxEGbhizxaGHpKpzpLm0wNye6hqg1tD9SlXWbNkp 9jRSni5RrY9rZmBBrnViv98ISeaAbqo9xJGWKdfSI0aAXuLhGvUmvwPXT8rPaL2jsP 6shPP03VqCnRK9LQnd3D4kW5Mv5y11QSSieZrOj2g5f1PrBwUqyDt1TAoKedf7MNjV H7uwebJcrkQ0vJzSLhJ0v3XeXOFbfPl4vl3ISu/DuR+P6QUGanHqSkQ58nX0eQ95lE bT88BhFQ+OeVw== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Stanislav Angelovic , Marek Vasut Subject: [meta-oe][dunfell][PATCH 1/4] Bump sdbus-c++ version to v0.8.3 Date: Tue, 11 Jan 2022 16:28:11 +0100 Message-Id: <20220111152814.1270957-1-marex@denx.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 ; Tue, 11 Jan 2022 15:28:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94746 From: Stanislav Angelovic Signed-off-by: Khem Raj (cherry picked from commit b6213e4dd595d7dd2dbd67c1cad09e958ffd9c2f) Signed-off-by: Marek Vasut --- ...1-Try-to-first-find-googletest-in-the-system-before-do.patch | 0 .../sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/run-ptest | 0 .../{sdbus-c++-tools_0.8.1.bb => sdbus-c++-tools_0.8.3.bb} | 2 +- .../sdbus-c++/{sdbus-c++_0.8.1.bb => sdbus-c++_0.8.3.bb} | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/0001-Try-to-first-find-googletest-in-the-system-before-do.patch (100%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/run-ptest (100%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-tools_0.8.1.bb => sdbus-c++-tools_0.8.3.bb} (88%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++_0.8.1.bb => sdbus-c++_0.8.3.bb} (96%) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/0001-Try-to-first-find-googletest-in-the-system-before-do.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch similarity index 100% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/0001-Try-to-first-find-googletest-in-the-system-before-do.patch rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest similarity index 100% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb similarity index 88% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb index 9eaec0f2a..3b87c2265 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb @@ -8,7 +8,7 @@ inherit cmake DEPENDS += "expat" -SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb similarity index 96% rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb index a94fb8def..3f805001f 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb @@ -16,7 +16,7 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B DEPENDS += "expat" -SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ file://0001-Try-to-first-find-googletest-in-the-system-before-do.patch \ From patchwork Tue Jan 11 15:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2259 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 40CBDC433EF for ; Tue, 11 Jan 2022 15:28:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web08.8810.1641914917678282758 for ; Tue, 11 Jan 2022 07:28:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=q/6Uxb9H; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 0310380562; Tue, 11 Jan 2022 16:28:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641914915; bh=kTAaZfQW41NFGskH/OkRjfrRlh6BQWbP6UkYdb+vDLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q/6Uxb9HT65dO/SoJkMgGXnWxYP51Fz9rxVi9PwMgdJ07xrsOXlHCkwTJOylAKTtW NEsIKlpEFlIUKls2+95veY54wNPPBN/TS8jHmqgyxmS4gHbthw+4Hrw0UlzpKLI8Ek xRsYDVtsJiBHQQ0oX+lKKep8ieo08jx14mDZRs2cEE6M68Pja8oobt8PKG/cJdCVfu jbo6x4W9CW3aro//NFvhB2Fii4ZvjpC+xTZe61I3kY0NkRIohLXamGZ5Xm5eU5yPSR WUiWm+e2QsRylrVDtjvsBZU5eTVfqdHtXziCxeoLF/jNkNO25QRyDhFkeuL1XJFB4F Je9E035tj+68Q== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Marek Vasut Subject: [meta-oe][dunfell][PATCH 2/4] sdbus-c++-libsystemd: Fix reallocarray check in meson Date: Tue, 11 Jan 2022 16:28:12 +0100 Message-Id: <20220111152814.1270957-2-marex@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111152814.1270957-1-marex@denx.de> References: <20220111152814.1270957-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 ; Tue, 11 Jan 2022 15:28:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94748 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit 4a171790a66c6adb5bf0994c9b2c85a1ea0b8ce8) Signed-off-by: Marek Vasut --- .../0001-meson-Fix-reallocarray-check.patch | 25 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch new file mode 100644 index 000000000..d3d339d56 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch @@ -0,0 +1,25 @@ +From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 12 Dec 2020 16:15:57 -0800 +Subject: [PATCH] meson: Fix reallocarray check + +reallocarray() is defined in stdlib.h, so that would be right header to +check for its presense. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] +Signed-off-by: Khem Raj +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -501,7 +501,7 @@ foreach ident : [ + #include + #include '''], + ['explicit_bzero' , '''#include '''], +- ['reallocarray', '''#include '''], ++ ['reallocarray', '''#include '''], + ['set_mempolicy', '''#include + #include '''], + ['get_mempolicy', '''#include diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index f0e928d0d..c52024130 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -41,6 +41,7 @@ SRC_URI_MUSL = "\ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ file://0003-src-basic-copy.c-include-signal.h.patch \ file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ + file://0001-meson-Fix-reallocarray-check.patch \ " PACKAGECONFIG ??= "gshadow idn" From patchwork Tue Jan 11 15:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2262 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 4F010C43217 for ; Tue, 11 Jan 2022 15:28:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web09.8798.1641914917687763829 for ; Tue, 11 Jan 2022 07:28:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=rMAm+Jvi; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 44F9280FDA; Tue, 11 Jan 2022 16:28:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641914915; bh=ETNLc8npz9OlrO83jqnlwrqnneoI4G+uqz3WOB0kvsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rMAm+JviSvD85ldq2fBdqv8GxUGZ/Qz2zV+1EIE82ysPr2Bc34cf1jYvoZ+20xHCn ifoQA242EPel+4d5n/mP7J91RsWNlqB7nvs/PbayEaF8gUX0qj2IxbketyGDn6kL/+ fQ62OGvNpqFJnMnlHH8FdaLEeoNI8ODSI7i+1GLR6RSzC3WwkR+EE2Fnh6Fk8JwzRN ShQT69kaUq5fEV3dCoW1+03a+foInJdYg4Vm/GPIoHHINyAZQ8/5aTE+3hgQLZIU2n R/j5CPNHRUoeo30oF90gauM5+4i9An7YZjk/EbfwjH8MwrwQhNnwnAKa7NsisHtGJX MDtezVjDQAD8g== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Marek Vasut Subject: [meta-oe][dunfell][PATCH 3/4] sdbus-c++-libsystemd: Avoid hard dependency on rsync Date: Tue, 11 Jan 2022 16:28:13 +0100 Message-Id: <20220111152814.1270957-3-marex@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111152814.1270957-1-marex@denx.de> References: <20220111152814.1270957-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 ; Tue, 11 Jan 2022 15:28:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94749 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit dcb8ab6169bd93440137bbd4703171987ecd3a15) Signed-off-by: Marek Vasut --- ...d25119a495009ea62f79e5daec34cc464628.patch | 53 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 7 +-- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file mode 100644 index 000000000..ae449791f --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch @@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ + diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index c52024130..59d6f352c 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" - -SRC_URI += "file://static-libsystemd-pkgconfig.patch" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ + file://static-libsystemd-pkgconfig.patch \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + " # patches needed by musl SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" From patchwork Tue Jan 11 15:28:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2261 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 4CBD9C4332F for ; Tue, 11 Jan 2022 15:28:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web12.8806.1641914918373609973 for ; Tue, 11 Jan 2022 07:28:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=bzv7+7SK; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 8A4B682A71; Tue, 11 Jan 2022 16:28:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641914915; bh=mSFDWybyHC5VG7H9JjgRrY3JXJJ13wHC55x4OW+c9Uo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bzv7+7SKHOzFbpH1TpoZJ/61T8j6S1e3k0609YI6v6tAfTH+i9t9FJSoJ58yiBSu2 56CBMiqV+ktjBrNj1DOTa+xy4cygqMdhxmcKbR2TKc3RtUGO1/EUmHjvnwdqlYOlD4 gtOb746DCgCZ5JHclwzPGriJ3qJfjjDuxvkrePoICp76nOWMXUdIYlPKVVStq1FbX9 Cj3JbrAGCq7alIFnX9ybLMymL80jZ8DvXpC8rSFyufCnTGPvqkx97stMuPqLgodYQU I1JjFSViXH9GN4RXg2ZE8HyEhqu0HvvWaqnR52NHyS3dE1fN4IXHFdP5MDSlzzlaAN f04R9E7P15Ypg== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Bruce Ashfield , Marek Vasut Subject: [meta-oe][dunfell][PATCH 4/4] sdbus-c++-libsystemd: Fix build with kernel 5.15+ Date: Tue, 11 Jan 2022 16:28:14 +0100 Message-Id: <20220111152814.1270957-4-marex@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111152814.1270957-1-marex@denx.de> References: <20220111152814.1270957-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 ; Tue, 11 Jan 2022 15:28:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94747 From: Khem Raj Backport a patch from upstream systemd Signed-off-by: Khem Raj Cc: Bruce Ashfield (cherry picked from commit fc9a72ed804253a39d2a4fcef62202abcbb23567) Signed-off-by: Marek Vasut --- ...-linux-Sync-if_arp.h-with-Linux-5.14.patch | 29 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch new file mode 100644 index 000000000..a251e3e6c --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch @@ -0,0 +1,29 @@ +From 4411a9a3ebff98b6fcf5967c75faa458d219df96 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Fri, 10 Sep 2021 09:51:36 +1200 +Subject: [PATCH] basic/linux: Sync if_arp.h with Linux 5.14 + +ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition + +Fixes #20694 +Upstream-Status: Backport [https://github.com/cpackham-atlnz/systemd/commit/67cd626399b0d02882ee00716c8bd31ba764c862] +Signed-off-by: Khem Raj +--- + src/basic/linux/if_arp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/linux/if_arp.h b/src/basic/linux/if_arp.h +index c3cc5a9e5e..4783af9fe5 100644 +--- a/src/basic/linux/if_arp.h ++++ b/src/basic/linux/if_arp.h +@@ -54,6 +54,7 @@ + #define ARPHRD_X25 271 /* CCITT X.25 */ + #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */ + #define ARPHRD_CAN 280 /* Controller Area Network */ ++#define ARPHRD_MCTP 290 + #define ARPHRD_PPP 512 + #define ARPHRD_CISCO 513 /* Cisco HDLC */ + #define ARPHRD_HDLC ARPHRD_CISCO +-- +2.33.1 + diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index 59d6f352c..ef3afcfb5 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -15,6 +15,7 @@ SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + file://0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch \ " # patches needed by musl