From patchwork Thu May 19 19:29:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 8286 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 48AAEC433F5 for ; Thu, 19 May 2022 19:30:17 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web09.10.1652988601850776748 for ; Thu, 19 May 2022 12:30:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QYT31tKg; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id n8so5645095plh.1 for ; Thu, 19 May 2022 12:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eMUDcBdJBK9qvhDnvNxak29r117KBn6MgExzkMnif7Q=; b=QYT31tKgCE4BK4O97khsmgZF15agog+Zw0f4CUW1Jx39xfLwa1FlwoLY2f32bO1iNu GWvpksJeQZYoENYI+KUffCAA5eQZ6gPFPrIKwliCU3oTJf9V6ptPQTNjOuvKpEHaiKL1 NRebVJoIcC9Cn68cuYbx/3bL1vqXp8jZUYA+1HxOaiwNwbiJEBRgarOKnh3yOeVGet2I 8qNgUDI4ImsxCxPzRrk26fatUTZ6vDzsl8UiPOcfQAvH9fZcLdCSxon6HKgmc4y2mi6N wv+SuNBe/yiPsC8Zk4yGqvFP/RtJoRMeDp7eHBoWSWyZ2v3yAG/Fqho/f714qCfm8Rjg 31+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eMUDcBdJBK9qvhDnvNxak29r117KBn6MgExzkMnif7Q=; b=3bxyr4bDYm7x587+vKZ5pkJ4+WJNVMyKKHscuZvckHWl8VDbZxtYjg0/te9H15JH2p uV7p67pYFBMkaHVN0qUjsub8gwzXz2truco9/Fiid9fkKt3EYMVM35UaNoyCh4Lo1j8q +H1J6jQqu6kMjWq2J51+oU5rhnwYuOJz0k4+uPQvQEfVhajqo8xunfnpjjgrmjTspXfP UyWuY3OWUTeZJhahpI5i0bOutYsKssXOTAr4hDp2oePgITY2rGEB6nPQIDv645BwJKlD fvnQxRqb+LICLcmzHowOO494nDUqOPu45hA09PaO4SRo6X2XnVLTe5iUaeWwziszWuDD dlKA== X-Gm-Message-State: AOAM530gc3W3y3h0vfV/l6W7NMd8PwjFdG7NvWz0GZ/+LRKoNug0Mv2Y WY6xMtnJDCNtk26dhMQcqqk4sC6YnLvy8A== X-Google-Smtp-Source: ABdhPJysngIzN14kJM6fsbT8Bcnk9pMRT4EvX6v1t7DBCMdBPTy5mRuekhv7cP4zchJJIANe4bfnOw== X-Received: by 2002:a17:902:9309:b0:156:983d:2193 with SMTP id bc9-20020a170902930900b00156983d2193mr6094753plb.158.1652988600890; Thu, 19 May 2022 12:30:00 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id f62-20020a17090a704400b001dcf49d92a1sm177894pjk.28.2022.05.19.12.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 12:30:00 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/3] systemd: Drop redundant musl patches Date: Thu, 19 May 2022 12:29:55 -0700 Message-Id: <20220519192957.1129486-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.1 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 ; Thu, 19 May 2022 19:30:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165905 These patches are no longer needed in version 250, they have been dragged along rebasing over releases unnessarily. Lets remove them Signed-off-by: Khem Raj --- ...ype.h-add-__compar_d_fn_t-definition.patch | 28 -------------- .../systemd/0019-Handle-missing-LOCK_EX.patch | 24 ------------ ...ible-pointer-type-struct-sockaddr_un.patch | 38 ------------------- meta/recipes-core/systemd/systemd_250.5.bb | 3 -- 4 files changed, 93 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch delete mode 100644 meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch delete mode 100644 meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch diff --git a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch deleted file mode 100644 index 5ee212a4e72..00000000000 --- a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 68bb59615e91c4d3e5eb2076979c2b760f4bf027 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:27:54 +0800 -Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition - -Fix the following compile failure: -src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Chen Qi - ---- - src/basic/missing_type.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 3df1084ef2..697aa7f58a 100644 ---- a/src/basic/missing_type.h -+++ b/src/basic/missing_type.h -@@ -13,6 +13,7 @@ - - #ifndef __GLIBC__ - typedef int (*comparison_fn_t)(const void *, const void *); -+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); - #endif - - #ifndef __COMPAR_FN_T diff --git a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch deleted file mode 100644 index 662f8110db5..00000000000 --- a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f1574cf91340800cf8253e922b2c613d6b9b5e4a Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Fri, 7 Aug 2020 15:19:27 +0000 -Subject: [PATCH] Handle missing LOCK_EX - -Upstream-Status: Inappropriate [musl specific] -Signed-off-by: Alex Kiernan - ---- - src/partition/makefs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/partition/makefs.c b/src/partition/makefs.c -index b6979b7e4f..63d70d861e 100644 ---- a/src/partition/makefs.c -+++ b/src/partition/makefs.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - #include "alloc-util.h" - #include "blockdev-util.h" diff --git a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch deleted file mode 100644 index 70ac8b607ce..00000000000 --- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d2f3293ceb22731e0e97945f0d1132e356b66d07 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Fri, 7 Aug 2020 15:20:17 +0000 -Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * - -| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': -| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] -| 4893 | if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { -| | ^~~~~~ -| | | -| | struct sockaddr_un * -| In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22, -| from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21: -| /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' -| 384 | int connect (int, const struct sockaddr *, socklen_t); -| | ^~~~~~~~~~~~~~~~~~~~~~~ -| cc1: some warnings being treated as errors - -Upstream-Status: Inappropriate [musl specific] -Signed-off-by: Alex Kiernan - ---- - src/nspawn/nspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a2af4948c0..fb6af295b5 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -5399,7 +5399,7 @@ static int cant_be_in_netns(void) { - if (fd < 0) - return log_error_errno(errno, "Failed to allocate udev control socket: %m"); - -- if (connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { -+ if (connect(fd, (struct sockaddr *)&sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { - - if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) - return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index e5a2f65202c..2f5b9d1367e 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -45,10 +45,7 @@ SRC_URI_MUSL = "\ file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ - file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0019-Handle-missing-LOCK_EX.patch \ - file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ file://0021-test-json.c-define-M_PIl.patch \ file://0022-do-not-disable-buffer-in-writing-files.patch \ file://0025-Handle-__cpu_mask-usage.patch \ From patchwork Thu May 19 19:29:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 8285 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 67A2CC433FE for ; Thu, 19 May 2022 19:30:07 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.9.1652988602506916147 for ; Thu, 19 May 2022 12:30:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qstm8qh+; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id i8so5610338plr.13 for ; Thu, 19 May 2022 12:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/FSAV5fXxxRiwvZhbWQa3Qpel0Vd6ViSgFKGQZ/vIUY=; b=qstm8qh+9Hh/bnLiTBp+fRroErTFpIF24y5zL/EHoHT6siotORYmS8YnLs49EUHXiu KDWjTUcAfwven93OEhYgmUANQKMvM/Jj8S0NscKrm9Bd+yphomMjZ+5/lE6HLtUFc8jc 26aEoYq1Wv6+8CtaTXT34tjV5KNbnMYHnPojSvc0IehhzvRhXEZKdNsKGtRWOrr1dHNJ xQ1lnu+hLI+sx3Ly7hWU/9K31VUR2ojEV+9kWY2WDF9mmuIqPBddJnJOUdPs+AIF4xUu Va/EeucRoH6+XNM7O5SpJ18QLlsUMb1aCxP5qKf3Y50wPX1YvWhBHvpZXLoHHCQUaCFo 2I0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/FSAV5fXxxRiwvZhbWQa3Qpel0Vd6ViSgFKGQZ/vIUY=; b=EUQjiIoKdBhq3Iq63/2PcRFT1zkjlznWB+xrguFBZg3507FtPY/0J/Dw06ohzMvA9G 9GZii/3Iz07Qk7ZWqukETJzyW204IGNpx1DKLDN0Kdp3gcay5/552c7m+Rn68poQwUlY vOZ3qpZxY+qOHUvGE8SUrJVCk93cbUbCIAsA4j4TmHIK10LEO6YnxkhuwYdSJ4fuXSdF g+fXLZC89YeyjGGMuV+wOGCjWsTPDWudhR1wp9kCOi6yk1yMXnQRBOyQJyxHgCZ8OFjO O4L9I4SZk8ve3FXrSupkQ1Za+eiKEGxfU2pQzQVip6KxBX6IoAhiAGKVKQUx06GPzUvH 4CbA== X-Gm-Message-State: AOAM531sQcBOendPwsVzlfwHP80ZRJDH3y/ptIybK1Fp175vKrraWLsw JAVYZfubeKwg8KOKUYh0Rmhp6zEgszNtWQ== X-Google-Smtp-Source: ABdhPJxfl1VLLvJQniW6zMmYOZv7NqSkeCOe0sWfPEzRFVdXOChcLVap56UsFtH63PgGD+neb10qjg== X-Received: by 2002:a17:902:c950:b0:161:84b3:2d4f with SMTP id i16-20020a170902c95000b0016184b32d4fmr6113056pla.55.1652988601642; Thu, 19 May 2022 12:30:01 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id f62-20020a17090a704400b001dcf49d92a1sm177894pjk.28.2022.05.19.12.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 12:30:01 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/3] systemd: Document future actions needed for set of musl patches Date: Thu, 19 May 2022 12:29:56 -0700 Message-Id: <20220519192957.1129486-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220519192957.1129486-1-raj.khem@gmail.com> References: <20220519192957.1129486-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 ; Thu, 19 May 2022 19:30:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165906 Signed-off-by: Khem Raj --- ...missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | 3 +++ .../systemd/0008-add-missing-FTW_-macros-for-musl.patch | 3 +++ ...fix-missing-of-__register_atfork-for-non-glibc-build.patch | 3 +++ .../systemd/systemd/0021-test-json.c-define-M_PIl.patch | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 18fcc6e48c9..dfe41649009 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -6,6 +6,9 @@ Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t Make it work with musl where comparison_fn_t and __compare_fn_t is not provided. +Revisit this when upgrading to 251+ systemd since systemd does not need +__compare_fn_t anymore + Upstream-Status: Inappropriate [musl specific] Signed-off-by: Alex Kiernan diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 59bd81c76fd..4cce9a3fe6a 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -7,6 +7,9 @@ This is to avoid build failures like below for musl. locale-util.c:296:24: error: 'FTW_STOP' undeclared +Revisit this when upgrading to 251+ since most of these defines are not +needed anymore except FTW_CONTINUE + Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi diff --git a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 1fb84c7090e..e7b7269f95d 100644 --- a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -5,6 +5,9 @@ Subject: [PATCH] fix missing of __register_atfork for non-glibc builds Upstream-Status: Inappropriate [musl specific] +Drop this when upgrading to 251+, systemd does not use +__register_atfork anymore + Signed-off-by: Chen Qi --- diff --git a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch index cc20c3710af..82a01f732e1 100644 --- a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch @@ -8,6 +8,10 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi Upstream-Status: Inappropriate [musl specific] +This is fixed upstream where systemd no longer needs M_PIl so it could +be dropped when upgrading to 251+ see +https://github.com/systemd/systemd/commit/f9a1fd2a3b2d8212ba84ef1c3b55657ced34475e + Signed-off-by: Chen Qi --- From patchwork Thu May 19 19:29:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 8284 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 679E3C433EF for ; Thu, 19 May 2022 19:30:07 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web08.6.1652988603260414269 for ; Thu, 19 May 2022 12:30:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=g/DPSSpT; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id z7-20020a17090abd8700b001df78c7c209so9625430pjr.1 for ; Thu, 19 May 2022 12:30:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pJepCDDjH75/uWHDDivMzZDUOrrWvtTRC/L2uATjKKA=; b=g/DPSSpTCKdAVp4JCe7L/G0JTMdpSGMWP5f9yhas00TcYOWNfURHdDPb3qtVu3t4yw qLYtRdpaOdJe/hyEc+SwJI7TPT5Wlb4aPIbTVyDJS1nLx2ve+TwRkHgVlGDCa+DD2f+r SkOVIriryqI3/lB1KLkvhp0Dv7RXMEvagxoL14TSr0MrlzTFiK2/8hAY35El5FmF+emV 0Zd1w5aSA934Y8Pblgxv4RJ0YdU1Pt9l90DE8U2THUF/LkBAxq/bvgSZKlKeUreJYMVS q4lIALaSiQPoJdVFesXGu9DrRtY/aAUgKRkXPZklv6Ozqc9gb3G7A5BVjTLQdLfEnXt8 QncA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pJepCDDjH75/uWHDDivMzZDUOrrWvtTRC/L2uATjKKA=; b=Z2KryQtI7H1ka0qf08DkSAps54wXtBL0lSsW13aCwXG4CYfXW9gGiQqjlytPVmNnKB t3ZWSeGjoKJ8Bup2TJl8kb0KBRxLJtW2BOMaSCxGT1SBQ3BaKQ4PEQjAWUrcYQsUqR9R k0/dGgUK718ZDrWbO7f1wb2zBb3B7PWm1X+fWCD2IVJslD3HKzWTNQOtaqY5TfNpsrvZ kowsZQZ6i7gKmD1/ZfOpP4+R2SWD/tem2JR+sXU0q/2TH09nlDDsAPpqR2VdF620EwGq zpip2Fmklp1biPnjNegYEULEq2RrxMyyvMddiiNzbpV3L80VKjxek+cbJBhCORX/MEqf 6QoQ== X-Gm-Message-State: AOAM5330iL39DZyMRUw5YChafC+1fkZt5BhIygYziSV84YHYuW/zfH6t i9zwGm8rKZtGKDb2tE5hba5O4mYNUnYVkQ== X-Google-Smtp-Source: ABdhPJzfj2UBvYPq5JHHR9uvTYVB8jwgaCW0lNkN9sQOF0Td8A+vvGNa791+gya2NwXeffC5k59dug== X-Received: by 2002:a17:902:7890:b0:161:572a:2494 with SMTP id q16-20020a170902789000b00161572a2494mr5770175pll.123.1652988602423; Thu, 19 May 2022 12:30:02 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id f62-20020a17090a704400b001dcf49d92a1sm177894pjk.28.2022.05.19.12.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 12:30:02 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 3/3] systemd: Drop 0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch Date: Thu, 19 May 2022 12:29:57 -0700 Message-Id: <20220519192957.1129486-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220519192957.1129486-1-raj.khem@gmail.com> References: <20220519192957.1129486-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 ; Thu, 19 May 2022 19:30:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165907 This patch was effectively needed when usng gold linker but it has been fixed in binutils [1], it was seen in systemd as well [2] This however, should not happen with latest binutils and systemd has already reverted the fix since it was a tool error [1] https://sourceware.org/bugzilla/show_bug.cgi?id=18548 [2] https://github.com/systemd/systemd/issues/234 Signed-off-by: Khem Raj --- ...S_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | 33 ------------------- meta/recipes-core/systemd/systemd_250.5.bb | 1 - 2 files changed, 34 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch diff --git a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch deleted file mode 100644 index f4066d7e4fd..00000000000 --- a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8bf23d7a698bd3253b0cfba24bd8afd0886d82d Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 15:18:00 +0800 -Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP - -for currently unknown reasons they get exported to the shared libries -even without being listed in the sym file - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -[Rebased for v241] -Signed-off-by: Chen Qi - ---- - src/libsystemd/sd-bus/bus-error.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 61928f4bf3..79b698b092 100644 ---- a/src/libsystemd/sd-bus/bus-error.c -+++ b/src/libsystemd/sd-bus/bus-error.c -@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { - }; - - /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ --extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[]; --extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[]; -+extern const sd_bus_error_map __start_SYSTEMD_BUS_ERROR_MAP[] _hidden_; -+extern const sd_bus_error_map __stop_SYSTEMD_BUS_ERROR_MAP[] _hidden_; - - /* Additional maps registered with sd_bus_error_add_map() are in this - * NULL terminated array */ diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 2f5b9d1367e..c121fb763e8 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -44,7 +44,6 @@ SRC_URI_MUSL = "\ file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ - file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ file://0021-test-json.c-define-M_PIl.patch \ file://0022-do-not-disable-buffer-in-writing-files.patch \