From patchwork Mon Jun 6 14:38:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8928 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 7FC3CC43334 for ; Mon, 6 Jun 2022 14:38:55 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web12.32696.1654526331892407768 for ; Mon, 06 Jun 2022 07:38:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NFjVULDf; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id q12-20020a17090a304c00b001e2d4fb0eb4so18009680pjl.4 for ; Mon, 06 Jun 2022 07:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=tE0MrRMKIilCB9PbxRMTWahrL7JPFxwoervX0M4CACM=; b=NFjVULDfTiH6MmCxPcUOFOfGXFIQBXfHuoLBrzDgzdW3Cnx5nwv/88mlJLr9Mb/m8J 71fgcm9sRt47XDyAAV0OLIVIRy0PV6eW+kwSssmSb+rlv3wy1VS7vBXxBEFtmFZTlpxD dkKT6jrmbvA+XqE5ZMIu3XYT7zHS28sUw58RkU4NEXZoFY8Uf3pdiZ3Fppg9Dqhz198Z 1vKeadLHUpQeGuu2cyvH10B88vD9RcqTYuNNBbUlcSVgfd9ywAKqJvPSxFLM0Ho4lug9 MGy4afZDoooxqomxUK//QfuN0qTHIvgwJ5xeNy7y0xXTKv8U3MDjP3DvN0z4Q5BuVwYt zOOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tE0MrRMKIilCB9PbxRMTWahrL7JPFxwoervX0M4CACM=; b=JqwPyh/+nniipndLJgRXxq3QIO/YO7mlCtnCMdkJ+5FQp/ChYYv92zKaoYU4lxJtJ9 NnH3S3PfkMtPEV5A+3s3F4jQXHaIlO4VHNH3Q2CopPIfVorY9I8kM2n29AOKXugGEUAH iruSeeIyuZ5I+j5VNjoey996UjGTa1dH9HNIsVk+5XfxbV0oA+kefJyNpgEHM3a08Ri2 5rS5Ac5ncLwuwVBgaDwy2IMVKwNRMGRqp9PDCs58reTBTwYGKE3SFG2AfOVb7Ga2ARDW 1jr3uCLc/QlhFZLozt2yySItlrD7Eyi73q/bckHuJSB5upe52NpiOL0XDeu6bQqMGCAV hMTw== X-Gm-Message-State: AOAM533K50JOBGDLdNwi/GSEfTuC0WDH2rbJM5rtOfCmefLth71KG2Ia NzZysAXaQRaczjFuXUMsNr68iOhZAvchIZxg X-Google-Smtp-Source: ABdhPJx6Adolmwa1LAk5DPBapbqJe8Olj8EdUm3Q9F/LSR0NWgYQKm+hdXWUxNQWxXaFBkb+ILaDuw== X-Received: by 2002:a17:903:230b:b0:167:5310:9eed with SMTP id d11-20020a170903230b00b0016753109eedmr15853149plh.46.1654526330309; Mon, 06 Jun 2022 07:38:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.38.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:38:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/13] systemd: Drop redundant musl patches Date: Mon, 6 Jun 2022 04:38:19 -1000 Message-Id: <5420919e3e5c1e4b816c60a5b1ddd7da44cd6905.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:38:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166634 From: Khem Raj 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 Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 216fe2b8e53640ae5794e9426de56cd87637dde4) Signed-off-by: Steve Sakoman --- ...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 5ee212a4e7..0000000000 --- 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 662f8110db..0000000000 --- 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 70ac8b607c..0000000000 --- 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 e5a2f65202..2f5b9d1367 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 Mon Jun 6 14:38:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8927 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 80545CCA481 for ; Mon, 6 Jun 2022 14:38:55 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web10.32817.1654526334092913265 for ; Mon, 06 Jun 2022 07:38:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Q+h+52eH; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id d129so13047473pgc.9 for ; Mon, 06 Jun 2022 07:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EiGX45rjDHYq1GjyPkr7JkUoxncyKY8b696LrL3SloI=; b=Q+h+52eHdXpn0+Qebvc2WUfRo+dIml6DMB/rFpmSMTJIxJuXnVyo6Rsctv4wpEGckl zmK4PxaQFfwWvJlVidRa/xpD8sL8lNLO1dUOaR71IXyp6O6zZFvC3qVF79r0L8RQg0rb hnVGyMz/bSPiNsgAhEPf6G3R1enW8lk7uRrhk1FwQ0D8KPi53Hc5bsY13YGNEBop19S2 COiskoxEGaC2H6/TiP1EISdRxINdj97Vj4grzj+KENNoLBpQ+jy+6ArR+D4blUEBtYYt Kj28luqQWXlTa23UN9vcYByOmMavQR6UPdOagUmmq965hv8Cdh3pl/NmckY0qLgQgzC3 J2KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EiGX45rjDHYq1GjyPkr7JkUoxncyKY8b696LrL3SloI=; b=CLlZf17AYBBPLeC0JyL5a0N5X25ulKARFS33vmjDsS3QfoV4ghhC3gIN9kd8FyU6g8 /hvyiZESKAtjs1p8Pm6ar/e2VoR/o4GJPDZuq21WgYPhj0LLqP0rWigSgcFksqRH4WrO 94zj6BTylvDbNN5z/PZvVEwNN6PFm4j2nwMhouVuEhNhe/v4J4OUOCzGIYabYgd5n6c6 lWwNNlutT72n6iaYhBJrVHzzqjN4tFZ1CzedUBuT4AjvNSUy1o0v51V+ylPRrP8Enhg+ q6efn0ZZrWNRtEeWMvn2Y/kI33k2tWNfYiUmlqKSz7GkRJjjtETOND9PD5n+qbBOjSc0 0NFA== X-Gm-Message-State: AOAM533iKjM8xM/bQr4+7orEpPTs446bRUDEYkjIBk6TaqyK76KZ5cmG CiHhC9jh8YWPx5XXwOHiwADV+aMs20RhwCzB X-Google-Smtp-Source: ABdhPJwiZ4PKPjdFUIMZPfDK7rQ1KCbedQ9noJpniP4Lr7vNLxfTqY7VBuWur4K7H6RvYD2tJtMNXQ== X-Received: by 2002:a63:797:0:b0:3fc:da19:45a7 with SMTP id 145-20020a630797000000b003fcda1945a7mr20391236pgh.326.1654526332943; Mon, 06 Jun 2022 07:38:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.38.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:38:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/13] systemd: Document future actions needed for set of musl patches Date: Mon, 6 Jun 2022 04:38:20 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:38:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166635 From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 433d51c3840d03623509ce8e3a1b3679f8771164) Signed-off-by: Steve Sakoman --- ...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 18fcc6e48c..dfe4164900 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 59bd81c76f..4cce9a3fe6 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 1fb84c7090..e7b7269f95 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 cc20c3710a..82a01f732e 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 Mon Jun 6 14:38:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8931 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 62BA6CCA473 for ; Mon, 6 Jun 2022 14:39:05 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web09.32821.1654526336879000736 for ; Mon, 06 Jun 2022 07:38:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=yCrDbtYE; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d22so12242951plr.9 for ; Mon, 06 Jun 2022 07:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=976X42LxbSydfTIiyhHGLBB72C4ZGtfkTLUss341mbM=; b=yCrDbtYETZee1wVZsPphhoEOAKeK7MOVW0X+VUmFVMAhmZdTKf7/WbxR6+shIKJLXY /I7oX/oXAigkyyUEeM9+KfO2CHUvkiv15NdiGKKAGEEdxEBesvmib+KAb1GgzpzdWOhz B34bMd5z3dsLLGohotCKnD9XuH9sUYVaY5Ja6/YZTbsmhBQ0GuVPwtQShajNqJTEVxjU RVQNgorwwFouB5jj7yhRmD6bKgRcYjuUvhiOQV1EYnNlen0PeBKNiN20yqqEQWHg3Rjv lpQ46qZpR/2K8X24Wjs1ufMuk+kRUYDbWMW1QKRXnqiFBHbwmaVJZe1ygYXOS3h8PIbn bNRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=976X42LxbSydfTIiyhHGLBB72C4ZGtfkTLUss341mbM=; b=7lSueOtN5S0Jk7eAnxA+AD73gv6IwoD4M7ihnsROxoIsmJ5hYkpt98mH/qY3q6KM33 rz1oq8Nx5Plw3ng2My+6DXHXG5gNM7+5Q/+mDsDy8CztArudoKvUQCT1dJVBv5wbS1xW bVUxvd0WqT3UvCt3kiGB+koFsNxPWRm60aYWvulciETOJlDALVvXGnZxnBVGWaZfef3K pWERogucIdBICVqYVFz+D87TONmJ4oSHKS7nNbBTUzBW3mCNu7BG+piouEcyEQ7zlI9r xDfrHvAeI3C5modMA25+uRzoqRapB0q88y708SduAFgVHHFQEQQYOwYG8NQl83fKNiWO QCRw== X-Gm-Message-State: AOAM533pNHh4WOYssD2yumX+tSYxQXlS/4RZsHlw41cUF//rC54Po4dJ etLIaB7WWCxi4d29fa8HiiPKu8w0VmgkIS78 X-Google-Smtp-Source: ABdhPJybS5kJXlwSE9ly1KYscpX2tPgd1lcI+3EBcD2UScfqDsj2C3OzgwpLhnOvAd1Cf5Op5wLaxw== X-Received: by 2002:a17:90a:448e:b0:1e0:901b:1b3f with SMTP id t14-20020a17090a448e00b001e0901b1b3fmr27245938pjg.95.1654526335568; Mon, 06 Jun 2022 07:38:55 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.38.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:38:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/13] systemd: Drop 0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch Date: Mon, 6 Jun 2022 04:38:21 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166636 From: Khem Raj 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 Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e57707e820f548b3ad940ee6de9e45b4de869565) Signed-off-by: Steve Sakoman --- ...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 f4066d7e4f..0000000000 --- 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 2f5b9d1367..c121fb763e 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 \ From patchwork Mon Jun 6 14:38:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8932 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 6F52BCCA481 for ; Mon, 6 Jun 2022 14:39:05 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web10.32817.1654526334092913265 for ; Mon, 06 Jun 2022 07:38:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Vadi13Br; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id d129so13047473pgc.9 for ; Mon, 06 Jun 2022 07:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fZSaPmhm08ZXUBnvAlddUjXPOGdK4wfbx6/k2n1q7IE=; b=Vadi13Br1tlRs2zK+QtSBnmUV7bg1z+D2EVMChUmRTAVlq87koav5s1yXMAzOE17Q+ R1TBeONVUCkA9+hcHNeULRZhQVD4JSNRzYvHaSeqCISbFRSvF0fek9MSYI6XwCgBd+WZ wd4k2xoRC3VpFV7b+sPhS8dVfKkal2qEylYfm9UOVxmhrEVIqjeMSUIXH3Jx6zUgNTlC 3879HVXrbK2/L8n4+JQlMohguWK/RZ9+ZHDlEztgQKEMB0n6sAOdssFcmDL2X4ap+qMp vhNhbDsChSh+KZaLCdI1qgpQL8SehT3gY/FH7ep7E6L6HD4RqnkPLKN/lR5hhqPV/hvq CQow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fZSaPmhm08ZXUBnvAlddUjXPOGdK4wfbx6/k2n1q7IE=; b=HyyqRGovET3XmAojbKF4AwB29GzhHX4n2LKOXx4xks/zgegWTHGx9XFeJS/7eqlxpp PydFtVRhzYgME8869myPUBZwwfEwPTvjcpayxqcnWc0uXaIfsTMawROAVHOARpq0hST2 Lbll0PT0rqZBXg7gsBrQLsO8ZOu2lYGvjExLaQH7ill9BIHB7GkDIMpZVD3msNZWzbPP UHzk7Uwk0cZbdqOUMYadK5dAwmdzJwlQNDzwA2gL2SZ7Vv0ZBjPTIBndejl5cPHSoBB0 SWsZvKEAIXDhjkTwaFOpvXqkvk1nfgcHMFym6Ii/TI7M/rx+vMt8IJGupD06EueVvFBx 6kaw== X-Gm-Message-State: AOAM5328QuTh/mPHeHv4pcHS68YOfr5J177vrqQJkj70MZ6ajuVoWhhl nb9Ivy2Wr49qwJdYh0nMJ2120PQKNbwAgUnZ X-Google-Smtp-Source: ABdhPJz699IMsDQpkdUmgFoGNUUg0/qevKc4f5QNRN6QeV031ZDL00G8UCq9ODV4ld4ACZIV9q97ew== X-Received: by 2002:a65:580f:0:b0:3fc:ffa7:9a66 with SMTP id g15-20020a65580f000000b003fcffa79a66mr17700931pgr.332.1654526338423; Mon, 06 Jun 2022 07:38:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.38.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:38:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/13] systemd: Update patch status Date: Mon, 6 Jun 2022 04:38:22 -1000 Message-Id: <06c8bdec050e791b7eb4be0f13b8e91fdc193253.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166637 From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 2cdfc505ce4e00ae9b4abd962c60c9fec6c3db6c) Signed-off-by: Steve Sakoman --- .../systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch b/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch index 15413d7a0b..8cf0546450 100644 --- a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch +++ b/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add sys/stat.h for S_IFDIR ../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR' r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR); -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23441] Signed-off-by: Khem Raj --- From patchwork Mon Jun 6 14:38:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8930 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 62B70C43334 for ; Mon, 6 Jun 2022 14:39:05 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web12.32700.1654526342155868007 for ; Mon, 06 Jun 2022 07:39:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=YYh1Wsk3; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id q123so13061310pgq.6 for ; Mon, 06 Jun 2022 07:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uxYDRepy19ho45UGnfPN37ye2v2ZV/88OLE1o6xXfrM=; b=YYh1Wsk395vvudN0aNABlLOE5AcEH5i56ztewbo61WoVK8Q/AvNHMoqTUaxzV0QWYA sZM7fbzi5Hlm0Nb0K7nbaUmHEi2rANv+J/w/2xscQB7vmHII5pbocueNcAC1xa2uxQPC /fl1rK0jEdZxzCgRQL/hyaaSnIx/1buDtLGosMUVpe9jVSjZMTLnZTW6h7uYGVCcgAqr uL0t4uBIJcLTDUlScYK6Ee5yy1vg2SwPamktaYhm/qc2Sw8buHEOU+S/6JdWi9ZjqvfT D0zniaez07RgvM8tdOK3o4ZK8EyAnNp4/XI1CI1H01ld03swMbRo9Xs92oPklMZPLSHD HZIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uxYDRepy19ho45UGnfPN37ye2v2ZV/88OLE1o6xXfrM=; b=YrSARQFn5Ie5kGvYRn+iB6rCM715pi5HZZ5UX6dIgHNfW9s88++MR24LRWqBA/fuNS sKVCjz1GfSmokP72WJ+zKrEHY2r8mmuAhzivflGyA7dD38cXYs3asOKGBApk1BVzhgjV XndtDzQsd++Ztrcrny1ioDnB6mc5YGLVRchQ2HTaUOTF/ZD7e2vwtIfUioOqRiVmkpD0 gMNBKNUBOdw7Vm+T8K/O5PGpO6D4gGhmAhj7xJrqmfZVt04RyKO3lfK65MRhlTybL8xD 9hvEOfFgnb2g6y10L28A1iMA8VrlDekWlYH3bBut3pVPI7OyIQX67hW8HiKbPu7qX+KO La2A== X-Gm-Message-State: AOAM532aZuw+ero0KPzEoS41xxN7BeDWtXx42CKQzQvFhv2ZQdoIVgoU tO5YL0TJJ23S17gPakLRPhrCqYytL4O1G9zZ X-Google-Smtp-Source: ABdhPJzjFQx2rU/ZsCgTqYtjxbuKxMU6LZpzyJ3yPz7+hgzAHf7opsGibJAhZbdHGEAVjydQb88pqA== X-Received: by 2002:a63:88c6:0:b0:3fc:aa43:7e3b with SMTP id l189-20020a6388c6000000b003fcaa437e3bmr21028669pgd.567.1654526341114; Mon, 06 Jun 2022 07:39:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.38.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/13] systemd: Drop 0001-test-parse-argument-Include-signal.h.patch Date: Mon, 6 Jun 2022 04:38:23 -1000 Message-Id: <752f51e0a5960a0105b7c1a300406d1aa5049b5a.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166638 From: Jiaqing Zhao This patch has already been upstreamed in commit systemd/850f0008bff7 ("test-parse-argument: Include signal.h") since v249 stable release. Signed-off-by: Jiaqing Zhao Signed-off-by: Luca Ceresoli (cherry picked from commit 25d8defc806ed760d371423a7ef99bd872462d1e) Signed-off-by: Steve Sakoman --- ...test-parse-argument-Include-signal.h.patch | 27 ------------------- meta/recipes-core/systemd/systemd_250.5.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch diff --git a/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch b/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch deleted file mode 100644 index 898e8af904..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-test-parse-argument-Include-signal.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 93c7e482d39cf7765974b3c729d29c1b120a60e3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 24 May 2021 18:26:27 -0700 -Subject: [PATCH] test-parse-argument: Include signal.h - -Fixes -src/test/test-parse-argument.c:49:29: error: use of undeclared identifier 'SIGABRT' - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19718] -Signed-off-by: Khem Raj - ---- - src/test/test-parse-argument.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c -index cf3d54288a..15104e5282 100644 ---- a/src/test/test-parse-argument.c -+++ b/src/test/test-parse-argument.c -@@ -5,6 +5,7 @@ - #include "parse-argument.h" - #include "stdio-util.h" - #include "tests.h" -+#include - - TEST(parse_json_argument) { - JsonFormatFlags flags = JSON_FORMAT_PRETTY; diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index c121fb763e..aca140d4d4 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -24,7 +24,6 @@ SRC_URI += "file://touchscreen.rules \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ - file://0001-test-parse-argument-Include-signal.h.patch \ file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \ " From patchwork Mon Jun 6 14:38:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8933 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 6A3C2C433EF for ; Mon, 6 Jun 2022 14:39:05 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web08.32823.1654526345060074496 for ; Mon, 06 Jun 2022 07:39:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WsB1g7Tx; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id k5-20020a17090a404500b001e8875e6242so1969103pjg.5 for ; Mon, 06 Jun 2022 07:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zjxsh8ECpL4XqWfu0dR3V7Cyds/HOyEO+p5e2M39nw4=; b=WsB1g7Txb37lzuojzPT2CGuGGqjD90fKiGiq1CkM1s3z8vxzOkmz/tyftDK7QIjebN RsBru+BLVJnutpn0CeejazsdpBpJh3m1iuB72QzcQON3BP9gnauaCb4mhreryaWODQlW L/OL61T2012NxUIrM8IQAufPiQVyTvTKRnMjeCNS3iPRt0o4rZq+CQKYfzrFWPJs7asN clHhfyu/w1sr16KdmhFb4YboEKX8lAcy2tXtalqUVkMhvsAotYzPg8ZoAIzYjIHFjvSy KoGI4b0/ZlAzIvbEUeuYCs4qPanI1lmm5JkjvZnDlL4NWolkHb8Xqh28YI1jjANlLnDS 8x8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zjxsh8ECpL4XqWfu0dR3V7Cyds/HOyEO+p5e2M39nw4=; b=NSOcYCiXBA+GfFe+1HPz0twaHxchl7rR5FTxc8Q+Gfx1oEMZ6BFurc2ID4Ytory/UK nVaGkiczCs8sktlxtloB1XwA3nmzHOnYKX4wQX/MqmS9U8yGkZm1AWVGWovbibDn1ltj LdhG8yiRO2Q9wp+CAiQLlawO/xgd4/Qyu5iz2GK9/MA4IA+Hzqt3Vn6sD6seNHi91jXv mRTW35A4G4yrHNXEqkOxlUZGQu6/YckWRH9CbN4bB+A7YcgddpNUu3+EpOG4cpf7d+c9 dFcrsksCrMIyi2/AjWHNOYrinTm2R0X7oNKxFu4DQMIYLIjTxKZQu50c5Q2uKpnv/qAj 7gVQ== X-Gm-Message-State: AOAM530o28mOYzDZoMl2W2T17mH/+xKO2Nvm+OuYn1xIEqcIo8BupUlA GpaBxqxSzRbfx3EsatDykd2ZGU2TIJEV4e6K X-Google-Smtp-Source: ABdhPJxVX17AmBqKsehsnZ8yzsopYYUfXilXpB7edkl5Utw7WT4KK64EYv77tfTHMFe++J/y3wOt9w== X-Received: by 2002:a17:90a:d01:b0:1e0:2e32:8650 with SMTP id t1-20020a17090a0d0100b001e02e328650mr26556566pja.156.1654526344005; Mon, 06 Jun 2022 07:39:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/13] systemd: Remove __compare_fn_t type in musl-specific patch Date: Mon, 6 Jun 2022 04:38:24 -1000 Message-Id: <2b09a567117be0c048ac9a1c27cfae8cc1418b66.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166639 From: Jiaqing Zhao Since systemd v250, commit d8f16737005e ("sort-util: avoid using glibc's internal __compar_d_fn_t type"), __compare_fn_t type is no longer used. This patch removes that type in the musl-specific patch. Signed-off-by: Jiaqing Zhao Signed-off-by: Luca Ceresoli (cherry picked from commit 89c8a3f96dfeb444213fd6c523e1495c49065ccc) Signed-off-by: Steve Sakoman --- ...-missing_type.h-add-comparison_fn_t.patch} | 44 ++++++------------- ...missing.h-check-for-missing-strndupa.patch | 14 +++--- meta/recipes-core/systemd/systemd_250.5.bb | 2 +- 3 files changed, 22 insertions(+), 38 deletions(-) rename meta/recipes-core/systemd/systemd/{0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch => 0003-missing_type.h-add-comparison_fn_t.patch} (61%) 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-comparison_fn_t.patch similarity index 61% rename from meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch rename to meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch index dfe4164900..c28c8381e8 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-comparison_fn_t.patch @@ -1,13 +1,9 @@ -From a4f51ef07375466f79cb148ff1178ed11f808f0a Mon Sep 17 00:00:00 2001 +From 5513b918d02900a3a78fd0e0300a118b163edfef Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t +Subject: [PATCH] missing_type.h: add 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 +Make it work with musl where comparison_fn_t and is not provided. Upstream-Status: Inappropriate [musl specific] @@ -16,19 +12,19 @@ Signed-off-by: Alex Kiernan Signed-off-by: Chen Qi [Rebased for v242] Signed-off-by: Andrej Valek - +[Rebased for v250, Drop __compare_fn_t] +Signed-off-by: Jiaqing Zhao --- - src/basic/missing_type.h | 9 +++++++++ + src/basic/missing_type.h | 4 ++++ src/basic/sort-util.h | 1 + - src/core/kmod-setup.c | 1 + src/libsystemd/sd-journal/catalog.c | 1 + - 4 files changed, 12 insertions(+) + 3 files changed, 6 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index f6233090a9..aeaf6ad5ec 100644 +index f6233090a9..6c0456349d 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h -@@ -10,3 +10,12 @@ +@@ -10,3 +10,7 @@ #if !HAVE_CHAR16_T #define char16_t uint16_t #endif @@ -36,13 +32,8 @@ index f6233090a9..aeaf6ad5ec 100644 +#ifndef __GLIBC__ +typedef int (*comparison_fn_t)(const void *, const void *); +#endif -+ -+#ifndef __COMPAR_FN_T -+#define __COMPAR_FN_T -+typedef int (*__compar_fn_t)(const void *, const void *); -+#endif diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index cb448df109..fd738a65ab 100644 +index 02a6784d99..0b33c83d59 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -4,6 +4,7 @@ @@ -53,18 +44,6 @@ index cb448df109..fd738a65ab 100644 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that -diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index d054668b8e..d3bf55acbe 100644 ---- a/src/core/kmod-setup.c -+++ b/src/core/kmod-setup.c -@@ -10,6 +10,7 @@ - #include "macro.h" - #include "recurse-dir.h" - #include "string-util.h" -+#include "missing_type.h" - - #if HAVE_KMOD - #include "module-util.h" diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c index 8fc87b131a..36a6efdbd8 100644 --- a/src/libsystemd/sd-journal/catalog.c @@ -77,3 +56,6 @@ index 8fc87b131a..36a6efdbd8 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", +-- +2.34.1 + diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 4b1fac06b5..680930ca3c 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,4 +1,4 @@ -From 55d48dd81e57add5b2d4b5a7d697c575a0f37ef5 Mon Sep 17 00:00:00 2001 +From 106b7bd7186c9d6c1dcd72bd4ca6457d3fa72d0b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 Subject: [PATCH] src/basic/missing.h: check for missing strndupa @@ -17,7 +17,6 @@ Signed-off-by: Alex Kiernan [rebased for systemd 244] [Rebased for v247] Signed-off-by: Luca Boccassi - --- meson.build | 1 + src/backlight/backlight.c | 1 + @@ -74,7 +73,7 @@ Signed-off-by: Luca Boccassi 52 files changed, 63 insertions(+) diff --git a/meson.build b/meson.build -index ae53345260..8c8a6c9bdf 100644 +index cb9936ee8b..7ab201c6d9 100644 --- a/meson.build +++ b/meson.build @@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] @@ -310,13 +309,13 @@ index 0b20d386d3..fccfb9268c 100644 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index d3bf55acbe..63dd807b8a 100644 +index d054668b8e..9b4caa7651 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c -@@ -11,6 +11,7 @@ +@@ -10,6 +10,7 @@ + #include "macro.h" #include "recurse-dir.h" #include "string-util.h" - #include "missing_type.h" +#include "missing_stdlib.h" #if HAVE_KMOD @@ -705,3 +704,6 @@ index 1a384d6b38..0089833e3f 100644 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") +-- +2.34.1 + diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index aca140d4d4..6d6b3f2ded 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -31,7 +31,7 @@ SRC_URI += "file://touchscreen.rules \ SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" SRC_URI_MUSL = "\ file://0002-don-t-use-glibc-specific-qsort_r.patch \ - file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ + file://0003-missing_type.h-add-comparison_fn_t.patch \ file://0004-add-fallback-parse_printf_format-implementation.patch \ file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ From patchwork Mon Jun 6 14:38:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8936 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 6CDCBCCA481 for ; Mon, 6 Jun 2022 14:39:15 +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.32825.1654526348076625761 for ; Mon, 06 Jun 2022 07:39:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CxMAE09i; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id f65so2864131pgc.7 for ; Mon, 06 Jun 2022 07:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=thSoOnSZhfC02GllMr107rI4G5cT2o/mkGL6dGRsCVs=; b=CxMAE09iZr3JXSpDNFukU+C0vzRImh7d097m9Y5o5LZ9Idl15//s9DTz7x3PHO1gT8 hWOoHXzGrTEWcJrD/3dQQvK7GmmARDlkqLMZH74tzKxNAlpdwhLGVRAxTh4fwpYtI4v5 +6RJKlsHpK4C82I9SjvKDlmTIk8yazqqB2mSGjC8fanEFaSold1xznU7nOQk/ODweqE2 5m3jD5Cu3xHoFPEY/7plYSRR4SaVUqYBVPQ6fAnksui3QUpml07LRNHfIz/bkT5IGNsM GmYj9CpPxIGILxsvbzqAUCvvPX+S2Vpnyemq9dfWbBgnYelz+ErYx7hkt73zjXyMuRln 2pUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=thSoOnSZhfC02GllMr107rI4G5cT2o/mkGL6dGRsCVs=; b=CW3F3CRL1yspMsig+SQhuFecnO0GPRpIIhhL8KNLTbO/ZZH4rpAlMZYiPL75f9Geje 7Bl+lGu+ridqnuADjobmT4UY1tcy6H8jyEssBblaN4V4naUUg3M0ziDNQ0P5X24EAN/o ivROVFpYybpJfBPUMgxZas9XvJ+Iq0487VLKRr4DXrJTCY9EJYGfBGms9owoK5hxPUtV QeY80uinS8zDEOeC27A+Scc0JFQfx5va8VShO+WISa5/i2KsEITJ+ba1xdbKZ7Ldh5oq MBPUmVLT6I8xh+YFLg06x/N0mwuKj0/Pt7+HQiCv8F+LoscD44HLnlWiFSWQOJhI+/Ao LlVg== X-Gm-Message-State: AOAM531Xqd/aqDnXuZryHvVAtBvCLaWH9nTRFr8TmOraGnfrGvf5F8Yg jbhLiBWSPEgcBpWnloXKxwVuWm+OtCdrfqIz X-Google-Smtp-Source: ABdhPJzYnuM4oVx+fhzulo8IWUouZBNiJgLKR9iw509t5eClPIWWDSS+wLwlkHd92Js00I3tX0dG5g== X-Received: by 2002:a63:8449:0:b0:3fc:85a5:5b69 with SMTP id k70-20020a638449000000b003fc85a55b69mr21157457pgd.261.1654526346814; Mon, 06 Jun 2022 07:39:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/13] systemd: Drop 0002-don-t-use-glibc-specific-qsort_r.patch Date: Mon, 6 Jun 2022 04:38:25 -1000 Message-Id: <80980314ec2181e0716964b66867e8bb8a873214.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166640 From: Jiaqing Zhao musl 1.2.3 implements qsort_r function. Signed-off-by: Jiaqing Zhao Signed-off-by: Luca Ceresoli (cherry picked from commit 0c2bbf66c7a00268457ac10fed4bef3714da8651) Signed-off-by: Steve Sakoman --- ...002-don-t-use-glibc-specific-qsort_r.patch | 163 ------------------ meta/recipes-core/systemd/systemd_250.5.bb | 1 - 2 files changed, 164 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch deleted file mode 100644 index d109860e1a..0000000000 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ /dev/null @@ -1,163 +0,0 @@ -From c542d2d93cf536e91d4edb8791fdc0de732b0a52 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 13:41:41 +0800 -Subject: [PATCH] don't use glibc-specific qsort_r - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Khem Raj -[Rebased for v241] -Signed-off-by: Chen Qi -[Rebased for v242] -Signed-off-by: Andrej Valek -[Rebased for v247] -Signed-off-by: Luca Boccassi - ---- - src/basic/sort-util.h | 14 -------------- - src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ - src/shared/hwdb-util.c | 19 ++++++++++++++----- - 3 files changed, 38 insertions(+), 31 deletions(-) - -diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h -index 02a6784d99..cb448df109 100644 ---- a/src/basic/sort-util.h -+++ b/src/basic/sort-util.h -@@ -61,18 +61,4 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, comparison - _qsort_safe((p), (n), sizeof((p)[0]), (comparison_fn_t) _func_); \ - }) - --static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, comparison_userdata_fn_t compar, void *userdata) { -- if (nmemb <= 1) -- return; -- -- assert(base); -- qsort_r(base, nmemb, size, compar, userdata); --} -- --#define typesafe_qsort_r(p, n, func, userdata) \ -- ({ \ -- int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ -- qsort_r_safe((p), (n), sizeof((p)[0]), (comparison_userdata_fn_t) _func_, userdata); \ -- }) -- - int cmp_int(const int *a, const int *b); -diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index b95680b365..5ffa208615 100644 ---- a/src/shared/format-table.c -+++ b/src/shared/format-table.c -@@ -1324,30 +1324,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t - return CMP(index_a, index_b); - } - --static int table_data_compare(const size_t *a, const size_t *b, Table *t) { -+static Table *user_table; -+static int table_data_compare(const void *x, const void *y) { -+ const size_t *a = x, *b=y; - int r; - -- assert(t); -- assert(t->sort_map); -+ assert(user_table); -+ assert(user_table->sort_map); - - /* Make sure the header stays at the beginning */ -- if (*a < t->n_columns && *b < t->n_columns) -+ if (*a < user_table->n_columns && *b < user_table->n_columns) - return 0; -- if (*a < t->n_columns) -+ if (*a < user_table->n_columns) - return -1; -- if (*b < t->n_columns) -+ if (*b < user_table->n_columns) - return 1; - - /* Order other lines by the sorting map */ -- for (size_t i = 0; i < t->n_sort_map; i++) { -+ for (size_t i = 0; i < user_table->n_sort_map; i++) { - TableData *d, *dd; - -- d = t->data[*a + t->sort_map[i]]; -- dd = t->data[*b + t->sort_map[i]]; -+ d = user_table->data[*a + user_table->sort_map[i]]; -+ dd = user_table->data[*b + user_table->sort_map[i]]; - - r = cell_data_compare(d, *a, dd, *b); - if (r != 0) -- return t->reverse_map && t->reverse_map[t->sort_map[i]] ? -r : r; -+ return user_table->reverse_map && user_table->reverse_map[user_table->sort_map[i]] ? -r : r; - } - - /* Order identical lines by the order there were originally added in */ -@@ -2009,7 +2011,12 @@ int table_print(Table *t, FILE *f) { - for (size_t i = 0; i < n_rows; i++) - sorted[i] = i * t->n_columns; - -- typesafe_qsort_r(sorted, n_rows, table_data_compare, t); -+ if (n_rows <= 1) -+ return 0; -+ assert(sorted); -+ user_table = t; -+ qsort(sorted, n_rows, sizeof(size_t), table_data_compare); -+ user_table = NULL; - } - - if (t->display_map) -@@ -2647,7 +2654,12 @@ int table_to_json(Table *t, JsonVariant **ret) { - for (size_t i = 0; i < n_rows; i++) - sorted[i] = i * t->n_columns; - -- typesafe_qsort_r(sorted, n_rows, table_data_compare, t); -+ if (n_rows <= 1) -+ return 0; -+ assert(sorted); -+ user_table = t; -+ qsort(sorted, n_rows, sizeof(size_t), table_data_compare); -+ user_table = NULL; - } - - if (t->display_map) -diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c -index fe4785f3e5..827e1639c3 100644 ---- a/src/shared/hwdb-util.c -+++ b/src/shared/hwdb-util.c -@@ -127,9 +127,13 @@ static struct trie* trie_free(struct trie *trie) { - - DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); - --static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { -- return strcmp(trie->strings->buf + a->key_off, -- trie->strings->buf + b->key_off); -+static struct trie *trie_node_add_value_trie; -+static int trie_values_cmp(const void *v1, const void *v2) { -+ const struct trie_value_entry *a = v1; -+ const struct trie_value_entry *b = v2; -+ -+ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, -+ trie_node_add_value_trie->strings->buf + b->key_off); - } - - static int trie_node_add_value(struct trie *trie, struct trie_node *node, -@@ -157,7 +161,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, - .value_off = v, - }; - -- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); -+ trie_node_add_value_trie = trie; -+ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); -+ trie_node_add_value_trie = NULL; -+ - if (val) { - /* At this point we have 2 identical properties on the same match-string. - * Since we process files in order, we just replace the previous value. */ -@@ -183,7 +190,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, - .line_number = line_number, - }; - node->values_count++; -- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); -+ trie_node_add_value_trie = trie; -+ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); -+ trie_node_add_value_trie = NULL; - return 0; - } - diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 6d6b3f2ded..81fe0c88e0 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -30,7 +30,6 @@ SRC_URI += "file://touchscreen.rules \ # patches needed by musl SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" SRC_URI_MUSL = "\ - file://0002-don-t-use-glibc-specific-qsort_r.patch \ file://0003-missing_type.h-add-comparison_fn_t.patch \ file://0004-add-fallback-parse_printf_format-implementation.patch \ file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ From patchwork Mon Jun 6 14:38:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8934 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 63CADC43334 for ; Mon, 6 Jun 2022 14:39:15 +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.32827.1654526350547988315 for ; Mon, 06 Jun 2022 07:39:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rl7ynGzj; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id r71so13101703pgr.0 for ; Mon, 06 Jun 2022 07:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aJ1yLLJ92tqSnx9rWIRrFltwlNxZGMUKwQ2fGpeb/tc=; b=rl7ynGzjzJ+4+ljaIAprlV3okSG7sU8ZFZZYfY61OdrmYJiRWWU5IwXhYlpl6abPj4 neFkHVyGMPpKGQifoI9AW9Jlpols9n6C28Ik7qSIPReYsO6QUALiuW3HAClZ3bdMc0ls CnWYidQk6/mUaPfIKXzLnMA+4ugeS6w81AX80meBnFsBchhsPSUDLEl02fd55HT7g4hY ihnMdYekjp6v9X2HBvi91VDU8qctOmKIV+bPtur9Iyn0T+tJDWbRP8nZcWqh79gNGIi+ WbIVV1A6SRDKicGrjVTDNQP23ZRrVskfTWeVul2Sr/IQOStZ35N4dVjr/yB9Iw8XcIsE V+Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aJ1yLLJ92tqSnx9rWIRrFltwlNxZGMUKwQ2fGpeb/tc=; b=o0A20J3LQqvQJvUQUiARM76XB6iO6YWVR334u5lAo9zKDpYsuU/57s7sAm6Ggsurvc jLOlBA5Ogd3ii+SdbTRoDwop4TIXvcBnwZ9PxhsOoiP9RuSr9XkSVWWZ87MJOjnIX1db COfA6eJXeCyS9g8GPAUoPUpm8nh311R5PsBtzNQ/sisaLnZAw3/hK8VWJmZgK1jDezqx LXwDb1jnyuYjS4AsJmL7ZUWvepTHvi8fAUNY3ZFeY314eOXDzId4PZrnmh6xV8LdBcXZ 1WWVRibGlMu5oP7oANjEXHo2orjPUXAutgA8FNJmzt5prrAHpPEz3HKCw9pxln0zSu+4 VG2A== X-Gm-Message-State: AOAM530KPfsVfCc48eiKzFGmLBEJP3oiR1ibmHg9yvyJcvA5A1IfYSgx HUMezkQGXa8c4kQyP/I8NFjx+jNaxbFpBnhO X-Google-Smtp-Source: ABdhPJyGDbPwlBaWd7GuL4kuQxKx6vRWLUMiX2ZR/r7RH8JEtd4xAHnSPsxu/S+Fm2YdScF15mg7iw== X-Received: by 2002:a63:305:0:b0:3fc:7f18:8d7 with SMTP id 5-20020a630305000000b003fc7f1808d7mr21256906pgd.186.1654526349531; Mon, 06 Jun 2022 07:39:09 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/13] systemd: Correct path returned in sd_path_lookup() Date: Mon, 6 Jun 2022 04:38:26 -1000 Message-Id: <4851c836529a47210934d865ed6bdc724ed50a2f.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166641 From: Jiaqing Zhao In oe-core, sysusers.d/sysctl.d/binfmt.d/modules-load.d are still kept under /usr/lib instead of /lib changed in systemd v246. This patch corrects the SD_PATH_{SYSUSERS,SYSCTL,BINFMT,MODULES_LOAD} returned in sd_path_lookup() back to the /usr/lib ones. Also updates the patch description and upstream status. Signed-off-by: Jiaqing Zhao Signed-off-by: Luca Ceresoli (cherry picked from commit 8d913ab6db3ae4b2786a64a086d519a40dcb8c4d) Signed-off-by: Steve Sakoman --- ...sysctl.d-binfmt.d-modules-load.d-to-.patch | 73 +++++++++++++++++++ ...se-ROOTPREFIX-without-suffixed-slash.patch | 42 ----------- meta/recipes-core/systemd/systemd_250.5.bb | 2 +- 3 files changed, 74 insertions(+), 43 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch diff --git a/meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch b/meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch new file mode 100644 index 0000000000..31efc4cc4b --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch @@ -0,0 +1,73 @@ +From beb0219b71510bc63aed81d2a970a04349d6c616 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 29 Sep 2020 18:01:41 -0700 +Subject: [PATCH] Move sysusers.d/sysctl.d/binfmt.d/modules-load.d to /usr + +These directories are moved to /lib since systemd v246, commit +4a56315a990b ("path: use ROOTPREFIX properly"), but in oe-core/yocto, +the old /usr/lib is still being used. + +Upstream-Status: Inappropriate (OE-specific) +Signed-off-by: Khem Raj +Signed-off-by: Jiaqing Zhao +--- + src/core/systemd.pc.in | 8 ++++---- + src/libsystemd/sd-path/sd-path.c | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index fc0f8c34fa..65996bbed8 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} + tmpfiles_dir=${prefix}/lib/tmpfiles.d + tmpfilesdir=${tmpfiles_dir} + +-sysusers_dir=${rootprefix}/lib/sysusers.d ++sysusers_dir=${prefix}/lib/sysusers.d + sysusersdir=${sysusers_dir} + +-sysctl_dir=${rootprefix}/lib/sysctl.d ++sysctl_dir=${prefix}/lib/sysctl.d + sysctldir=${sysctl_dir} + +-binfmt_dir=${rootprefix}/lib/binfmt.d ++binfmt_dir=${prefix}/lib/binfmt.d + binfmtdir=${binfmt_dir} + +-modules_load_dir=${rootprefix}/lib/modules-load.d ++modules_load_dir=${prefix}/lib/modules-load.d + modulesloaddir=${modules_load_dir} + + catalog_dir=${prefix}/lib/systemd/catalog +diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c +index ff1e0d5f8e..19a001f47e 100644 +--- a/src/libsystemd/sd-path/sd-path.c ++++ b/src/libsystemd/sd-path/sd-path.c +@@ -362,19 +362,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { + return 0; + + case SD_PATH_SYSUSERS: +- *ret = ROOTPREFIX_NOSLASH "/lib/sysusers.d"; ++ *ret = "/usr/lib/sysusers.d"; + return 0; + + case SD_PATH_SYSCTL: +- *ret = ROOTPREFIX_NOSLASH "/lib/sysctl.d"; ++ *ret = "/usr/lib/sysctl.d"; + return 0; + + case SD_PATH_BINFMT: +- *ret = ROOTPREFIX_NOSLASH "/lib/binfmt.d"; ++ *ret = "/usr/lib/binfmt.d"; + return 0; + + case SD_PATH_MODULES_LOAD: +- *ret = ROOTPREFIX_NOSLASH "/lib/modules-load.d"; ++ *ret = "/usr/lib/modules-load.d"; + return 0; + + case SD_PATH_CATALOG: +-- +2.34.1 + diff --git a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch deleted file mode 100644 index 752824688f..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 58860e0f248576a80ff2af256ba42713c186ae93 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 29 Sep 2020 18:01:41 -0700 -Subject: [PATCH] systemd.pc.in: use ROOTPREFIX without suffixed slash - -This complements the commit -https://github.com/poettering/systemd/commit/b612c26ceb9f56af0271fc9f07c1724d2d260a8a - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/core/systemd.pc.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index b5cc8f9..21dbf30 100644 ---- a/src/core/systemd.pc.in -+++ b/src/core/systemd.pc.in -@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} - tmpfiles_dir=${prefix}/lib/tmpfiles.d - tmpfilesdir=${tmpfiles_dir} - --sysusers_dir=${rootprefix}/lib/sysusers.d -+sysusers_dir=${prefix}/lib/sysusers.d - sysusersdir=${sysusers_dir} - --sysctl_dir=${rootprefix}/lib/sysctl.d -+sysctl_dir=${prefix}/lib/sysctl.d - sysctldir=${sysctl_dir} - --binfmt_dir=${rootprefix}/lib/binfmt.d -+binfmt_dir=${prefix}/lib/binfmt.d - binfmtdir=${binfmt_dir} - --modules_load_dir=${rootprefix}/lib/modules-load.d -+modules_load_dir=${prefix}/lib/modules-load.d - modulesloaddir=${modules_load_dir} - - catalog_dir=${prefix}/lib/systemd/catalog --- -2.25.1 - diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 81fe0c88e0..006b2f86ea 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -23,7 +23,7 @@ SRC_URI += "file://touchscreen.rules \ file://systemd-pager.sh \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ + file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \ " From patchwork Mon Jun 6 14:38:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8935 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 63C7FC433EF for ; Mon, 6 Jun 2022 14:39:15 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web12.32707.1654526352988404146 for ; Mon, 06 Jun 2022 07:39:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XjU6vnHb; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 123so2698287pgb.5 for ; Mon, 06 Jun 2022 07:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2okwH6kziW7zUaGN+18/QSvhT3obrkdRk9fNN6ekuI8=; b=XjU6vnHb3SkrYcSPTjkHtxZLYhCTN6qIC7mSHjKJOgBBimR2njO+Z2NDs7pnI4bE3u wgsFRi19hv1FHV1Btv4dyTNJkBSZPOrUVhFmXXNVEeJQzfbEzI7EyBytnFa71yjnGQ4b +UY081u0LVArX6Y2KK3diOX2AhNQtLY+Nu5sC2r5/F3mAFPuK6PqS+UozpeoH5Cd162k zUyW2Q3XdkhQw5Fdid+fTDWkyFPhWdmV62Pw5gI0KSYr5FDajtxgqHkPWyCp9lr52r8j y/nFEF85tbYhj5u3H6WKzW8jUO9/cGC4N1ZbPdkcZv+hsbLd8rWh0TAQNqC8vP0Vvbga T0Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2okwH6kziW7zUaGN+18/QSvhT3obrkdRk9fNN6ekuI8=; b=wgajWx9l4A5jY+4CCG7bWhC/ir4w/kr7gMrSIkeIDAyAYdd3x8tFs8DXkt+kr0adYs NhXu02whxKZVhE08tt9ohZOmX4UY7nu4ayHI2fydeEc79vvQyW7YzNV4hIZQpbrD71Q3 Y6cCqIJyUJ+lp1JPdfbXsqDBO2qdBNSoGYeseq6w1g9vKq31qcsCWxqwr8CmKx2sdoVA bjWtuv01sPmzCjTfNdW9yMcgq7Lub4mPSNKsEivnhDdye7JckBbJqlgS2jaMefhj0F4A fq9dkkjk+zu25rwcK5eSnV1enpa2ywvV8Bom0i+MUuNz0PQ0blo11KsSNdwWEKB7k0zQ PxQw== X-Gm-Message-State: AOAM531zNN9Bd3ElDRSwwQShXHcTcu8UNn/DqOR201KTjN9JQ1kG8nYK xX8qrr7KwBCGOqoCq7ueky+WVdgZGPTzNiZ7 X-Google-Smtp-Source: ABdhPJzHaIAJ53EjelBDvo84yInuGePCr/IvwXE45IZg/sHZQRlTFqGzrHR/x/wEnQLBinkImElLeA== X-Received: by 2002:aa7:83d0:0:b0:50c:eb2b:8e8a with SMTP id j16-20020aa783d0000000b0050ceb2b8e8amr91096514pfn.31.1654526352019; Mon, 06 Jun 2022 07:39:12 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/13] bash: submit patch upstream Date: Mon, 6 Jun 2022 04:38:27 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166642 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 424f1c24c569afd245463b02ca10c40dad3f8a0c) Signed-off-by: Steve Sakoman --- meta/recipes-extended/bash/bash/makerace2.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/bash/bash/makerace2.patch b/meta/recipes-extended/bash/bash/makerace2.patch index 43cdd04157..abb51a5086 100644 --- a/meta/recipes-extended/bash/bash/makerace2.patch +++ b/meta/recipes-extended/bash/bash/makerace2.patch @@ -11,7 +11,7 @@ moved or are being rewritten. See [YOCTO #14227] -Upstream-Status: Pending +Upstream-Status: Submitted [https://savannah.gnu.org/patch/index.php?10210] Signed-off-by: Richard Purdie Index: bash-5.1.8/builtins/Makefile.in From patchwork Mon Jun 6 14:38:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8937 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 61B37CCA473 for ; Mon, 6 Jun 2022 14:39:25 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.32777.1654526355860694684 for ; Mon, 06 Jun 2022 07:39:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6PycklRZ; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id hv24-20020a17090ae41800b001e33eebdb5dso11890177pjb.0 for ; Mon, 06 Jun 2022 07:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DZkz7CQ35cq8oCmx24tkPVg9f7l7++xUpla3HiCQNPw=; b=6PycklRZLh56N/FJxEKZ5S95nCJxmz0FiNQN4vCuhw8stYzDOh/BAjEFp0CsFtG0Yb 2yUHt2sAJRgkVVYwdUXviR/zzi5prZpn+hM9B0//2HGxEt5aWuloCQ82mAyZ401SKdjK Fau06g9JUk1n3ikAdBsWT6RTWd4JCLwMZuN9ol6fYLhahhJzXMdyq/LeiHIUS26MqB9L C74FYMlsugRB758S5TbTxhQp9yvD0MQLJWKQC+0lFV0O0npNXi9PIJdcq++zSLsykl8P VbZovs1vGyto6WySzbEFwEaDTfkal21lKE4sYpmhrb4MicuZljxjQBAjboZFEdRiLook r18g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DZkz7CQ35cq8oCmx24tkPVg9f7l7++xUpla3HiCQNPw=; b=hMPNZRjgcYpYTK29GofvsqGgHldq29KesrlEaOAyZjrjV/NNi+MpEhXJrgyNwMvzCq XEGeB0H80cQnfUxyjMy+ZgVrAc+nWOfILmnERSRQ6b8DRnF9pjdyAA+lvq7+i3VBwBAg c6KcZecZ6XjqwGgznettkSrVmS8qjk0h0MT8qH9zoklYQK6PUtnfVFwsXWT69+CJw+Ty BjNsoVmeakvi8UKmp5rUbGOfrtYegtEnmIuLINYcy85kkg9wPum0+TeznUTlhTqMGfUY 466jn3DL/b/Cp7PTnXsx8WwJXS6IIMhI6o/NpSLhliQgFskZIBj1FWLbS4mlGZCMASnV dwHA== X-Gm-Message-State: AOAM530JTxVHJ7D7R1uTYDTo0mdLS1xuLfRpi1qXsVMCGGabdkN21jV1 R0afp386dGKZfS3mWbx/+PlMhZL+D1eB/iEq X-Google-Smtp-Source: ABdhPJyuxEZBvCloRM67LMtH+BvaPjupP4h+T7R4ztx4AQg37oIWYrHb9T3zG+Cth+r+lfmve3PG7Q== X-Received: by 2002:a17:902:ef8f:b0:163:d61b:ec98 with SMTP id iz15-20020a170902ef8f00b00163d61bec98mr24662236plb.111.1654526354713; Mon, 06 Jun 2022 07:39:14 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/13] valgrind: submit arm patches upstream Date: Mon, 6 Jun 2022 04:38:28 -1000 Message-Id: <70ce538164480d739bbee88d6065d6c7e8ed01fb.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166643 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 118a68bbe8c87eac77e87db409ce419749b211bb) Signed-off-by: Steve Sakoman --- ...1-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | 2 +- .../avoid-neon-for-targets-which-don-t-support-it.patch | 2 +- .../use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch index 9f1da7bac6..073713c139 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch @@ -10,7 +10,7 @@ implementation. Fixes | cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] Signed-off-by: Khem Raj --- diff --git a/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch b/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch index 5fcfec0015..82b8344279 100644 --- a/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch +++ b/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch @@ -8,7 +8,7 @@ test 64-bit float copies when building for ARM. Allow it to do so if possible, but fallback to C when building for ARM targets which don't support neon. -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] Signed-off-by: Andre McCurdy --- diff --git a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch index adea405213..f15d04b173 100644 --- a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch +++ b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch @@ -15,7 +15,7 @@ over-ride that). See similar cases in none/tests/arm/Makefile.am -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] Signed-off-by: Andre McCurdy --- From patchwork Mon Jun 6 14:38:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8940 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 6D88ACCA481 for ; Mon, 6 Jun 2022 14:39:25 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web09.32827.1654526359322672979 for ; Mon, 06 Jun 2022 07:39:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=JPDZBdj2; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id h1so12241971plf.11 for ; Mon, 06 Jun 2022 07:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lt4tSQzQfNaLL0JkVtfUkHaIuqyYbQvqNCANJZbwxp0=; b=JPDZBdj2NnfolgVQ/goqglAmZvGW2w3Mms5ymOUGMu+ub/XxY4xs/Yn759QF/7ksb3 VyPoi/e8H0q9FYFsJrrBN4JHPEqSdziE98omks5D1DQTB99iH3kQ5vM3qmv45uZ392mD Rx5a0acRyVkJFhsfjIG57+SouIBltzE57ZbtAJm7S/jnLB5Y7+WMqPgTVK2I/xsmYFQ4 DWlpvP8aW6WjrNW997BIEHJZryFC6rzaqa5UWgfZYBTj4nydEjllRoLItD5udXDzAsZu g+HT4DKU5/VyfliGQF/cv3MVuqHNbfV3BmGxaPXE9pYHGblJVzj1GzOgd0riYtyVGtTY 4nmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lt4tSQzQfNaLL0JkVtfUkHaIuqyYbQvqNCANJZbwxp0=; b=56lpozGqZ97V2oxL8RB8GIlAF7PqYEeE++4cXHawVZv/lYbRz4IYfBnKzrAY9r2MJa oMkLQuGTHu6OTns/okJIs5eUXAsAwnRApPLdLYSyw3sF1ZxoyxNXJCYOAVtRNTH6/OhD NEFsB7lcRAJQs9ZasubRkX8gMoBoAVP3iZVuiqL0+8pH/Nhu9w08IEZMP9rZrBAxdP06 1jClglaCjFZKuxX4g3G5LGmf7Znu4I26jBgBQ5pGPD0bh1pgm2C053+47yH5e25F2Mm4 cWTLPvJS1LI3ccyyUZE8pssa8d8NeYR0p3vVPOznhmpV1WkIn2v9zt6xaBFSy8xgtAGK fjZA== X-Gm-Message-State: AOAM5335s47Bi5V/W2iADCsD9AB4auX7cNIgkcNj0q7cmcAUvIretRCG MGOGa1gdGVd1tBWxxkpLvMCpCBQX6Qi7kb0O X-Google-Smtp-Source: ABdhPJwxXucqOMIzv2xWs+URM2qCfr/pjwnQ7JeM3ZvQq8TcKP4yhOFbl6vZGlbDqyruqyErxhKtzQ== X-Received: by 2002:a17:90b:3b4c:b0:1e8:5e4d:ed83 with SMTP id ot12-20020a17090b3b4c00b001e85e4ded83mr12654916pjb.19.1654526357697; Mon, 06 Jun 2022 07:39:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/13] makedevs: Don't use COPYING.patch just to add license file into ${S} Date: Mon, 6 Jun 2022 04:38:29 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166644 From: Martin Jansa * as it uses S = "${WORKDIR}" it's another possible reproducer for do_patch issue mentioned here: https://lists.yoctoproject.org/g/yocto/message/56602 Signed-off-by: Martin Jansa Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 4d5c5af4dc69df39934fe54500b3dac2fb7b8ae7) Signed-off-by: Steve Sakoman --- .../makedevs/makedevs/COPYING.patch | 346 ------------------ .../makedevs/makedevs/makedevs.c | 4 + .../makedevs/makedevs_1.0.1.bb | 5 +- 3 files changed, 6 insertions(+), 349 deletions(-) delete mode 100644 meta/recipes-devtools/makedevs/makedevs/COPYING.patch diff --git a/meta/recipes-devtools/makedevs/makedevs/COPYING.patch b/meta/recipes-devtools/makedevs/makedevs/COPYING.patch deleted file mode 100644 index 3a8902b97a..0000000000 --- a/meta/recipes-devtools/makedevs/makedevs/COPYING.patch +++ /dev/null @@ -1,346 +0,0 @@ -Upstream-Status: Inappropriate [licensing] - -diff -ruN makedevs-1.0.0-orig/COPYING makedevs-1.0.0/COPYING ---- makedevs-1.0.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 -+++ makedevs-1.0.0/COPYING 2010-12-09 16:42:20.274984665 +0800 -@@ -0,0 +1,340 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. -+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Library General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be distributed -+under the terms of this General Public License. The "Program", below, -+refers to any such program or work, and a "work based on the Program" -+means either the Program or any derivative work under copyright law: -+that is to say, a work containing the Program or a portion of it, -+either verbatim or with modifications and/or translated into another -+language. (Hereinafter, translation is included without limitation in -+the term "modification".) Each licensee is addressed as "you". -+ -+Activities other than copying, distribution and modification are not -+covered by this License; they are outside its scope. The act of -+running the Program is not restricted, and the output from the Program -+is covered only if its contents constitute a work based on the -+Program (independent of having been made by running the Program). -+Whether that is true depends on what the Program does. -+ -+ 1. You may copy and distribute verbatim copies of the Program's -+source code as you receive it, in any medium, provided that you -+conspicuously and appropriately publish on each copy an appropriate -+copyright notice and disclaimer of warranty; keep intact all the -+notices that refer to this License and to the absence of any warranty; -+and give any other recipients of the Program a copy of this License -+along with the Program. -+ -+You may charge a fee for the physical act of transferring a copy, and -+you may at your option offer warranty protection in exchange for a fee. -+ -+ 2. You may modify your copy or copies of the Program or any portion -+of it, thus forming a work based on the Program, and copy and -+distribute such modifications or work under the terms of Section 1 -+above, provided that you also meet all of these conditions: -+ -+ a) You must cause the modified files to carry prominent notices -+ stating that you changed the files and the date of any change. -+ -+ b) You must cause any work that you distribute or publish, that in -+ whole or in part contains or is derived from the Program or any -+ part thereof, to be licensed as a whole at no charge to all third -+ parties under the terms of this License. -+ -+ c) If the modified program normally reads commands interactively -+ when run, you must cause it, when started running for such -+ interactive use in the most ordinary way, to print or display an -+ announcement including an appropriate copyright notice and a -+ notice that there is no warranty (or else, saying that you provide -+ a warranty) and that users may redistribute the program under -+ these conditions, and telling the user how to view a copy of this -+ License. (Exception: if the Program itself is interactive but -+ does not normally print such an announcement, your work based on -+ the Program is not required to print an announcement.) -+ -+These requirements apply to the modified work as a whole. If -+identifiable sections of that work are not derived from the Program, -+and can be reasonably considered independent and separate works in -+themselves, then this License, and its terms, do not apply to those -+sections when you distribute them as separate works. But when you -+distribute the same sections as part of a whole which is a work based -+on the Program, the distribution of the whole must be on the terms of -+this License, whose permissions for other licensees extend to the -+entire whole, and thus to each and every part regardless of who wrote it. -+ -+Thus, it is not the intent of this section to claim rights or contest -+your rights to work written entirely by you; rather, the intent is to -+exercise the right to control the distribution of derivative or -+collective works based on the Program. -+ -+In addition, mere aggregation of another work not based on the Program -+with the Program (or with a work based on the Program) on a volume of -+a storage or distribution medium does not bring the other work under -+the scope of this License. -+ -+ 3. You may copy and distribute the Program (or a work based on it, -+under Section 2) in object code or executable form under the terms of -+Sections 1 and 2 above provided that you also do one of the following: -+ -+ a) Accompany it with the complete corresponding machine-readable -+ source code, which must be distributed under the terms of Sections -+ 1 and 2 above on a medium customarily used for software interchange; or, -+ -+ b) Accompany it with a written offer, valid for at least three -+ years, to give any third party, for a charge no more than your -+ cost of physically performing source distribution, a complete -+ machine-readable copy of the corresponding source code, to be -+ distributed under the terms of Sections 1 and 2 above on a medium -+ customarily used for software interchange; or, -+ -+ c) Accompany it with the information you received as to the offer -+ to distribute corresponding source code. (This alternative is -+ allowed only for noncommercial distribution and only if you -+ received the program in object code or executable form with such -+ an offer, in accord with Subsection b above.) -+ -+The source code for a work means the preferred form of the work for -+making modifications to it. For an executable work, complete source -+code means all the source code for all modules it contains, plus any -+associated interface definition files, plus the scripts used to -+control compilation and installation of the executable. However, as a -+special exception, the source code distributed need not include -+anything that is normally distributed (in either source or binary -+form) with the major components (compiler, kernel, and so on) of the -+operating system on which the executable runs, unless that component -+itself accompanies the executable. -+ -+If distribution of executable or object code is made by offering -+access to copy from a designated place, then offering equivalent -+access to copy the source code from the same place counts as -+distribution of the source code, even though third parties are not -+compelled to copy the source along with the object code. -+ -+ 4. You may not copy, modify, sublicense, or distribute the Program -+except as expressly provided under this License. Any attempt -+otherwise to copy, modify, sublicense or distribute the Program is -+void, and will automatically terminate your rights under this License. -+However, parties who have received copies, or rights, from you under -+this License will not have their licenses terminated so long as such -+parties remain in full compliance. -+ -+ 5. You are not required to accept this License, since you have not -+signed it. However, nothing else grants you permission to modify or -+distribute the Program or its derivative works. These actions are -+prohibited by law if you do not accept this License. Therefore, by -+modifying or distributing the Program (or any work based on the -+Program), you indicate your acceptance of this License to do so, and -+all its terms and conditions for copying, distributing or modifying -+the Program or works based on it. -+ -+ 6. Each time you redistribute the Program (or any work based on the -+Program), the recipient automatically receives a license from the -+original licensor to copy, distribute or modify the Program subject to -+these terms and conditions. You may not impose any further -+restrictions on the recipients' exercise of the rights granted herein. -+You are not responsible for enforcing compliance by third parties to -+this License. -+ -+ 7. If, as a consequence of a court judgment or allegation of patent -+infringement or for any other reason (not limited to patent issues), -+conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot -+distribute so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you -+may not distribute the Program at all. For example, if a patent -+license would not permit royalty-free redistribution of the Program by -+all those who receive copies directly or indirectly through you, then -+the only way you could satisfy both it and this License would be to -+refrain entirely from distribution of the Program. -+ -+If any portion of this section is held invalid or unenforceable under -+any particular circumstance, the balance of the section is intended to -+apply and the section as a whole is intended to apply in other -+circumstances. -+ -+It is not the purpose of this section to induce you to infringe any -+patents or other property right claims or to contest validity of any -+such claims; this section has the sole purpose of protecting the -+integrity of the free software distribution system, which is -+implemented by public license practices. Many people have made -+generous contributions to the wide range of software distributed -+through that system in reliance on consistent application of that -+system; it is up to the author/donor to decide if he or she is willing -+to distribute software through any other system and a licensee cannot -+impose that choice. -+ -+This section is intended to make thoroughly clear what is believed to -+be a consequence of the rest of this License. -+ -+ 8. If the distribution and/or use of the Program is restricted in -+certain countries either by patents or by copyrighted interfaces, the -+original copyright holder who places the Program under this License -+may add an explicit geographical distribution limitation excluding -+those countries, so that distribution is permitted only in or among -+countries not thus excluded. In such case, this License incorporates -+the limitation as if written in the body of this License. -+ -+ 9. The Free Software Foundation may publish revised and/or new versions -+of the General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+Each version is given a distinguishing version number. If the Program -+specifies a version number of this License which applies to it and "any -+later version", you have the option of following the terms and conditions -+either of that version or of any later version published by the Free -+Software Foundation. If the Program does not specify a version number of -+this License, you may choose any version ever published by the Free Software -+Foundation. -+ -+ 10. If you wish to incorporate parts of the Program into other free -+programs whose distribution conditions are different, write to the author -+to ask for permission. For software which is copyrighted by the Free -+Software Foundation, write to the Free Software Foundation; we sometimes -+make exceptions for this. Our decision will be guided by the two goals -+of preserving the free status of all derivatives of our free software and -+of promoting the sharing and reuse of software generally. -+ -+ NO WARRANTY -+ -+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -+REPAIR OR CORRECTION. -+ -+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGES. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ -+ Copyright (C) -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ , 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Library General -+Public License instead of this License. diff --git a/meta/recipes-devtools/makedevs/makedevs/makedevs.c b/meta/recipes-devtools/makedevs/makedevs/makedevs.c index 32b9872932..df2e3cfad5 100644 --- a/meta/recipes-devtools/makedevs/makedevs/makedevs.c +++ b/meta/recipes-devtools/makedevs/makedevs/makedevs.c @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: GPL-2.0-only + */ + #define _GNU_SOURCE #include #include diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb index 007ebbca89..0d6c7a01eb 100644 --- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb +++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb @@ -1,10 +1,9 @@ SUMMARY = "Tool for creating device nodes" DESCRIPTION = "${SUMMARY}" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" +LIC_FILES_CHKSUM = "file://makedevs.c;beginline=2;endline=2;md5=c3817b10013a30076c68a90e40a55570" SECTION = "base" -SRC_URI = "file://makedevs.c \ - file://COPYING.patch" +SRC_URI = "file://makedevs.c" S = "${WORKDIR}" From patchwork Mon Jun 6 14:38:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8938 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 61B08C43334 for ; Mon, 6 Jun 2022 14:39:25 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web09.32828.1654526361992553412 for ; Mon, 06 Jun 2022 07:39:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5rg2yV2l; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id b135so12840151pfb.12 for ; Mon, 06 Jun 2022 07:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8gEhcDKBi36NT0fBZdHq0n7gDX670fTT/RA3lPrUw10=; b=5rg2yV2lEK9YLhr+T3qXV7SXlZ6SaOL+Vvfndxt/FR2iK0lvZ/qVaRNyeiefmHRgoa LWm0/CBbvAxwai7EabiJ072GIV8N9tKSyX275GnK7/+5yfeB8mG/2pM7UY5ohLdtlWIP XEotfQEuCSHQGt5WTul+6gbdwnEKySNTLZJdOfvLizV/i2o4M8wiNdWKnmv/2SJgRj2M nevLSPXORoxKbw6cQTFPLfEIFIm761H7y4FN9I8v7yIRbKE9bq27ZzeTUMpfZIjgol06 4Y9+6vNHzJsFfK4T61FMM4Ne+aZidny2Ag/llxVkGVuPc5kTRQYWXrn7w56n5alY8b/5 NxDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8gEhcDKBi36NT0fBZdHq0n7gDX670fTT/RA3lPrUw10=; b=XZakqnxo+c9lQ3MZSipGgu5bS+jGub6x0TW9SzKVyljUtr9P0yUqQ3Qy/TzXvZHOkU DqrkN95f36xzioChtHkOmhMpH2eUD4mv6Krm6Kf7riURLEozyU5mBBO1HmbD9swjFobS EcfqTaHyzxYSy0AfKrzmP7L6poD4Fj2R+gAugiDtIh/sdyXQXHewF4oLPANe54h03NOA XChrZLB1aJyScmZ24AHCUJ8l9rh16nppBLAWOkl2IZeB38XNKOWvzQDKPd3eypSZDmKu CdMqjpuUpSU2bmm3cpgVx4SFE10EBJPNIo2cQqj0nl8YWKSdaIXb/w6J01ScQLvXBQDx UbEg== X-Gm-Message-State: AOAM533fzuCzDGWHj5z6Ujlwitn+fb2lCrZuFZz9QJByUj9E5Mv675aT dNLLPfuRgqa4v3vrYjRJZrqIA4WvoGeBnR73 X-Google-Smtp-Source: ABdhPJxYOTJj1np6hSJbFHYya7Tgrv9byJ1xQHm6nftrKyej35kuaucqIf7ZJgdTQdcA+nrfoPCIxg== X-Received: by 2002:a63:1a1d:0:b0:3f5:eb02:b6b4 with SMTP id a29-20020a631a1d000000b003f5eb02b6b4mr21384099pga.343.1654526360805; Mon, 06 Jun 2022 07:39:20 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/13] zip/unzip: mark all submittable patches as Inactive-Upstream Date: Mon, 6 Jun 2022 04:38:30 -1000 Message-Id: <0c63c7aaab9b74e9e069c2bc2395414c4a69a0f5.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166645 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit df78f7bb461c7d3eccac469fd01a77a3d0b800df) Signed-off-by: Steve Sakoman --- .../0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch | 2 +- meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch | 2 +- meta/recipes-extended/unzip/unzip/avoid-strip.patch | 2 +- meta/recipes-extended/unzip/unzip/define-ldflags.patch | 2 +- meta/recipes-extended/unzip/unzip/fix-security-format.patch | 2 +- meta/recipes-extended/unzip/unzip/symlink.patch | 2 +- ...1-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch | 2 +- meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch | 2 +- meta/recipes-extended/zip/zip-3.0/fix-security-format.patch | 2 +- .../zip/zip-3.0/zipnote-crashes-with-segfault.patch | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch b/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch index 716766de29..5a6d1946f6 100644 --- a/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch +++ b/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch @@ -6,7 +6,7 @@ Subject: [PATCH] configure: Pass LDFLAGS to tests doing link step Ensures that right flags from recipes are honored, otherwise tests fail which otherwise should not. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream Signed-off-by: Khem Raj --- unix/configure | 28 ++++++++++++++-------------- diff --git a/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch b/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch index 6ba2b879a3..c0103444fc 100644 --- a/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch +++ b/meta/recipes-extended/unzip/unzip/CVE-2021-4217.patch @@ -20,7 +20,7 @@ Regenerated to apply without offsets. CVE: CVE-2021-4217 -Upstream-Status: Pending [infozip upstream inactive] +Upstream-Status: Inactive-Upstream [infozip upstream inactive] Signed-off-by: Joe Slater diff --git a/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/meta/recipes-extended/unzip/unzip/avoid-strip.patch index e0c89d81b7..70bedc8381 100644 --- a/meta/recipes-extended/unzip/unzip/avoid-strip.patch +++ b/meta/recipes-extended/unzip/unzip/avoid-strip.patch @@ -1,4 +1,4 @@ -Upstream-Status: Inappropriate [need a new release] +Upstream-Status: Inactive-Upstream [need a new release] unix/Makefile: remove hard coded strip commands diff --git a/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/meta/recipes-extended/unzip/unzip/define-ldflags.patch index dc554c32cb..dd01c01400 100644 --- a/meta/recipes-extended/unzip/unzip/define-ldflags.patch +++ b/meta/recipes-extended/unzip/unzip/define-ldflags.patch @@ -1,6 +1,6 @@ Pass LDFLAGS to the linker -Upstream-Status: Inappropriate [need a new release] +Upstream-Status: Inactive-Upstream [need a new release] Signed-off-by: Mikhail Durnev diff --git a/meta/recipes-extended/unzip/unzip/fix-security-format.patch b/meta/recipes-extended/unzip/unzip/fix-security-format.patch index ba6ead3b5e..2889c652d4 100644 --- a/meta/recipes-extended/unzip/unzip/fix-security-format.patch +++ b/meta/recipes-extended/unzip/unzip/fix-security-format.patch @@ -5,7 +5,7 @@ Fix security formatting issues related to sprintf parameters expeted. [YOCTO #9551] [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9551] -Upstream-Status: Inappropriate [need a new release] +Upstream-Status: Inactive-Upstream [need a new release] Signed-off-by: Edwin Plauchu diff --git a/meta/recipes-extended/unzip/unzip/symlink.patch b/meta/recipes-extended/unzip/unzip/symlink.patch index c1d82ac187..26f1c8ba86 100644 --- a/meta/recipes-extended/unzip/unzip/symlink.patch +++ b/meta/recipes-extended/unzip/unzip/symlink.patch @@ -6,7 +6,7 @@ a symlink entry." This patch is taken from Fedora (https://bugzilla.redhat.com/show_bug.cgi?id=972427) -Upstream-Status: Inappropriate [need a new release] +Upstream-Status: Inactive-Upstream [need a new release] Signed-off-by: Ross Burton --- unzip60/process.c.sav 2013-06-09 12:08:57.070392264 +0200 diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch index 475a653f28..92d0d5db58 100644 --- a/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch +++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch @@ -8,7 +8,7 @@ linking, link fails otherwise without them, which can result in configure detection go wrong, ensure these flags are used along with CC when tests involve linking -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream Signed-off-by: Khem Raj --- unix/configure | 16 ++++++++-------- diff --git a/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch b/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch index 244ddea363..6fd04df1c6 100644 --- a/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch +++ b/meta/recipes-extended/zip/zip-3.0/10-remove-build-date.patch @@ -2,7 +2,7 @@ From: Santiago Vila Subject: Remove (optional) build date to make the build reproducible Bug-Debian: http://bugs.debian.org/779042 -Upstream-Status: Inappropriate [no upstream] +Upstream-Status: Inactive-Upstream [no upstream] Signed-off-by: Joshua Watt diff --git a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch index 5cdbf22a54..f85fddbc60 100644 --- a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch +++ b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch @@ -14,7 +14,7 @@ zip.c:1228:5: error: format not a string literal and no format arguments [-Werro [YOCTO #9552] [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9552] -Upstream-Status: Inappropriate [need a new release] +Upstream-Status: Inactive-Upstream [need a new release] Signed-off-by: Edwin Plauchu diff --git a/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch index ce6caff83e..77ade40a04 100644 --- a/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch +++ b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch @@ -4,7 +4,7 @@ https://bugs.archlinux.org/task/47713 Signed-off-by: Jate Sujjavanich -Upstream-Status: Inappropriate [no upstream] +Upstream-Status: Inactive-Upstream [no upstream] diff --git a/zipnote.c b/zipnote.c index 5e02cb6..996f012 100644 From patchwork Mon Jun 6 14:38:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 8939 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 6628FC433EF for ; Mon, 6 Jun 2022 14:39:25 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.32779.1654526364252574220 for ; Mon, 06 Jun 2022 07:39:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MbUmAfcy; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id 187so12858743pfu.9 for ; Mon, 06 Jun 2022 07:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IpbazTfe3AnuK62z/q1N2/s7sVN0IesTqhl9A2DPwU0=; b=MbUmAfcyv5QL1snF6WrzPBPumxIiOz1ibIYb8NxEFTnD/ghVddW/FJ1EYjsMQMV1vg 7sNAZ8xuQgRwRZBtVeQEPn7rc6ZVT/VO2H2n/VGi+jcr7YuLGsmnBYcUt1SYWu7E5Tza r40WZy2cfuM3szTpCCmjJQU5kS+aoSPONZ6WKhHYnBlBBm7Gso2Jb4h+0K1L56Z9EqN5 5hfs2krgnguo292yBvcdybuadOVCx1wVwnqylJfCL2DjRP5hqw8EZBnBPWzi/mkf4MAj xOIHxwDin8z5C6qna3n89HCUfkXWfZLrEax9Ibgs7R2u6mSvpmoH6ak0Yf3cNXs6UbEP OKrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IpbazTfe3AnuK62z/q1N2/s7sVN0IesTqhl9A2DPwU0=; b=N3uQaKLaoiQ623Dk0GmHDukTK5t5KwaCtvyFiEXuT3g4eSTL/sVLXmbBsLy2ucxyYM bGj24mEkGMfo3sRKDuDZ45/7QJ8WNpJJaa/8Lq/+lhgsy+M/aDDFEagx3bG6IT8zBIRW Qu7A/fh5w1Ad1Qy7FJZDkz0XFQLpDtcZmyFaTDx2eWps18GtQcUxgvnjeUyqV4R3rpwp slFPBvQgW2I4I/NL2ov6W1wxByQVPmPvqftdZbkbMMvG6miPsTro10Hzlo4G8F/piHbQ lBAya9TmhCm3WYJAge6LhutWFfAlFwluX7OAfwdZz5pVEkIzkGk6K6giCry2M++iCekR rhuA== X-Gm-Message-State: AOAM532jQtK3O8kqDokHav32mXS4FMEdmn09/80Yva6186zxwCUtOHwy Rk0EHBUPmqObSXNznh4Zfxg5P8Js/3iUP31v X-Google-Smtp-Source: ABdhPJxSK72IPDEYjLe4hPiFgfvl3DGWAmOA2lsJg+dDTutzp2ZdjT6qsGkMe2kn9T1NcNOUYvIz1Q== X-Received: by 2002:a63:524a:0:b0:3fc:7f18:685d with SMTP id s10-20020a63524a000000b003fc7f18685dmr21699467pgl.387.1654526363225; Mon, 06 Jun 2022 07:39:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id a5-20020a1709027d8500b0015ea3a491a1sm10544112plm.191.2022.06.06.07.39.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:39:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/13] lzo: Add further info to a patch and mark as Inactive-Upstream Date: Mon, 6 Jun 2022 04:38:31 -1000 Message-Id: <27815774c983f7c2c849513efe087a6d77eaf443.1654526060.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Mon, 06 Jun 2022 14:39:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166646 From: Richard Purdie Add some further info to the patch based on upstream changes. Given the last release in 2017 and glaring issues on at least armv5, it does raise the question on whether we should drop this. There are probably better compression tools now. Signed-off-by: Richard Purdie Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 241309c6dec364445093fa5973cc8998431cbed9) Signed-off-by: Steve Sakoman --- .../0001-Use-memcpy-instead-of-reinventing-it.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch index db3a70e803..a0d2502d24 100644 --- a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch +++ b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch @@ -10,7 +10,15 @@ Change suggested by Julian Taylor. Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757037 -Upstream-Status: Pending +RP: Patch is still in debian as of 20220524 in a revised form: +https://sources.debian.org/patches/lzo2/2.10-2/ +https://sources.debian.org/patches/lzo2/2.10-2/0001-Conditionally-replace-reinvention-of-memcpy-with-cal.patch/ +It was submitted in 2015, no reply to an email from RP in 2022 either. + +We likely need this in OE to prevent against unaligned accesses +on systems such as armv5. + +Upstream-Status: Inactive-Upstream Signed-off-by: Saul Wold --- minilzo/minilzo.c | 14 ++++++++++++++