From patchwork Mon Apr 7 09:40:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60835 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 288F7C36010 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web11.42755.1744018851909555396 for ; Mon, 07 Apr 2025 02:40:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IZwJeIMX; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-39c31e4c3e5so2504860f8f.0 for ; Mon, 07 Apr 2025 02:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018850; x=1744623650; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iPrpgJo5foRgvBpiqptnXaxrdNknhyCP2UwPgiUcChE=; b=IZwJeIMX0qFm//ML0GWRV2u2H4U25GfcFG4c7j2rWSIOUZKzNZ5TuZZb8GdWQh5Ut/ k07sdD6Zbfu5CJAHdgNAnXQN8LwZyfwI6SRFFoHaITQwXV2CwyP23ttDMkTFPsZBSDVk KcnHiJgXEy5LSHVuU6P8N5aVga/UR6e88UTsmtuPxWeorjcHFfelIHSdaiBpYMrTwiQx EyYeV3SxVEhTqKtYMJnZpfnK9P2SZjBaB/9Vdfwk3GUV2VS3vYYaiNKG2FRI678VVpdD 5LIeDB/mxP5K66ySXQPOshZ/7vX7btlqKbNGLWDSH3tzFklExgPk/5cciu3Zo7XGLPey a9jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018850; x=1744623650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iPrpgJo5foRgvBpiqptnXaxrdNknhyCP2UwPgiUcChE=; b=oJ/kNZcIMCtkS5AZ75DpgwJW8ys2VF/HdNOlvBCwpAeTPj6acTh/7vZMrXK7ZApln3 vcsFqI0v9BDgf7oUDv02m+uHX0i+bM47D4rJi9Ppzm/Z0I6BIFd8XyYMiPHzPu6TegHa 8sIxOr98svSoV+2ZXWaE/UTYwAt0Yhobjy912vmCp6cyJzsX0DFvIHr5ro9V+U8C3NFq bVzzyf7ssbb7IpSVg2vzp/79+nyduJYlinGKoYbSKtSY0Uag0Ka8zwkiB0WQCrpxqiBL YE4A3Gc/FCGrdarhZadnFNz9EUwDPbYLKlD5xbNjQi1hn9+WNlInLCrX4/sRpusXaDVM fHYA== X-Gm-Message-State: AOJu0YyISg0YFDFnVbmmSb7AmbaxSnHI59knJt/9R4dbjLBI3EENz+XR UGKdcl32+LOf7jrVwRhY2+/IOjoY8HjLyk1yQtBQ+vPyG9S6/dW3KKkfbQ== X-Gm-Gg: ASbGncuv+3TlSTpMYC8wo5u1i9k7qmbjTG3TL7iwDSPXgp28gLVxBTQQd2A330NET70 DuJHGI/Yd42hm1JE0IRua/tx+Se82fOb7CcnH3usPb0J08fFAHcQ+U8ug+rU1gks2Z/U8sgjcjA yBUlNraKBLUfu1V3FPQx8FT7TIZsfbPR3RnzzojcAZ2IPdtmzlpVXlp3gatW+qyd2aVqUYQaGYx AolJYQR/gmZUAjwDq1jeO38qSL5N6QQbDHpg7bzzodwIYlgBzRtnoi/cJq9cp28diMRSvWLXpGt lrSU22HSXfpnzrsqt0bP81obmxDHy9ji/jNrUnLcukTovVrgKYVfa1A7E+0Ix5zAGHm17EQ13Ri YPnjP4sjcy16+B++F X-Google-Smtp-Source: AGHT+IHYLXmi1olQFdV/cSS1eJrBS6yy2myHv7JWbtK//XNuSlJkxw2M7TpICBvAZ+9mwwHBuZ7DGg== X-Received: by 2002:a5d:648a:0:b0:39a:cd84:a77a with SMTP id ffacd0b85a97d-39cba9332b0mr9330200f8f.37.1744018849808; Mon, 07 Apr 2025 02:40:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:49 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/18] nfs-utils: replace problematic pending patch with upstream submission Date: Mon, 7 Apr 2025 11:40:28 +0200 Message-Id: <20250407094045.753021-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 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, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214410 From: Alexander Kanavin The now-removed patch was added for clang compatibility, but over time started fixing problems that do not exist, and got its description to mismatch the content. The new patch is fixing the only problem with clang that still occurs. I verified that all files that were patched before still build without errors. If you find other issues (this would be with non-default options probably), please fix them similarly. Signed-off-by: Alexander Kanavin --- ...ect-warning-options-during-configure.patch | 109 ------------------ ...mon.c-fix-a-formatting-error-with-cl.patch | 40 +++++++ .../nfs-utils/nfs-utils_2.8.2.bb | 2 +- 3 files changed, 41 insertions(+), 110 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Detect-warning-options-during-configure.patch create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Detect-warning-options-during-configure.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Detect-warning-options-during-configure.patch deleted file mode 100644 index 69236e8278c..00000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Detect-warning-options-during-configure.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 1ab0c326405c6daa06f1a7eb4b0b60bf4e0584c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 31 Dec 2019 08:15:34 -0800 -Subject: [PATCH] Detect warning options during configure - -Certain options maybe compiler specific therefore its better -to detect them before use. - -nfs_error copies the format string and appends newline to it -but compiler can forget that it was format string since its not -same fmt string that was passed. Ignore the warning - -Wdiscarded-qualifiers is gcc specific and this is no longer needed - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - support/nfs/xcommon.c | 6 ++++++ - support/nfs/xlog.c | 6 ++++++ - support/nfsidmap/libnfsidmap.c | 3 +++ - utils/exportfs/exportfs.c | 3 +++ - 4 files changed, 18 insertions(+) - -diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c -index 3989f0bc..ff438c18 100644 ---- a/support/nfs/xcommon.c -+++ b/support/nfs/xcommon.c -@@ -98,7 +98,10 @@ nfs_error (const char *fmt, ...) { - - fmt2 = xstrconcat2 (fmt, "\n"); - va_start (args, fmt); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vfprintf (stderr, fmt2, args); -+#pragma GCC diagnostic pop - va_end (args); - free (fmt2); - } -@@ -132,7 +135,10 @@ die(int err, const char *fmt, ...) { - va_list args; - - va_start(args, fmt); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vfprintf(stderr, fmt, args); -+#pragma GCC diagnostic pop - fprintf(stderr, "\n"); - va_end(args); - -diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c -index fa125cef..dc4c9ea1 100644 ---- a/support/nfs/xlog.c -+++ b/support/nfs/xlog.c -@@ -178,11 +178,16 @@ xlog_backend(int kind, const char *fmt, va_list args) - fprintf(stderr, "%s: ", log_name); - #endif - va_copy(args2, args); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vfprintf(stderr, fmt, args2); -+#pragma GCC diagnostic pop - fprintf(stderr, "\n"); - va_end(args2); - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - if (log_syslog) { - switch (kind) { - case L_FATAL: -@@ -203,6 +208,7 @@ xlog_backend(int kind, const char *fmt, va_list args) - break; - } - } -+#pragma GCC diagnostic pop - - if (kind == L_FATAL) - exit(1); -diff --git a/support/nfsidmap/libnfsidmap.c b/support/nfsidmap/libnfsidmap.c -index f8c36480..1a28be0a 100644 ---- a/support/nfsidmap/libnfsidmap.c -+++ b/support/nfsidmap/libnfsidmap.c -@@ -99,7 +99,10 @@ static void default_logger(const char *fmt, ...) - va_list vp; - - va_start(vp, fmt); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vsyslog(LOG_WARNING, fmt, vp); -+#pragma GCC diagnostic pop - va_end(vp); - } - -diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c -index b03a047b..eac1ff2a 100644 ---- a/utils/exportfs/exportfs.c -+++ b/utils/exportfs/exportfs.c -@@ -646,7 +646,10 @@ dumpopt(char c, char *fmt, ...) - - va_start(ap, fmt); - printf("%c", c); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vprintf(fmt, ap); -+#pragma GCC diagnostic pop - va_end(ap); - return ','; - } diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch new file mode 100644 index 00000000000..a99ba284e02 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch @@ -0,0 +1,40 @@ +From cc59a7fe15b6ca2ee43cba0dc1d699323b36ffcc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 21 Mar 2025 10:42:56 +0100 +Subject: [PATCH] support/nfs/xcommon.c: fix a formatting error with clang + +Specifically, this happens: + +| xcommon.c:101:24: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| 101 | vfprintf (stderr, fmt2, args); +| | ^~~~ + +A similar approach (print \n seprately) is already used elsewhere in +the same file. + +Upstream-Status: Submitted [via email to steved@redhat.com,linux-nfs@vger.kernel.org] +Signed-off-by: Alexander Kanavin +--- + support/nfs/xcommon.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c +index 3989f0b..1d04dd1 100644 +--- a/support/nfs/xcommon.c ++++ b/support/nfs/xcommon.c +@@ -94,13 +94,11 @@ xstrconcat4 (const char *s, const char *t, const char *u, const char *v) { + void + nfs_error (const char *fmt, ...) { + va_list args; +- char *fmt2; + +- fmt2 = xstrconcat2 (fmt, "\n"); + va_start (args, fmt); +- vfprintf (stderr, fmt2, args); ++ vfprintf (stderr, fmt, args); ++ fprintf (stderr, "\n"); + va_end (args); +- free (fmt2); + } + + /* Make a canonical pathname from PATH. Returns a freshly malloced string. diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb index abbdec7808d..1f3afa05600 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb @@ -23,9 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfscommon \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ file://0001-Fix-typecast-warning-with-clang.patch \ - file://0001-Detect-warning-options-during-configure.patch \ file://0004-Use-nogroup-for-nobody-group.patch \ file://0005-find-OE-provided-Kerberos.patch \ + file://0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch \ " SRC_URI[sha256sum] = "a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15" From patchwork Mon Apr 7 09:40:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60843 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 7525BC369A9 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web11.42756.1744018852517192585 for ; Mon, 07 Apr 2025 02:40:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eNeGBTZ3; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3913b539aabso2332521f8f.2 for ; Mon, 07 Apr 2025 02:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018851; x=1744623651; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tPxpzOmXY5nf0+AsqEJm2UNoYbIZc4IeeLhqWxYpQ8k=; b=eNeGBTZ3OAdfwEROQ/xp5dtySrI4/4NHfJ28xp0NdzvhvJM97R1QHYdLUh8MAFGm1g +9e2X8kVPnV2Jf9T1BXYzyLLEDsWa9F0xY/v/0nqX9Rndys+gC2iD4ksZMy/9Qs99Vwx tAiAF2byV+CXogsacvbT3PbgqFRu+JuLkWUa6VvXydALtOCahMHGCPOq0yz29lsV/lIk skRmAqDJUqM0sYmSL7VeYBLO/xSHFvLqc1QgAxR6dj5JAK59Rdbmo7YQzhqCE8QHgxo4 jIaEWQ+LXUWsaRqWv1aPX88OTjoqvwJmhZGsDAdBrUGPerMsQs9A0R0F3onUPlx7ss17 +63g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018851; x=1744623651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tPxpzOmXY5nf0+AsqEJm2UNoYbIZc4IeeLhqWxYpQ8k=; b=XFycX8hIYiO3mOuXldj+PRmyAflb6pnIQAUVowYsblXb8pimFGs1ewQRrQHrBPp067 XHjkrg1t38ogmdrODGAlJKwV1Zua25tMz4Dkw5JBl2fbgNLmPXb1lTquun+goUNYvBIp mOyFVVUtUWVTFwGhnlHQSqivyzABTwpW1hnUTSkRsVa5NkujY9TYcHbiJ6kFcvLC33h+ DzQXRGAozBsFK+K/6vcYYP935CmCOoCfxBKOxfOqNm210tpUJruWSaejQ5LugM6Qk3AQ B5T9CSuMrBk7aypwM83iPbntj4ppFOvemXwWNntx2PBtF/Ujsa9s+VurpKCy1R5MoVXa rhPA== X-Gm-Message-State: AOJu0YwUS15F8CQEyoq89GHg5kResRff7CVsu4a0Saauas7GpcnPLR0K wukrGhnxFpsHRf/uox8W+nQPdMJjeQy2q7wccJW7T8OtKI9WcNDITBFRNA== X-Gm-Gg: ASbGncsR/dYHYC//dGrO+W3sZLZy/1ieuNXu81nzQowhwUQvEb1TqeKqtOKY1oMaHPw hwISB0SCo78+w5Kl+calbmsKbPEjhaHk36mMjMfmPAMjzA33Rv4ORY0tpVkiiHDdK9+utIskz8P KR0NnQCxjYDIOfLNHhltSLVqOycCa7QJtbvacpD4RwuJZc1ozce+jRXCMO+oXr8F2LxI1sOTY6E Gob/SfZ2lXfJj4s5806MFnw78CaXkkSfjK9zkPKqHF+e8PyR8sJuKiNk61KNpXSiyN0Iw+UfsrS G5ZXLar5Pu6J/7dTIdUjYpS+oR7mJqatdgiYOf9iHFK4g6Lx7/zUiZ6GFihmZVbSQsK733C3rpJ NOOUUF+nQ9VhaXlDF X-Google-Smtp-Source: AGHT+IEMngnZNJmw0VWXp4nLLcJDmxVGeYA37SONTjuLefMyNJJBzgbM82kbcSXpHNTorXDdAa16RA== X-Received: by 2002:a05:6000:1867:b0:39c:cc7:3db5 with SMTP id ffacd0b85a97d-39cba9331d6mr8900231f8f.40.1744018850485; Mon, 07 Apr 2025 02:40:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:50 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/18] perl-cross: submit determinism.patch upstream Date: Mon, 7 Apr 2025 11:40:29 +0200 Message-Id: <20250407094045.753021-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214411 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/perl-cross/files/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl-cross/files/determinism.patch b/meta/recipes-devtools/perl-cross/files/determinism.patch index 29de36cbafb..71a405ab6b5 100644 --- a/meta/recipes-devtools/perl-cross/files/determinism.patch +++ b/meta/recipes-devtools/perl-cross/files/determinism.patch @@ -21,7 +21,7 @@ d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with RP 2020/2/7 -Upstream-Status: Pending [75% submitted] +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/154 https://github.com/arsv/perl-cross/pull/155] Signed-off-by: Richard Purdie X-Patchwork-Id: 60844 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 69B18C369A7 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.42757.1744018853122265236 for ; Mon, 07 Apr 2025 02:40:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QO/0B+EU; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-39c2688619bso2434142f8f.1 for ; Mon, 07 Apr 2025 02:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018851; x=1744623651; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XjgKBohST2Ilt7P1cjKR8HEMcK+CscuRGjhftvpnbqc=; b=QO/0B+EUR0br5r1apOQB7bxi3tFZOGD3jYmVIpFyRW0FpiVvXLTsygD0psz3sJsM58 7PfAgzf1aiZ6OpmmwY0az1CV/jYKcPoevE289mB+p3qeOH3EtnbAxnOUd/9xiGgU5Sb2 OtcRm+tjNwr2MjlTK3tyhrHWmEwjGgL89kh0AFfMbLZfFNHhXw4K4dBoqQJaJHRbakrE E+13sMJXHFOd8ciE5PXb1W5wSk5wLZGTb2kYnK/9/9hhFoAbHiAZih3Xvo26/xXsAYdm MNccotoqcvtN+nexWdQL+aXUJC5gipx0nDwCZA3XWPShqTN77AGP6d29NXLr0REhqABs f/vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018851; x=1744623651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XjgKBohST2Ilt7P1cjKR8HEMcK+CscuRGjhftvpnbqc=; b=kBcDMcRpM1nZTaQKpphNNUaidP7Up55vYxllwvAiIA8Oce6MnvHCIgEaMISv+col/L WEHJAbJN6F//GN3C5DXYBavdPplmIAfNmhDg20iACZhJI+kQfOCQtAGw4W7lJ5j11YhM XGne5QfZuNSc9RmjG+zzqzvZAseCVGRknjpgp+olg7AuBtZJvEy+D5+MDEckmI0TKMaS 4SwVo+XvDU20P/wyk7QC0sp+/0/RiRyM4/Gw9y8RVE1L7OHzvhWtImXCC4qLDmN6Igyb c0T31LXQbw4bMR+5l7V7pFMYjk2ze2spcuwzrYxe3tnLWo8vA64s7skjAzYlxsdFXfsB NWBA== X-Gm-Message-State: AOJu0YzUwfbKQ9QIxfYMgxbjT3PSw9E6jdSNQRGfktlnY8mJAa7XMRcM xGcXAa6W5Y7dh//9jtx9OQOtSo3GWeVBnh0TKrP4fntZNbLnrVf4PzuB7Q== X-Gm-Gg: ASbGncua0tstRczKc8IhUXUJYcaBlujjBKF+0n3m2o4T1Z+KyEs08zdDIYsr1xBPPIt b46HgGyVOl7SqvvR2Oy9njOAdFj2rr6Vd5rG3+e05UOQi43b/7jq/EKkCYqKftFBaPxy6MQsm/f EbnVX6mNv2EXw5nAgJZqyOdfXV8henBef5+fMOxEysQrqYeDQgoAMaUbUyJpsbAIKq6qtxnKTIy FzA2fH7mX3y+K3SwUsBtc8237DVQJOefaQ+bb0jdxsUUJqep1gwhXfMr43akwp23s5C0ezaZvCV XPrHNDdCGf/fvariMy/Xv7Ox70bLMg30T1xBt5ijIecsSIw1sXqR5Km11RiqzCSPRYFM6TuvRPq AJJprPjkwEodKo1K0 X-Google-Smtp-Source: AGHT+IHkZ4la4onTlr6z67fWipSEI3LGd39HV8kJNivM0oiACm68cIOFvvRXDBmESi+F+8Lf/60fng== X-Received: by 2002:a5d:6dac:0:b0:38f:2b77:a9f3 with SMTP id ffacd0b85a97d-39cba975b4dmr9708504f8f.43.1744018851165; Mon, 07 Apr 2025 02:40:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:50 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/18] tcl8: mark pending patches as inappropriate Date: Mon, 7 Apr 2025 11:40:30 +0200 Message-Id: <20250407094045.753021-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214412 From: Alexander Kanavin Upstream submission should be done for tcl 9.x patches. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/tcltk8/tcl8/interp.patch | 2 +- meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch | 2 +- .../tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/tcltk8/tcl8/interp.patch b/meta/recipes-devtools/tcltk8/tcl8/interp.patch index a4fb0c5a9d4..aeebb038e3e 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/interp.patch +++ b/meta/recipes-devtools/tcltk8/tcl8/interp.patch @@ -6,7 +6,7 @@ Subject: [PATCH] tcl: fix race in interp.test The interp-36.7 patch has race conditions and is missing cleanup. This patch by a Tcl maintainer should improve matters. -Upstream-Status: Pending +Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches] Signed-off-by: Ross Burton --- tests/interp.test | 7 ++++--- diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch index 88faf8ac730..898e8241fc4 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch @@ -3,7 +3,7 @@ From: Richard Purdie Date: Wed, 9 Dec 2009 23:59:44 +0000 Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function -Upstream-Status: Pending +Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches] Signed-off-by: Alexander Kanavin --- unix/Makefile.in | 5 ++++- diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch index 0a0c1173a22..f2a37add7d9 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch +++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch @@ -7,7 +7,7 @@ Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}. [YOCTO #2876] -Upstream-Status: Pending +Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches] Signed-off-by: Song.Li Signed-off-by: Kai Kang From patchwork Mon Apr 7 09:40:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60841 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 639F6C369A8 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web11.42758.1744018853876049688 for ; Mon, 07 Apr 2025 02:40:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hqlX2eiW; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43d0618746bso28837955e9.2 for ; Mon, 07 Apr 2025 02:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018852; x=1744623652; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EQ1drc8RcjXbMxjFNfXs46qZ9G3eZWXRGPLPyTH+HlA=; b=hqlX2eiWKO2gqDyELSPpBFvr8l0NDocYjjNvqjvBRfTfohWVjkQHt59MCuVg3H8h/F N4qYvkumXYokiDK7V848u9Wc2GnpuafG5OhXmlrbnVaA6PTl62k3qa7ZQGGx96uN2eB4 jut0qwvQxEc2fs687d0LuaGzwiW0/hImgRqbjATKKsrtfg4U0y4qZ2ho2tXmEavZhlc9 VySeeEYv6rSYehXj4QIMzVaQ6Oj2zR0y2PFMkDQvnNQBPOSNzObRFgm6VyygBOERNAQ/ 4Jj6UmU0zVf2icrZ5d76kfLn5g7R64ce+PEB2xD+uwCcx5GxMUzMC0aVANhjqb38i7d3 UUTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018852; x=1744623652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EQ1drc8RcjXbMxjFNfXs46qZ9G3eZWXRGPLPyTH+HlA=; b=Vg3fu2OoYKTwtDTzLPEBYvOhzRFSI/6Rlo/Ebe3UA+KrYeoPif317PqEDDz/Q+aBXs 53cz302ue4KlcZvCg3wdJjuLnKMqnxZ24fhU8/b1Se7xR2UlNGU+d+0Ib0+U2MAAIVRD O9XL5zQQvw9xDtyHFL/mjARO50+uLaUw31PjGOpDAWaeOv++tkW7VmLtiREh3vdain5m kri/DJYjRIOZ7uNVsKPmt3cEAoEHD5un77dCEoVqjZYQlUyC+yzB7tc0CH+MqtBzeoa8 SwRKgGqOP0m3qi5VelKMkbnlg51D1Gbqatovh3h/gxnJWhgZcoE/wZ7OARY2IpXZM7oi oHNQ== X-Gm-Message-State: AOJu0YzyH2y9mIqr8LNxCN8WNb0eUMwy6K0yAfbpBvTK5lsvdgbqKlhU Um6kP3gVkK+BPFLwmTa8agEPnDb+JrDQV+Gv6gS7uqKc/Y+CMsR9VJeJNA== X-Gm-Gg: ASbGnctVRxSYksvIQ8tExfhjqKHVQ7WOdzXh31dfomSOlUGgtPQBX98QSbrvV0+oJpI NY8/O3t7p6MX3b+9JRsDx1/U7hgi6RAN8yzY4Qzz3KZWMIDGykKwxynF/pJoqtvx/Zx2iaHhhlV mz81YJ8wZ0YPv84ZtkcEgXsdb/EwmhBoar/0C5+OFvkUbyLDkYvVWVOHiXWh9oc51ssJA+tgMoN 6+SByWFKoeqpdy36AHkOGbxZAbPjONnTBbR958By3SWStIar2C47SIQ9prhUy9G7vFmphjeTlBR duQqTCBIyIfFlLPRRVs2gL9nK/YCr10vxh2C3ty+Cc+8Z+RpjfkwLdSPP50lTZd9M3fcv1gNr0K glSrd7w== X-Google-Smtp-Source: AGHT+IHUjAA94lhFwAEvSdp8aX0HgJK3k1o1/t2+4ipRG2Y6MxIx9cqSOcHK2jvyoEEYEj7ZZylMHw== X-Received: by 2002:a05:600c:46d1:b0:43c:f513:958a with SMTP id 5b1f17b1804b1-43ecf85f223mr99140705e9.13.1744018851812; Mon, 07 Apr 2025 02:40:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:51 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/18] elfutils: remove 0001-libasm-may-link-with-libbz2-if-found.patch Date: Mon, 7 Apr 2025 11:40:31 +0200 Message-Id: <20250407094045.753021-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214413 From: Alexander Kanavin The original linking issues seem to be long gone. Signed-off-by: Alexander Kanavin --- .../elfutils/elfutils_0.192.bb | 1 - ...libasm-may-link-with-libbz2-if-found.patch | 39 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch diff --git a/meta/recipes-devtools/elfutils/elfutils_0.192.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb index 7bf9865555d..4fbfa4b1357 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.192.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.192.bb @@ -15,7 +15,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-dso-link-change.patch \ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ file://0003-fixheadercheck.patch \ - file://0001-libasm-may-link-with-libbz2-if-found.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://ptest.patch \ diff --git a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch deleted file mode 100644 index 6031b721fcb..00000000000 --- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7bcee92c2006b7adad463be28cf4c3af21489cd2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 4 Oct 2017 22:30:46 -0700 -Subject: [PATCH] libasm may link with libbz2 if found - -This can fail to link binaries like objdump -where indirect libraries may be not found by linker - -| /mnt/a/oe/build/tmp/work/riscv64-bec-linux/elfutils/0.170-r0/recipe-sysroot/usr/lib/libbz2.so.1: error adding symbols: DSO missing from command line -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3bcee3c..18eed9a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,7 +46,7 @@ EXTRA_DIST += make-debug-archive.in - CLEANFILES += make-debug-archive - - if BUILD_STATIC --libasm = ../libasm/libasm.a -+libasm = ../libasm/libasm.a $(zip_LIBS) - libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread - libelf = ../libelf/libelf.a -lz $(zstd_LIBS) - if LIBDEBUGINFOD -@@ -55,7 +55,7 @@ else - libdebuginfod = - endif - else --libasm = ../libasm/libasm.so -+libasm = ../libasm/libasm.so $(zip_LIBS) - libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl - libelf = ../libelf/libelf.so - if LIBDEBUGINFOD From patchwork Mon Apr 7 09:40:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60842 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 5EBA3C369A6 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.43303.1744018854613365154 for ; Mon, 07 Apr 2025 02:40:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MVXPodIv; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so36171455e9.1 for ; Mon, 07 Apr 2025 02:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018853; x=1744623653; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nq95dafiEmKQL+SMY5vIntmrMnwC25G7FEZiwrAaMmA=; b=MVXPodIvM1RH0z0WYvBbIZUQTSVtQyyfcFd9rSKMOmGdNvX6kHMa0OLk4JhmkgXQQd UgXuSxg1+w0h2w759+3qxSAhRtKeYuXu/bGn3+QIG4p4GcU+B4H9kd/yD21vhagywp8x WN1RpHGIgvO3yxE9WrJWNmb58V6WaIv9xv29fbAu2nkWb71xW9HZNvGI3qVQk4SX0b2t X0tCdvgJtjzzJz6TfjGQGN6+B5r27/bV2ksLaK8blVe7dGesFrrVdspPsU0AFUOwSMDN z2irHDNHkWXFkGtVEpq2nSGNmdTPLlY0XijghIJNCT3ySPQ09DUNc1YPiUPqsNdB75xs gD9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018853; x=1744623653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nq95dafiEmKQL+SMY5vIntmrMnwC25G7FEZiwrAaMmA=; b=IBVTt5q4MOvBV8V66tbZ+38nl3wdaLTWwT6ye4xvgR0hJduT9vgG8poo9kaIL1MwZ/ 6N5wi3tDgepXH1RhhXrVDKW33BbAkVNGAMpi9t9Kl3R1a3iqWr/uNTAxnCDpX82vCng2 O4luJ+AiROHJmkT9KU9WfC9GpgC5J1fuLgEiWaoeEFD1foPyMIOlv7GUYFA82zXGRE7O qKnTBGy6KcSJofFh0LKgaxSSavB3zm5ITWD2lnWL3fd+oXXqX/7MeQiZQ8ZTQ0FQDOGW EHmh/k5slKUpL+Nrj/Eiq77gVvDd6tbwS4cvtgA/+7S4DymiuW/DYeVuqJI8So/iEd2a If4A== X-Gm-Message-State: AOJu0YwTWNQLzg4nXv873D4M/8OUX78Y9ww7Tq72xkyBl7968N4f7Zph 9WWKQkbEmmMWwiiaxqtVnzHWFEAmU749i9ebRA7ui/n+mNvdL3AZ75LfRQ== X-Gm-Gg: ASbGncsdFDLqWuz17WP7s6Zg9QfxGgLWpKoCik119cZBxePYYPKiah4ebXteY39/xQV smh4Ulmk2f86MeBcwGeHG5h96r8TJTnedb87YTAAMQ1ZQ9fCJrPetho4sV7JcmcjltTCJAEl/cU NJUWiiTuNhd8tyK9MrEF9N4s4WDIZPlmXltYeWPUUiUQn7J5X4eJIsPOYOZqJXAAq5XoDBBxzNt lRNxzQA10CIJvCg7pWZiS6iH/dpX1jXijhi9WvIhqfeNC2RaisiaJtBJSRE5P6REmEU380VPF8d PjBm3vX4pLDPvW1VOvnvV3+CInfzXqXF2k7sfvc0NUfQCBBSVT2dycxjahyC6B6uq2GjgCP6G9e EqOr74w== X-Google-Smtp-Source: AGHT+IGdZFJfsEyibxfDYySgGNqk1lbUZzysLiZnOePzVJLymNv2/cPLjNDVcpTh2diHIWks3lIsvQ== X-Received: by 2002:a05:600c:1e8f:b0:43c:f78d:82eb with SMTP id 5b1f17b1804b1-43ee0698c8cmr87274125e9.15.1744018852458; Mon, 07 Apr 2025 02:40:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:52 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/18] elfutils: remove 0001-dso-link-change.patch Date: Mon, 7 Apr 2025 11:40:32 +0200 Message-Id: <20250407094045.753021-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214414 From: Alexander Kanavin The original linking issues seem to be long gone. Signed-off-by: Alexander Kanavin --- .../elfutils/elfutils_0.192.bb | 1 - .../elfutils/files/0001-dso-link-change.patch | 49 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch diff --git a/meta/recipes-devtools/elfutils/elfutils_0.192.bb b/meta/recipes-devtools/elfutils/elfutils_0.192.bb index 4fbfa4b1357..f96e7c8ef05 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.192.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.192.bb @@ -12,7 +12,6 @@ DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack" # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://run-ptest \ - file://0001-dso-link-change.patch \ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ file://0003-fixheadercheck.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch deleted file mode 100644 index 0eb532f3dd5..00000000000 --- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7b0f78c86bf2e658649327fb3dd1b862f282c42e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 15 Aug 2017 17:10:57 +0800 -Subject: [PATCH] dso link change - -Upstream-Status: Pending - -This patch makes the link to the dependencies of libdw explicit, as -recent ld no longer implicitly links them. See -http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html -as a similar example of the error message you can encounter without this -patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and -https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for -more details. - -Rebase to 0.170 - -Signed-off-by: Hongxu Jia ---- - src/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 6bdf2df..3bcee3c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -56,7 +56,7 @@ libdebuginfod = - endif - else - libasm = ../libasm/libasm.so --libdw = ../libdw/libdw.so -+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl - libelf = ../libelf/libelf.so - if LIBDEBUGINFOD - libdebuginfod = ../debuginfod/libdebuginfod.so -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 76f1682..865a604 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -733,7 +733,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread - libelf = ../libelf/libelf.a -lz $(zstd_LIBS) $(libeu) - libasm = ../libasm/libasm.a - else --libdw = ../libdw/libdw.so -+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl - libelf = ../libelf/libelf.so - libasm = ../libasm/libasm.so - endif From patchwork Mon Apr 7 09:40:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60840 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 476E5C369A3 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.43304.1744018854926141893 for ; Mon, 07 Apr 2025 02:40:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=I6WE/4L5; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-39149bccb69so3801100f8f.2 for ; Mon, 07 Apr 2025 02:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018853; x=1744623653; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R7qiBCaCsYrdM8Bzikp2EeKyslZ9K4+7MxnHuQM0Big=; b=I6WE/4L5VcfgL4Ba80L4Resy+VLQSiivS0DpdiSwBeYH3mqhVfH/62XQRL/jOmzfvU zmapr6ftbTfsv7so8KKlhL8wkRyBUabmLH0FYGA2PMgzGDdszEJPfV03G2IDan8ClJWd XykixAM/3cJ8Z2Fi7LMUqaDmHe99fA9G8HCHltIAXcN/pw42Stan9Z22UUTx3CTHmuam 3fqLk7Tob9TH8TqbHfIcmVJYnluEd7B7OMf1sv9XtTXroWP92hDccosfbBqpp3+WWTc7 NXJpVxvwN57p6A+EuyQqFlJFSaTcy8hr3lXePKloki0dGaJqnK3p1te+voMEdaYewTx+ nS1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018853; x=1744623653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R7qiBCaCsYrdM8Bzikp2EeKyslZ9K4+7MxnHuQM0Big=; b=KT6v11RuHDg/rwVivpdrRpld+PmpTJgCgTPEQGu9CuSMnBPgvqgDyGAS4LN7KBpntc YhitZXWtCgI8YRS0kUyIq4Dgw0Jkb9HegdNFtenE73OsDCMTN7yB0GYupd5riOGgydJC GaXpJTRWqIcUhSKfIkIILA60keh81l/k/4xDzFg2MqWxSGqj3vwa78KexQXxsul3rLv8 S07NJHbSOj8dIup4toSX2LfiCOGYwqbmv7mYH8YV2ZB0bpz/QvIzEse54g7ALKZCly+c mcnlOajlwFisqGm6a4y8WyJ9CkVBzZ9ZUO63TxBUQjlbEwYA8jTTarKgFq6LpHY1TtZo wrYg== X-Gm-Message-State: AOJu0Yy7x/+FZ9oeONhcDt4mYMYWVOd2kwcf3igl4LcIpCKlXdVe+2rm 2CNuNu1GcYRRDA4l1Nx3rrfup7QrPSKpjnDkAv3BJu8EF45WkKTUXcyBYA== X-Gm-Gg: ASbGnctMo9BXsFN9MF1g7ypEz98C1VmKFFhpKZLRpzzenQgn0O7jvxB1N+22VlyYTn6 23v9oEq/vboRxpfKjqhqscDOfZEfDb5A7F5sqdn5aFhZ8LzJVPWndyF23HUe8eSpDhRA9Uqj+pA Gg0b0MG4D6tASmDRs8ywQg+SMXiJWdYLRkHFi6KzWIlor+urMPAOOvDN/cEJ546vJEyMebdwl03 UBMs4TM9+77EYUy9d4Ddo/9REmo9axZIzbL/MlfjiRXIEmPfCZla5HL6UC+Ab0l8p9NFwvnYk+S XF0+gqcLsDUorl5YIvOmIHaHf+9GUrATBKfUj1/JpGIsrxZ3FXNXIcaOtYDi8rNI2nB9DqVPIfc VJwpsWg== X-Google-Smtp-Source: AGHT+IFy9fmSxYtEeZU6WWZsfbbRW57FHVe86W2UYUHIF7iu+UFLO8RTnOPEGoutjqdvgXzifgzqUA== X-Received: by 2002:a5d:648c:0:b0:38d:d0ca:fbad with SMTP id ffacd0b85a97d-39d6fc48d22mr6130170f8f.14.1744018853144; Mon, 07 Apr 2025 02:40:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:52 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/18] ca-certificates: submit sysroot patch upstream, drop default-sysroot.patch Date: Mon, 7 Apr 2025 11:40:33 +0200 Message-Id: <20250407094045.753021-6-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214415 From: Alexander Kanavin ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch was using a non-standard environment variable, and was replaced with a patch that adds a command line option (and then this was submitted upstream). ca-certificates recipe was tweaked accordingly, and nothing else in core or meta-oe is using update-ca-certificates. Drop default-sysroot.patch as the use case is unclear: sysroot is explicitly specified in all known invocations of update-ca-certificate, and if there's a place where it isn't, then update-ca-certificates will error out trying to write to /etc, and should be fixed to explicitly specify the sysroot. Signed-off-by: Alexander Kanavin --- ...ca-certificates-add-a-sysroot-option.patch | 36 ++++++++++++ ...2-update-ca-certificates-use-SYSROOT.patch | 46 --------------- ...icates-use-relative-symlinks-from-ET.patch | 18 +++--- .../ca-certificates/default-sysroot.patch | 58 ------------------- .../ca-certificates_20241223.bb | 9 ++- 5 files changed, 49 insertions(+), 118 deletions(-) create mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch b/meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch new file mode 100644 index 00000000000..ba5bb69657e --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch @@ -0,0 +1,36 @@ +From d6bb773745c2e95fd1a414e916fbed64e0d8df66 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 31 Mar 2025 17:42:25 +0200 +Subject: [PATCH] sbin/update-ca-certificates: add a --sysroot option + +This allows using the script in cross-compilation environments +where the script needs to prefix the sysroot to every other +directory it operates on. There are individual options +to set those directories, but using a common prefix option +instead is a lot less clutter and more robust. + +Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/13] +Signed-off-by: Alexander Kanavin +--- + sbin/update-ca-certificates | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index 4bb77a0..1e737b9 100755 +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -59,6 +59,14 @@ do + --hooksdir) + shift + HOOKSDIR="$1";; ++ --sysroot) ++ shift ++ SYSROOT="$1" ++ CERTSCONF="$1/${CERTSCONF}" ++ CERTSDIR="$1/${CERTSDIR}" ++ LOCALCERTSDIR="$1/${LOCALCERTSDIR}" ++ ETCCERTSDIR="$1/${ETCCERTSDIR}" ++ HOOKSDIR="$1/${HOOKSDIR}";; + --help|-h|*) + echo "$0: [--verbose] [--fresh]" + exit;; diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch deleted file mode 100644 index 48c69f0cbc0..00000000000 --- a/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cdb53438bae194c1281c31374a901ad7ee460408 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -Date: Tue, 19 Mar 2013 17:14:33 +0100 -Subject: [PATCH] update-ca-certificates: use $SYSROOT - -Upstream-Status: Pending - -Signed-off-by: Andreas Oberritter ---- - sbin/update-ca-certificates | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index 5a0a1da..36cdd9a 100755 ---- a/sbin/update-ca-certificates -+++ b/sbin/update-ca-certificates -@@ -24,12 +24,12 @@ - verbose=0 - fresh=0 - default=0 --CERTSCONF=/etc/ca-certificates.conf --CERTSDIR=/usr/share/ca-certificates --LOCALCERTSDIR=/usr/local/share/ca-certificates -+CERTSCONF=$SYSROOT/etc/ca-certificates.conf -+CERTSDIR=$SYSROOT/usr/share/ca-certificates -+LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates - CERTBUNDLE=ca-certificates.crt --ETCCERTSDIR=/etc/ssl/certs --HOOKSDIR=/etc/ca-certificates/update.d -+ETCCERTSDIR=$SYSROOT/etc/ssl/certs -+HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d - - while [ $# -gt 0 ]; - do -@@ -92,9 +92,9 @@ add() { - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ - -e 's/[()]/=/g' \ - -e 's/,/_/g').pem" -- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] -+ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ] - then -- ln -sf "$CERT" "$PEM" -+ ln -sf "${CERT##$SYSROOT}" "$PEM" - echo "+$PEM" >> "$ADDED" - fi - # Add trailing newline to certificate, if it is missing (#635570) diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch b/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch index 214f88909a9..929945b56f9 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch @@ -1,4 +1,4 @@ -From 38d47c53749c6f16d5d7993410b256116e0ee0b8 Mon Sep 17 00:00:00 2001 +From a69933f96a8675369de702bdb55e57dc21f65e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Wed, 28 Mar 2018 16:45:05 +0100 Subject: [PATCH] update-ca-certificates: use relative symlinks from @@ -45,26 +45,26 @@ Signed-off-by: André Draszik 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index f7d0dbf..97a589c 100755 +index 1e737b9..8510082 100755 --- a/sbin/update-ca-certificates +++ b/sbin/update-ca-certificates -@@ -29,6 +29,7 @@ CERTSDIR=$SYSROOT/usr/share/ca-certificates - LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates +@@ -30,6 +30,7 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates CERTBUNDLE=ca-certificates.crt - ETCCERTSDIR=$SYSROOT/etc/ssl/certs + ETCCERTSDIR=/etc/ssl/certs + HOOKSDIR=/etc/ca-certificates/update.d +FSROOT=../../../ # to get from $ETCCERTSDIR to the root of the file system - HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d while [ $# -gt 0 ]; -@@ -125,9 +126,10 @@ add() { + do +@@ -100,9 +101,10 @@ add() { PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ -e 's/[()]/=/g' \ -e 's/,/_/g').pem" -- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ] +- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] + DST="$(echo ${CERT} | sed -e "s|^$SYSROOT||" -e "s|^/|$FSROOT|" )" + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${DST}" ] then -- ln -sf "${CERT##$SYSROOT}" "$PEM" +- ln -sf "$CERT" "$PEM" + ln -sf "${DST}" "$PEM" echo "+$PEM" >> "$ADDED" fi diff --git a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch deleted file mode 100644 index c2a54c00961..00000000000 --- a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 50aadd3eb1c4be43d3decdeb60cede2de5a687be Mon Sep 17 00:00:00 2001 -From: Christopher Larson -Date: Fri, 23 Aug 2013 12:26:14 -0700 -Subject: [PATCH] ca-certificates: add recipe (version 20130610) - -Upstream-Status: Pending - -update-ca-certificates: find SYSROOT relative to its own location - -This makes the script relocatable. ---- - sbin/update-ca-certificates | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index 2d3e1fe..f7d0dbf 100755 ---- a/sbin/update-ca-certificates -+++ b/sbin/update-ca-certificates -@@ -66,6 +66,39 @@ do - shift - done - -+if [ -z "$SYSROOT" ]; then -+ local_which () { -+ if [ $# -lt 1 ]; then -+ return 1 -+ fi -+ -+ ( -+ IFS=: -+ for entry in $PATH; do -+ if [ -x "$entry/$1" ]; then -+ echo "$entry/$1" -+ exit 0 -+ fi -+ done -+ exit 1 -+ ) -+ } -+ -+ case "$0" in -+ */*) -+ sbindir=$(cd ${0%/*} && pwd) -+ ;; -+ *) -+ sbindir=$(cd $(dirname $(local_which $0)) && pwd) -+ ;; -+ esac -+ prefix=${sbindir%/*} -+ SYSROOT=${prefix%/*} -+ if [ ! -d "$SYSROOT/usr/share/ca-certificates" ]; then -+ SYSROOT= -+ fi -+fi -+ - if [ ! -s "$CERTSCONF" ] - then - fresh=1 diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20241223.bb b/meta/recipes-support/ca-certificates/ca-certificates_20241223.bb index bbdc7dd68d3..676e9e0c78a 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20241223.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20241223.bb @@ -16,9 +16,8 @@ PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" SRC_URI[sha256sum] = "dd8286d0a9dd35c756fea5f1df3fed1510fb891f376903891b003cd9b1ad7e03" SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/${BPN}_${PV}.tar.xz \ - file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ - file://default-sysroot.patch \ + file://0002-sbin-update-ca-certificates-add-a-sysroot-option.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ file://0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch \ " @@ -62,7 +61,7 @@ do_install:append:class-target () { } pkg_postinst:${PN}:class-target () { - SYSROOT="$D" $D${sbindir}/update-ca-certificates + $D${sbindir}/update-ca-certificates --sysroot $D } CONFFILES:${PN} += "${sysconfdir}/ca-certificates.conf" @@ -71,11 +70,11 @@ CONFFILES:${PN} += "${sysconfdir}/ca-certificates.conf" # we just run update-ca-certificate from do_install() for nativesdk. CONFFILES:${PN}:append:class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" do_install:append:class-nativesdk () { - SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates + ${D}${sbindir}/update-ca-certificates --sysroot ${D}${SDKPATHNATIVE} } do_install:append:class-native () { - SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates + ${D}${sbindir}/update-ca-certificates --sysroot ${D}${base_prefix} } RDEPENDS:${PN}:append:class-target = " openssl-bin openssl" From patchwork Mon Apr 7 09:40:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60839 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 47D2AC369A5 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.42759.1744018855843273647 for ; Mon, 07 Apr 2025 02:40:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LJ7LMy3G; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43cf680d351so29767235e9.0 for ; Mon, 07 Apr 2025 02:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018854; x=1744623654; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8RcI2qUZLvVkiX7/IDMl76SwCTKAAxO9M/qURvhyRaM=; b=LJ7LMy3GCP/Lrh3SYs+JnH1+7hPT1ZuuvPbExyc5ZHiaoU6MtEE8iqhuUFSs8TNTmO FwIGTZ9q2d6PhgEhTbWThF2m2mkWMFKEsMcwi+gEQ2OWjx/w5JdGffaaQXejq8NHm/M5 P2fYqXhSAIb2cm3/m0yRwOEMkF7lp/mfloLzMNL89DXfHo1qcPzWRz9Tui0BNz7a/vW5 ZI9itDuhYLI8NeT37pCvomL0GG7n12akb8tnh53bG4JvVdVS0/nOeZuqGTNIy4dMKhLT +Ty7aTEef38MtOMQik7Vl79soGqXdFPB0AN0yKMf0qFogVbCxvZ0wWxwNC1UzYefKBqr HUnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018854; x=1744623654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8RcI2qUZLvVkiX7/IDMl76SwCTKAAxO9M/qURvhyRaM=; b=A61FN3FZQKwB0VAwZfoAC9TQP7IuA1DxXP1CllumCrqt6EsjgrqmXifpLy/8Bys9vW fLZYTYzxnsLgpydkrdm6aI2AzRP/xrYMmQGezBty81waARXW8UX6BWtH8O71KfoTcpth gqAaksKfCLfl7zksMh/A2BBDzBJS5QN2z0K0SfmfspEs4MancY4C507+1dFyTqOlSELg qeCCVNM8nZge5QM3BLgZt07nsiCjgp33eeWiPM/Q1Wwj8aQEuZy04noIL1QFfBMpgvvp iq/r4iAS9JKERInx1d5kOsn73Np7SY524yUgrmf/hTcYfs8Mn9KhCPghsBe5qVse9T/z 5ntQ== X-Gm-Message-State: AOJu0YyCoOvuudiW6/AnmAHmoGHmv9EYHQWFolV/rAVC1Yqp91Tkgyk4 0B8z0MpXR966A4QQZrK7VZzgM2hWzqQIkqGEnkXmZyRYef3aw1cpxa+I+A== X-Gm-Gg: ASbGncvyH3ht1wvEC2S2Wlf6acjRmMsuYw25lktbBgPcf0wQbNWZfoeMV5XEbLJK4Or svofMy0SEgGf0f4qRweAFpQ5Rh7qNkCvL725sAOCMGs8I+umpVdzDXfP4RYtgpJdmOVvvz8Evyu 4Df06+35hob0sFS6lXObnOj4V7ANgUgcKsxOrXirzwCEj7hB0s/8MXaDlYMeNaIZkZRe8caotGL zYgj6PS8QeXM4ETwGS+fiEYGN7KV4ix+Ba42DiUwO9FUEOMhRLxcrTq4QcoDv8PHez8HyR2EqF0 Q2LSnDwxY9KxopH+D8z/yO69gHpqeScIVTZSbZkdwhog0zY5SV9q21AVcSI248iR6parwlzJfMk UgHUMsQ== X-Google-Smtp-Source: AGHT+IFBdHYjCqREbz4AGOE88Hhhtbv3P2Sz3kPu6iv7rXZ0YpeT6qeyu/pWuDT1X2qEJieEmdcYxA== X-Received: by 2002:a05:600c:19ce:b0:43b:ca8c:fca3 with SMTP id 5b1f17b1804b1-43eceec3b21mr101890795e9.11.1744018853824; Mon, 07 Apr 2025 02:40:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:53 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/18] vulkan-samples: rewrite and submit reproducubility patch upstream Date: Mon, 7 Apr 2025 11:40:34 +0200 Message-Id: <20250407094045.753021-7-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214416 From: Alexander Kanavin At some point the problematic define ceased to be used anywhere, and so we can simply patch it out (and remove the associated option setting from the recipe). Signed-off-by: Alexander Kanavin --- .../0001-framework-Include-stdint.h.patch | 2 +- ...an-samples-Fix-reproducibility-issue.patch | 43 ------------------- ...bal_options.cmake-removed-unused-ROO.patch | 30 +++++++++++++ .../vulkan/vulkan-samples_git.bb | 8 +--- 4 files changed, 32 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch create mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch index 8d323f2cef8..b30b0e0017f 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch @@ -1,4 +1,4 @@ -From 445fcfd7b9245881d769880a5942ce9faa893045 Mon Sep 17 00:00:00 2001 +From 9a187d2f54d3683636b951a10c165d949b3a1d18 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Mar 2025 20:09:35 -0700 Subject: [PATCH] framework: Include stdint.h diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch deleted file mode 100644 index c16e05112f9..00000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d998c753254649c7cf7c64e3fed78e41c11ad7ed Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Wed, 23 Aug 2023 09:38:37 +0200 -Subject: [PATCH] vulkan-samples: Fix reproducibility issue - -There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths -used for logging with LOGE() in the code. We need to make this match the value we use -in the debug source remapping from CFLAGS - -We export the right path to use in the recipe with: - -EXTRA_OECMAKE = "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" - -and we then patch this into the code instead of the broken use -of CMAKE_SOURCE_DIR since __FILENAME__ will match our path prefix -changes. - -This also breaks reproducibility since the path length of the build directory -will currently change the output! - -Upstream-Status: Pending [needs to be discussed upstream] -Signed-off-by: Richard Purdie - -Signed-off-by: Julien Stephan ---- - bldsys/cmake/global_options.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake -index b15c2da..d8952e5 100644 ---- a/bldsys/cmake/global_options.cmake -+++ b/bldsys/cmake/global_options.cmake -@@ -62,7 +62,7 @@ set(CMAKE_CXX_STANDARD 14) - set(CMAKE_DISABLE_SOURCE_CHANGES ON) - set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) - --string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE) -+string(LENGTH "${CMAKE_DEBUG_SRCDIR}/" ROOT_PATH_SIZE) - add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE}) - - set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}") --- -2.41.0 diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch new file mode 100644 index 00000000000..ffac2d78ce6 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch @@ -0,0 +1,30 @@ +From da4ef211810bc3b0c51ea89f02c031a170fe0cb8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 1 Apr 2025 18:53:34 +0200 +Subject: [PATCH] bldsys/cmake/global_options.cmake: removed unused + ROOT_PATH_SIZE define + +After various refactorings it is no longer used anywhere (and +is problematic for build reproducibility, as build path sizes can +differ between build hosts). + +Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1325] +Signed-off-by: Alexander Kanavin +--- + bldsys/cmake/global_options.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake +index 96c7add..67a6c5e 100644 +--- a/bldsys/cmake/global_options.cmake ++++ b/bldsys/cmake/global_options.cmake +@@ -126,9 +126,6 @@ set(CMAKE_CXX_STANDARD 17) + set(CMAKE_DISABLE_SOURCE_CHANGES ON) + set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + +-string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE) +-add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE}) +- + set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_CXX_FLAGS_DEBUG}") + diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 75174f6a91f..554e6eb2902 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -6,9 +6,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ - file://0001-vulkan-samples-Fix-reproducibility-issue.patch \ file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch;patchdir=third_party/glslang \ file://0001-framework-Include-stdint.h.patch \ + file://0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch \ " UPSTREAM_CHECK_COMMITS = "1" @@ -25,12 +25,6 @@ inherit cmake features_check FILES:${PN} += "${datadir}" -# -# There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths -# used for logging with LOGE in the code. We need to make this match the value we use -# in the debug source remapping from CFLAGS -# -EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" # Binaries built with PCH enabled don't appear reproducible, differing results were seen # from some builds depending on the point the PCH was compiled. Disable it to be # deterministic From patchwork Mon Apr 7 09:40:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60838 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 5C73AC369A4 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.43305.1744018856667554667 for ; Mon, 07 Apr 2025 02:40:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AytyEuMn; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so33610995e9.1 for ; Mon, 07 Apr 2025 02:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018855; x=1744623655; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=85gLOCQ1XraZAXS6NhOvyuwYaw1NefVa5O75GQfFszY=; b=AytyEuMneiZNwHd82qK4lSr4Ui/AmIvN0M1KMUCi/sJBKW0ObYmlvtiXHiMFqfiPW+ FeF4De4oq7pSFpciRrUzjLl5RgNRvZ73TrwP48P8VJ4eyKwkJL1cpOU+0fs3lCx6C0T3 A02lMhtNz4wr0JElZVOogIX3VYySikPmELV2lCnB8zb35rQIr2AIeLR42gWB0PNkdW4P z6hwnZoVHvWI42BaBJEhyRcHCD6C/A3Kgb29HTUALvPRX42oaxf4TrjH0Y3T6xqLlo7S rSTF+jfUSof9ltDan5lzFC4q4LYZPH+6TY5QkxDK649QnLOWlTldVhUhb1WVJXg4RVEi nvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018855; x=1744623655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=85gLOCQ1XraZAXS6NhOvyuwYaw1NefVa5O75GQfFszY=; b=WrAybXc0rXymyb6D8XCRKqwpAUwZoEXyrmX82HtawXVGEeWj3zep5GNE1St3EcGaS4 9AYhWwxskFA6ChiffGWLtknf7MrvJnTy1heRJLJLoFah+yefBajFcgVs32hJ/0KF7ZBk G0XCxRKIYHXYjf9jazBPuXoXe1axfVrYVVykfCFD7QPgmRTTMCxK3ESFrJh3FeBu6eZo tp4IUssq6Oru/xqZbLhKPKIRjUoJW6CMde8vYekwv4D06WJgxW+c6BYgxPEccsWOsuPL ONAkeuU7rO6l7Mkzbn7WF7+cehvgSG/7Zl3hQn434KWFYDQBCyjPUWLDX7tVBzqYi/52 Td+g== X-Gm-Message-State: AOJu0YzoYC1xzv08Q1wzo6q7m4+WBXp1pp5CUGr6DoTEetyqvfcKHSLT Ropba3KETuDMcm2WRBA7yTxI4atoRbymjZm3vWwmOfroP8MxC5Mm4j9jjg== X-Gm-Gg: ASbGncsgleVzA7u5ZaUWB/s8AFPdkvN3pYfc+CGpJCgzUsIV6+Nu1l5lsExjAAdomNP 7J6yV3ZTIRy0uhJnMty6WYsQUjvit1appgWtzNtMnor2etDlHbponL7mbx8gMmvFWGNopIDWA0a ilXCE+YvTwnA1w+dMvG/HccFxTzU+q728DbhvKe6kiJJeRMp0PXRcC9QbK8NsndoR5PKBfb2iS1 SYep/0/6OkX9VV+4jXgRurDgJ8mULQ6hpyJIr4rUmWWkTXRT0hJ+0kNdBjCKqsvemjKOB+mz/ls R8hsvcN5inC8iu4LtqXK62wi53fhCQDQmtfG6GAWM1eh7bIcwLT8WqDxs+XIukj2GIqqSDbDcns lMvPaiA== X-Google-Smtp-Source: AGHT+IG1/DUT67R6dIBB/rz9bZsynENhjL10mrRuwmxTDrIx1pfUci0foIDicC4H1rkdAHMRlB6vtg== X-Received: by 2002:a05:600c:6990:b0:439:873a:1114 with SMTP id 5b1f17b1804b1-43ecedc1cb8mr110645005e9.6.1744018854530; Mon, 07 Apr 2025 02:40:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:54 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/18] tcl: provide a description for shared library name fixup patch Date: Mon, 7 Apr 2025 11:40:35 +0200 Message-Id: <20250407094045.753021-8-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214417 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch b/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch index 343209ececc..cefcb24433f 100644 --- a/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch +++ b/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch @@ -1,9 +1,15 @@ From 822a73a5dec13549cb20e6c7338b059ece2ea95a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Dec 2009 23:59:44 +0000 -Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function +Subject: [PATCH] tcl: add .0 to libtcl.so filename -Upstream-Status: Pending +This patch is fixing the issue after the fact; the issue +is that upstream defines the shared library filename as +libtcl.so (without version) for all platforms in unix/tcl.m4, +and I (AlexK) suspect they won't be interested in +changing that. + +Upstream-Status: Inappropriate [see above] --- unix/Makefile.in | 5 ++++- unix/tcl.m4 | 3 +++ From patchwork Mon Apr 7 09:40:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60836 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 397A6C3601E for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.43306.1744018857096023742 for ; Mon, 07 Apr 2025 02:40:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=D/mgfszs; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-39149bccb69so3801158f8f.2 for ; Mon, 07 Apr 2025 02:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018855; x=1744623655; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5OVd2enGqLzlh6UWUEavy6qFZnTaQGKKdAwr2RRWDEY=; b=D/mgfszsc2RsoOWnnshReOE85YXXtGKkDJWvGnI+VN4dnjAjYhI4tf08WuDq5t+P6Y EA9g1qUHFdaPCD7EG4dgNC1m6WTuuyZHlIHRJ722aUr3Hasim7ZMlfMT/LoB/FEenj5O xu5UpmcwkI++lX+J75+DMFpEUQjlJopBiChNQ8WY23BLeW68LqYMU3dNYpl0GTxSEEkS Urly59LHv0ZYL8nCoImWd2oRdYymPpeAlZFFo8TjWixLFeK3NCvNo25LvPCYuGcwnCkU iJjd6zdpo8acNCHEvNO5IW6gZDSBbzTpS8qrZ0bGtxU5gnXrSzU/Iuyd4vV1qZzTp33B QBrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018855; x=1744623655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5OVd2enGqLzlh6UWUEavy6qFZnTaQGKKdAwr2RRWDEY=; b=dLn66TPucggiTe7y6332vxh99rytdmcV9KZGpM97QjZKHYCx8lRT3zgLB8x2Yo40DS ineN2MU2P+JVesZPJYb2pw/YiARVWI+k1qaBLKuZlnVFRZkmkdnbRr3J9l5uteNLIaCO T6ljd7rPjqTxUd6NmqWY66vam/INQalH7CRdUYgFE/TvIJulAJDJTB7DfReLyplnu6bs /y7uyOS7ktVXi1Mso1nq6wSuDFxkdgeCmW5WOoWKdzscRAuE51Pg8/xGpcgklVB0wtGk S1AR4jGnW0isyJv18Y+Xlie8yStzHEwVhi+Yn78UZ4E01MNJyUr4M5Do8AMpTp6me+yj tH8w== X-Gm-Message-State: AOJu0YzwrnF7coswvF68R/fycJHT29fHFdHJfMqK0f1lBBYqYwMaiXcs xRhP3h4H2OUeGiEFWjUVGHu158l+U64dKLZjfijUckcueNQZ7VY8WmlvHQ== X-Gm-Gg: ASbGncuXcJWOFWTfyut1JxizNSwrabbP6nghtv+p8mkhp7z2uFscNy8Qs7sVHgehAyY Y+z5AZz56DHFtP1AyU0u+pVBFxn2BTtdifl/PxAsQyU0ArQlPWjz/QU42zZpjcK1K4qN/iEeR4U xUcjXh7P8JvPNg/ZaRm5km8lf2sPYEYsvo9hdizch1f8VmfHqaed6hCCLvDjCr/l+l4qbSlSK+a HxShMoLKI+WZt4KZ7fCYUhOEZ3yQZGA/g148U2+T4xKz/W4Y9MSpxCiiDuD69EkncF4KEvsgP43 2YZ8lH35maZgmGPE/u3rzRi+es+gTuq2eVQ6XpfVdomW6Bd1DeF2+bzXPWIAK8AhfoO/Ooo4/HI l32CgCU1vbsX/qKYK X-Google-Smtp-Source: AGHT+IFfBczxbBh2MLTeC5ZmdACBoUb3UC3zRCz2TjZcAeUeBlKJs2qy8c9TT65exmLEQJ771IZPIQ== X-Received: by 2002:a5d:5988:0:b0:39c:2c38:4599 with SMTP id ffacd0b85a97d-39d6fd35821mr6835126f8f.48.1744018855181; Mon, 07 Apr 2025 02:40:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:54 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/18] xserver-xorg: submit 0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch upstream Date: Mon, 7 Apr 2025 11:40:36 +0200 Message-Id: <20250407094045.753021-9-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214418 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...6pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch index d1516c2f524..a196e507518 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch @@ -11,8 +11,11 @@ default it for older hardware for which it has shown to be better for. Others fall through to the -modesetting default. -Upstream-Status: Pending [Debian/Fedora patch -https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d] +Patch taken from: +https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d +https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/192254841ab79e102c18fc299f18af0e27d5b517 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1887] Signed-off-by: California Sullivan --- From patchwork Mon Apr 7 09:40:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60834 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 2ADD4C369A1 for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web11.42760.1744018857757984534 for ; Mon, 07 Apr 2025 02:40:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=f+rXXy3O; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso3644869f8f.2 for ; Mon, 07 Apr 2025 02:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018856; x=1744623656; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FnEKViEOAmn6ycOZnfNlf3LYEpXidTFhrtm91dWuziE=; b=f+rXXy3OM4Ob/cv7Q/YtPLRcpUAiuUwmDW5ltTs1KZgUhBrR0F8aEtvcGZf/vlAaad SixjUerdsTlrhBZOB4+XtxY4PcylLpLXpzEqwD7r0qgA0ODXjaLGViiZABnMecVKDu7y YGsQU5QYFmxqKBWIxjw6b64OnZtqWDhOrYzrElG/9V55cF51G+lPBRwwSFkf8+yCodnE NA5Z01KVure5sxJpDJUVizpuLlO0g4qLiLpXaM10eMzqSDHY83qY8shECdzeeJ+7Dldb y6lG4jYMsGjOYXUfBXDu11MTdWaT6ePlW1g6XVM3d1U9q6NZaLrsAlRXvt7FJ9o5ePb/ NE6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018856; x=1744623656; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FnEKViEOAmn6ycOZnfNlf3LYEpXidTFhrtm91dWuziE=; b=u4U4IFaMAs8OFq+eCaaQiMqRK/qyziU6g0EDP3hYgozq+hsUS7hXnIXUgo0teMzFI/ hOd4k1rgJfVyz/191NlGbb71uw/iWj0JOra87UH4NvQRH8kLjdnvIZPamRdcxYzjbVnp j2GWoXmyLDNLKsICeQaiapcvcSgKWMUCCVKcJXA9A7MZKhumS4jgz31JfTT7Eqf+5eYn YxCtHt1TVV2fWdaJJAzBE/+Ac7UfcMOm6SJkFsEvz/dFEbKv4VjAKK/njcnbE1hjUu/K u9g1Wq2wDWTq0dC05mo8yv5D+oyINLxUiQBVo3e3T+akpHQhDMQusHwBMVdqUddAp2uM s/sg== X-Gm-Message-State: AOJu0YwqJXpnnh4EWySrj8aNNcbCQ3aCp68HVvBqo+3H/NAbpOSxmcXq foHG5I0WnSYMGtA4xYztV44MxFKClFwNiRHp6/C8eJiO2lyMVw6cq1M1PQ== X-Gm-Gg: ASbGncuS+Z7z4bSsySdI51G96DjUVvD5SxIr5zUWxpVHe2QTxI/n55c7Dxn0S7o0WNe fUGQKh/EKhPK1wSsKwKzy1WrMQQrUtkzfu6yYHVw1IF9VQuPE7HonUEdZ3xC9ewt5whxvaK05HP YXo8wKOQeWHxVbEBO49MnG5ZSB0Go5boEgxzmCHYVHQlBKlfvkRCVtQrdvplou8SIMXV9aOYnAt uO9MpqCt0s+j6JMuFUTCt4mWOEGAH9frRcIAnuA/577rIFh6OfZ78XiAVd2kU5c4mgNU3eO5dYD ka424gM/+seO962Hf38vvZ0wb/XMUC9J77LzkzOqecoM/oHvtZaon8glwZSYP0Ky7sSBoBglExY +OAP5yA== X-Google-Smtp-Source: AGHT+IFnnN9KE2ID4eLToByw1MO9GiWcx5PziYRHAjz/Jhoom+t1Y6TKtxlRZOnv+fwDBiBWLKKT7Q== X-Received: by 2002:a05:6000:1844:b0:391:12a5:3c95 with SMTP id ffacd0b85a97d-39d0de255d4mr9638810f8f.22.1744018855854; Mon, 07 Apr 2025 02:40:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:55 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/18] apt: remove 0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch Date: Mon, 7 Apr 2025 11:40:37 +0200 Message-Id: <20250407094045.753021-10-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214419 From: Alexander Kanavin The recipe unconditionally disables seccomp, so the code isn't even compiled. If this needs to come back in the future please submit upstream first. Signed-off-by: Alexander Kanavin --- ...atat64-and-prlimit64-defines-on-musl.patch | 48 ------------------- meta/recipes-devtools/apt/apt_2.6.1.bb | 1 - 2 files changed, 49 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt/0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch diff --git a/meta/recipes-devtools/apt/apt/0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch b/meta/recipes-devtools/apt/apt/0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch deleted file mode 100644 index f1816836b59..00000000000 --- a/meta/recipes-devtools/apt/apt/0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e849b161ce1d87ab369b921438abcf5b3a03e186 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 25 Apr 2021 08:57:03 -0700 -Subject: [PATCH] Hide fstatat64 and prlimit64 defines on musl - -musl defines fstatat64 and prlimit64 as macros which confuses the -seccomp sysall rewiring since there are syscalls with same names - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - methods/aptmethod.h | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/methods/aptmethod.h b/methods/aptmethod.h -index bd50e80..3085aed 100644 ---- a/methods/aptmethod.h -+++ b/methods/aptmethod.h -@@ -121,6 +121,12 @@ protected: - if (ctx == NULL) - return _error->FatalE("HttpMethod::Configuration", "Cannot init seccomp"); - -+#ifndef __GLIBC__ -+#pragma push_macro("fstatat64") -+#pragma push_macro("prlimit64") -+#undef fstatat64 -+#undef prlimit64 -+#endif - #define ALLOW(what) \ - if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(what), 0))) \ - return _error->FatalE("HttpMethod::Configuration", "Cannot allow %s: %s", #what, strerror(-rc)); -@@ -320,9 +326,11 @@ protected: - if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, seccomp_syscall_resolve_name(custom.c_str()), 0))) - return _error->FatalE("aptMethod::Configuration", "Cannot allow %s: %s", custom.c_str(), strerror(-rc)); - } -- - #undef ALLOW -- -+#ifndef __GLIBC__ -+#pragma pop_macro("fstatat64") -+#pragma pop_macro("prlimit64") -+#endif - rc = seccomp_load(ctx); - if (rc == -EINVAL) - { --- -2.31.1 - diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index 62a674d62bb..d605d950dd3 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb @@ -11,7 +11,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-Fix-musl-build.patch \ file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ file://0001-cmake-Do-not-build-po-files.patch \ - file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ file://0001-aptwebserver.cc-Include-array.patch \ file://0001-Remove-using-std-binary_function.patch \ file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ From patchwork Mon Apr 7 09:40:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60837 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 28A53C3601A for ; Mon, 7 Apr 2025 09:40:59 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.42761.1744018858444703081 for ; Mon, 07 Apr 2025 02:40:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CgX/dbVb; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so36171975e9.1 for ; Mon, 07 Apr 2025 02:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018857; x=1744623657; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/eGyiGedmQoPtPx6E3zBYu9hT3uLtfUt7vEBzkn3NCM=; b=CgX/dbVb9WVShSgBJYAwPj1o1grIkjeRGfhqCVwXFxQzJP6ZvIzs+1ZwVqlE/gZuHU Pw+P2vaEoLx/eoxE+PADCDw0BPPOBGhfZjxvZ1NZs5gMrjmsucVczqLGl8mwM6XGyuIF sbPu8u4GrQ9/1gLeMqwpmnrHyuQV61dwTEJiD6wxjRsa8KnI1oBhqfz8PYxre3ZpukhV FZMSskRSkoLT3ORSkoiEWFAmioVVfRImyFilf+9aNVtZaP4JevNfKD6fT3ddemkXodGq m72xgqDd8T4urWHOMDw19EyAeLOlTJLcIAF6CguASwn+7b9eIqbgX6R65V83Sp3dXErN B43w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018857; x=1744623657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/eGyiGedmQoPtPx6E3zBYu9hT3uLtfUt7vEBzkn3NCM=; b=soOnHUJZSks7sHvF1ORO4qVzdWTgqTaEygng8Z5iPqRRYpxl8e8x5lgB1pz0+kCkWH HRN3lv79rQfHbwXS8ox9Kjxltvf5eNfm2bo/uTAGAUjLTFxjkXrkvhyJgDECFNu9XmD8 MN7APkii+OV1vF+zUV2ha2eEdqdD5vZA3N3bQDCZUqzcMS6E93PIxVzEKfOJAJKlRMn3 Z/m5LtT2oeByBj4WtsNg7yqwsMgCKMMGOAa1Z9XOFOCXJb2N3LQrZ7lEkgF1n8UtlCGr EzC9iFL+y1+sdmyRhQcZWhkT8zLkqwt9+hgOQF2bn1WsqvdUbXXdS84AlnpNQTtL1YDK rtpQ== X-Gm-Message-State: AOJu0Yx2JQsD3fBXNwr1TT9P2uLDKAGG7e8VL2Mlg6gEpqdlNbvhJZS2 YaaV47jLzy2PQOUOqJGOeTbr/5fh96I58zC6OSQqajhS7Q5a50MmSVfBKQ== X-Gm-Gg: ASbGncu9JCMaili+jXz9OOXAKijKb0VOyadvsXLkOalfc3SvWi7Dkp9entya6s44rHk uBsndWXWWbLccYLalarZKoGPu3/wPJGpj8RPWkaMLolL3E+adscF+AKQ3hquUCYgJQFFpCnDMIc eMjvkTFk2qdXlwKjZ0gNKpFkNmU7GUiSqdU6hyVKzYpD2eZlTcxA2XX24pmslP38ur3ea0attlY g2VJDD/WXlvcdv/jixUCZF7rMK5s0XIM3kQN1epctsaDoJK1y3efG98qJ/WTmiJrkFinXWgYFMm iP0cloMhzeQa1GQ2jFjwi86Khza5sx/i2lBIXVnyo5b8V0ypvaHxMaYjAsBZIOuXiP6w3LLQl4V dOcqflf2gIPHayIdJ X-Google-Smtp-Source: AGHT+IGjqGgV8W6WhUspTabLFphjhm6iAGnN12F5oT4AiH1VBzuoOBHd9oXuDc39rwjqps80/16TUg== X-Received: by 2002:a05:600c:4e08:b0:43e:b027:479a with SMTP id 5b1f17b1804b1-43ee06944d3mr94309915e9.16.1744018856527; Mon, 07 Apr 2025 02:40:56 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:56 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/18] mdadm: fetch from git Date: Mon, 7 Apr 2025 11:40:38 +0200 Message-Id: <20250407094045.753021-11-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:40:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214420 From: Alexander Kanavin Upstream has released a new version (4.4) but not the tarball for it. Adjust one of the devtool selftests, as it requires that the recipe under test is using a tarball. Another selftest also needs to be tweaked to correctly clean up its modifications to that same recipe on test completion. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/devtool.py | 11 +++++++---- meta/recipes-extended/mdadm/mdadm_4.3.bb | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index ddbc554af01..0155ee62ee0 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1185,13 +1185,16 @@ class DevtoolUpdateTests(DevtoolBase): result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir) result = runCmd('git add devtool-new-file', cwd=tempdir) result = runCmd('git commit -m "Add a new file"', cwd=tempdir) - self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) + cleanup_cmd = 'cd %s; rm %s/*.patch; git add %s; git checkout %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)) + self.add_command_to_tearDown(cleanup_cmd) result = runCmd('devtool update-recipe %s' % testrecipe) result = runCmd('git add minicom', cwd=os.path.dirname(recipefile)) expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), ('A ', '.*/0001-Change-the-README.patch$'), ('A ', '.*/0002-Add-a-new-file.patch$')] self._check_repo_status(os.path.dirname(recipefile), expected_status) + result = runCmd(cleanup_cmd) + self._check_repo_status(os.path.dirname(recipefile), []) def test_devtool_update_recipe_git(self): # Check preconditions @@ -1248,7 +1251,7 @@ class DevtoolUpdateTests(DevtoolBase): def test_devtool_update_recipe_append(self): # Check preconditions - testrecipe = 'mdadm' + testrecipe = 'minicom' bb_vars = get_bb_vars(['FILE', 'SRC_URI'], testrecipe) recipefile = bb_vars['FILE'] src_uri = bb_vars['SRC_URI'] @@ -1266,7 +1269,7 @@ class DevtoolUpdateTests(DevtoolBase): # Check git repo self._check_src_repo(tempsrcdir) # Add a commit - result = runCmd("sed 's!\\(#define VERSION\\W*\"[^\"]*\\)\"!\\1-custom\"!' -i ReadMe.c", cwd=tempsrcdir) + result = runCmd('echo "Additional line" >> README', cwd=tempsrcdir) result = runCmd('git commit -a -m "Add our custom version"', cwd=tempsrcdir) self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % (os.path.dirname(recipefile), testrecipe)) # Create a temporary layer and add it to bblayers.conf @@ -1305,7 +1308,7 @@ class DevtoolUpdateTests(DevtoolBase): self.assertEqual(expectedlines2, f.readlines()) # Put commit back and check we can run it if layer isn't in bblayers.conf os.remove(bbappendfile) - result = runCmd("sed 's!\\(#define VERSION\\W*\"[^\"]*\\)\"!\\1-custom\"!' -i ReadMe.c", cwd=tempsrcdir) + result = runCmd('echo "Additional line" >> README', cwd=tempsrcdir) result = runCmd('git commit -a -m "Add our custom version"', cwd=tempsrcdir) result = runCmd('bitbake-layers remove-layer %s' % templayerdir, cwd=self.builddir) result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir)) diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index d90497d5a74..e3b94d4b6fd 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;branch=main;tag=mdadm-${PV} \ file://run-ptest \ file://mdadm-3.3.2_x32_abi_time_t.patch \ file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ @@ -26,7 +26,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-include-libgen.h-for-basename-API.patch \ " -SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" +SRCREV = "d709d4161d1dd51a976147e8372fbd99ff8183bd" +S = "${WORKDIR}/git" inherit ptest systemd From patchwork Mon Apr 7 09:40:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60846 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 78598C369A1 for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web10.43309.1744018859204381757 for ; Mon, 07 Apr 2025 02:40:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JCUy63gk; spf=pass (domain: gmail.com, ip: 209.85.128.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43cf0d787eeso45444885e9.3 for ; Mon, 07 Apr 2025 02:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018857; x=1744623657; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v8p/pov1qBoNfx+SqnTlz41RQkEbHc27Qw/9E0kHuoo=; b=JCUy63gkDhoMqC1AsJWdjePJflh29NMPBhUzN1rlApZEToR7kfrqz/pc/VMidregAo ZyC8JC9qHXt8fAElzw8u6fA6GX3p/c1HZ4EuD/ewnFrcAW/LGm8+GTmUZJl9G2OwXRHj JmHuuB6Ij3krM9BNYZ+c6estV2Tq54v0bN7XnNRUkTRClxFuc51jFCGkdUbG324cDiPb xTbjnEDZYgWiB0ihg2j6K6UqDYweuZepRQu79DZBimFo1aSoAmsGeo8E+JDOCRqbkf4D ig/7jMbyzNZO9SN+Xz8GUY60tiaXTkR9r7wODacswC/0bMvauhl6/K3ZAzGcjQJi2Y6R +6Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018857; x=1744623657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v8p/pov1qBoNfx+SqnTlz41RQkEbHc27Qw/9E0kHuoo=; b=reem33P5G91SPj2xunxBEMC7ZTb30Av+uU97M0e/tl3rlSzcbaIUkNgYHNZCz3ehR8 s00chAcQPoSs9cKzMNsdW5vmN5+4435HRGAuWXH5PNYlHqOZuEuy8tgfp2caoHcVRo9k EVVIn8lKP8U+wY0kpnhpDR/x7qxTVIPhEq9gyGUUfJNp8d1BFFYH75TIOj2TjdieU+pv VwLNdm39zIB2aSI6XYzY96JpjniNVghVFKpLfqHwv7rNJz7uCdU6jqtJY7styzmQ6VyX dsutDu8xapnHloNQ4VwbIPOB7/oEKPxa1bnzhbthnZnTIUUXw1bXRhnnkyAw0YHYMU4R waLw== X-Gm-Message-State: AOJu0YzH3uOaYZfIRULu+wfYsgOTMmVgs8McpZ13GZsyhboto7kauu0D 7RMlU2Tuk0jZsL6iJKNQ+g9aEg8MXnfCEEtQ2bnPDdCO0oMIRRfOykfY1g== X-Gm-Gg: ASbGncvTurgrp5TG9iqxRMm79v+7NrGv37wqEBkGwxh88zEqXjSOaqlII3d8SihpLYW AG8pAwCPvnSJrhpezycEBJnTK0u2nAmGBC3AabcEhuUv9sBBHBneL4zshAxriRr5+ToQNsEytIV V74QP10zhv4ttued2xmQhE5RbHr9/eDai3cItQiOtVfdrLWPK+RqOAnoIGfHnK+FbwDqw8x2SPn chHFhEvBauE+qgCiNHQHevlzx5/jR1qyLFIQQFb9cd3z2IK92QhKPMRqbU5M0rZqQPP3XU1YZrV d5haayGJyx1t8OD41h021WJqrwJRDAFY00kZ6BXC/dAhUTq0CYGN7npkDr3hE4wKrFtciuu6jPn WPCKFiA== X-Google-Smtp-Source: AGHT+IEChngNbWRcuBkyy96gKm5uZGw3dfT5I5Np3D62X+jt2CCbOI6zn72tpceSLaAZzLyY99ebxA== X-Received: by 2002:a05:6000:420f:b0:39c:2692:425a with SMTP id ffacd0b85a97d-39d0873fcd8mr8176153f8f.6.1744018857226; Mon, 07 Apr 2025 02:40:57 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:56 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/18] mdadm: update 4.3 -> 4.4 Date: Mon, 7 Apr 2025 11:40:39 +0200 Message-Id: <20250407094045.753021-12-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214421 From: Alexander Kanavin This update has been tested with glibc/musl and gcc/clang in all four combinations. Drop patches: 0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch 0001-fix-gcc-8-format-truncation-warning.patch 0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch mdadm-3.3.2_x32_abi_time_t.patch (issue fixed upstream) 0001-include-libgen.h-for-basename-API.patch 0001-mdadm.h-Undefine-dprintf-before-redefining.patch (issue no longer occurs) 0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch (service file significantly rewritten, the need for the tweak should be reassessed) debian-no-Werror.patch (replaced with setting CWFLAGS to an empty string in the recipe; we already set correct flags via CC/CFLAGS, and upstream's only get in the way) Signed-off-by: Alexander Kanavin --- ...-corosync-and-dlm-header-files-check.patch | 6 +- .../files/0001-Makefile-install-mdcheck.patch | 6 +- ...for-implicit-fallthrough-warning-sup.patch | 44 --------------- ...-fix-gcc-8-format-truncation-warning.patch | 36 ------------ ...01-include-libgen.h-for-basename-API.patch | 56 ------------------- ...-y-for-use-syslog-to-recive-event-re.patch | 25 --------- ...h-Undefine-dprintf-before-redefining.patch | 39 ------------- ...FILE_OFFSET_BITS-to-enable-largefile.patch | 18 +++--- ...ts.h-include-for-NAME_MAX-definition.patch | 24 -------- ...-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch | 10 ++-- .../mdadm/files/debian-no-Werror.patch | 29 ---------- .../files/mdadm-3.3.2_x32_abi_time_t.patch | 36 ------------ .../mdadm/files/xmalloc.patch | 32 +++++++++++ .../mdadm/{mdadm_4.3.bb => mdadm_4.4.bb} | 15 ++--- 14 files changed, 56 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch delete mode 100644 meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch delete mode 100644 meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch delete mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch delete mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch delete mode 100644 meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch delete mode 100644 meta/recipes-extended/mdadm/files/debian-no-Werror.patch delete mode 100644 meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch create mode 100644 meta/recipes-extended/mdadm/files/xmalloc.patch rename meta/recipes-extended/mdadm/{mdadm_4.3.bb => mdadm_4.4.bb} (84%) diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch index fa1f0aa5204..8598aea1f1e 100644 --- a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch +++ b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch @@ -1,4 +1,4 @@ -From 76856a34a4e339e4a53b09d028f89fcc520e3127 Mon Sep 17 00:00:00 2001 +From 232101e2fcc6359fb6db2bc232570e373e368c75 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 9 Feb 2016 11:44:01 +0200 Subject: [PATCH] Fix the path of corosync and dlm header files check @@ -14,10 +14,10 @@ Signed-off-by: Maxin B. John 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index cbdba49..7bfd336 100644 +index bcd092de..0a78cd22 100644 --- a/Makefile +++ b/Makefile -@@ -109,8 +109,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots +@@ -130,8 +130,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots SYSTEMD_DIR=/lib/systemd/system LIB_DIR=/usr/libexec/mdadm diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch index a4be1aa8a1c..bb4e8d06042 100644 --- a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch +++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch @@ -1,4 +1,4 @@ -From 0be066d57a7dd1aead5488d0a095863608f2e559 Mon Sep 17 00:00:00 2001 +From 407691e11037709af888ce2cf6bd5eac6971ac61 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 25 Jan 2022 16:25:01 +0800 Subject: [PATCH] Makefile: install mdcheck @@ -14,10 +14,10 @@ Signed-off-by: Chen Qi 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 1141971..f4059e2 100644 +index 981e16fa..b28e7855 100644 --- a/Makefile +++ b/Makefile -@@ -325,6 +325,7 @@ install-systemd: systemd/mdmon@.service +@@ -345,6 +345,7 @@ install-systemd: systemd/mdmon@.service install-bin: mdadm mdmon $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon diff --git a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch deleted file mode 100644 index 16fdefbbd1c..00000000000 --- a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c29d086714b49a6d76ccca83b4a6fa2f139bad6e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 13 Oct 2017 10:27:34 -0700 -Subject: [PATCH] Use CC to check for implicit-fallthrough warning support - -This warning it new in gcc7 and in cross compile case -its possible that build host gcc is version 7+ but the -cross compile used for compiling mdadm is < version 7 - -Signed-off-by: Khem Raj -Upstream-Status: Pending ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 7bfd336..9ab6a65 100644 ---- a/Makefile -+++ b/Makefile -@@ -56,21 +56,21 @@ CWFLAGS += -Wp -O3 - endif - - ifeq ($(origin FALLTHROUGH), undefined) -- FALLTHROUGH := $(shell gcc -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l) -+ FALLTHROUGH := $(shell ${CC} -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l) - ifneq "$(FALLTHROUGH)" "0" - CWFLAGS += -Wimplicit-fallthrough=0 - endif - endif - - ifeq ($(origin FORMATOVERFLOW), undefined) -- FORMATOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l) -+ FORMATOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l) - ifneq "$(FORMATOVERFLOW)" "0" - CWFLAGS += -Wformat-overflow - endif - endif - - ifeq ($(origin STRINGOPOVERFLOW), undefined) -- STRINGOPOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l) -+ STRINGOPOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l) - ifneq "$(STRINGOPOVERFLOW)" "0" - CWFLAGS += -Wstringop-overflow - endif diff --git a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch b/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch deleted file mode 100644 index 3cf295106fb..00000000000 --- a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 78e5bb08971a5644a56af60d51ef35e13522e811 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 14 Dec 2018 15:12:31 +0800 -Subject: [PATCH] fix gcc-8 format-truncation warning - -While compiling with `-Werror=format-truncation=', it failed -[snip] -|super0.c:236:32: error: 'snprintf' output may be truncated -before the last format character [-Werror=format-truncation=] -| snprintf(nb, sizeof(nb), "%4d", d); -| ^ -|super0.c:236:3: note: 'snprintf' output between 5 and 12 bytes -into a destination of size 11 -| snprintf(nb, sizeof(nb), "%4d", d); -[snip] - -Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/34] - -Signed-off-by: Hongxu Jia ---- - super0.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/super0.c b/super0.c -index a7c5f81..a79b6bd 100644 ---- a/super0.c -+++ b/super0.c -@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost) - d++) { - mdp_disk_t *dp; - char *dv; -- char nb[11]; -+ char nb[12]; - int wonly, failfast; - if (d>=0) dp = &sb->disks[d]; - else dp = &sb->this_disk; diff --git a/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch b/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch deleted file mode 100644 index 70be43c15ec..00000000000 --- a/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7759ceda978aba38861d4846d0c1657465b72f04 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 24 Mar 2024 23:13:32 -0700 -Subject: [PATCH] include libgen.h for basename API - -Musl does no more provide it via string.h therefore builds with newer -compilers e.g. clang-18 fails due to missing prototype for basename -therefore add libgen.h to included headers list - -Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20240325061537.275811-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj ---- - Monitor.c | 1 + - platform-intel.c | 1 + - super-intel.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/Monitor.c b/Monitor.c -index 824a69f..e3942e1 100644 ---- a/Monitor.c -+++ b/Monitor.c -@@ -26,6 +26,7 @@ - #include "udev.h" - #include "md_p.h" - #include "md_u.h" -+#include - #include - #include - #include -diff --git a/platform-intel.c b/platform-intel.c -index ac282bc..5d6687d 100644 ---- a/platform-intel.c -+++ b/platform-intel.c -@@ -19,6 +19,7 @@ - #include "mdadm.h" - #include "platform-intel.h" - #include "probe_roms.h" -+#include - #include - #include - #include -diff --git a/super-intel.c b/super-intel.c -index dbea235..881dbda 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -23,6 +23,7 @@ - #include "dlink.h" - #include "sha1.h" - #include "platform-intel.h" -+#include - #include - #include - #include --- -2.44.0 - diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch deleted file mode 100644 index f224d0008d4..00000000000 --- a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c27e128fdc062ec3fcdf7b48a8c5078615c538df Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 1 Jul 2019 11:34:49 +0800 -Subject: [PATCH] mdadm: add option -y for use syslog to recive event report - -fix service startup failed when there is -No mail address or alert command - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Changqing Li ---- - systemd/mdmonitor.service | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service -index 9c36478..d289846 100644 ---- a/systemd/mdmonitor.service -+++ b/systemd/mdmonitor.service -@@ -14,4 +14,4 @@ Documentation=man:mdadm(8) - Environment= MDADM_MONITOR_ARGS=--scan - EnvironmentFile=-/run/sysconfig/mdadm - ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh --ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS -+ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch deleted file mode 100644 index 52daea2a495..00000000000 --- a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4dd5c2659722b44409cee28b4cea68cdeaa1f987 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 9 May 2016 22:03:57 +0000 -Subject: [PATCH] mdadm.h: Undefine dprintf before redefining - -dprintf is also defined in libc see -usr/include/bits/stdio2.h, this comes into -play especially when fortify sources is enabled -and compilers like clang reports the override - -In file included from policy.c:25: -./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined] - ^ -/mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here - -Signed-off-by: Khem Raj -Upstream-Status: Pending ---- - mdadm.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mdadm.h b/mdadm.h -index 1f28b3e..04996e2 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -1869,11 +1869,13 @@ static inline sighandler_t signal_s(int sig, sighandler_t handler) - } - - #ifdef DEBUG -+#undef dprintf - #define dprintf(fmt, arg...) \ - fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg) - #define dprintf_cont(fmt, arg...) \ - fprintf(stderr, fmt, ##arg) - #else -+#undef dprintf - #define dprintf(fmt, arg...) \ - ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) - #define dprintf_cont(fmt, arg...) \ diff --git a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch index 13435ee418f..aa874dbec36 100644 --- a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch +++ b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch @@ -1,4 +1,4 @@ -From aa86de05cd6a75222b38e0789ac96fe00f705430 Mon Sep 17 00:00:00 2001 +From 9e3b15adf86147fe581cd2159cb99708abe26158 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Nov 2022 12:31:22 -0800 Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/raid6check.c b/raid6check.c -index 9947776..8e7f142 100644 +index 99477761..8e7f1421 100644 --- a/raid6check.c +++ b/raid6check.c @@ -22,6 +22,9 @@ @@ -60,7 +60,7 @@ index 9947776..8e7f142 100644 if (seek_res < 0) { fprintf(stderr, "lseek to source %d failed\n", i); diff --git a/restripe.c b/restripe.c -index a7a7229..1c03577 100644 +index 5e126eb7..af76c634 100644 --- a/restripe.c +++ b/restripe.c @@ -22,6 +22,9 @@ @@ -71,9 +71,9 @@ index a7a7229..1c03577 100644 +#define _FILE_OFFSET_BITS 64 + #include "mdadm.h" - #include + #include "xmalloc.h" -@@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned long long *offsets, +@@ -583,7 +586,7 @@ int save_stripes(int *source, unsigned long long *offsets, raid_disks, level, layout); if (dnum < 0) abort(); if (source[dnum] < 0 || @@ -82,7 +82,7 @@ index a7a7229..1c03577 100644 offsets[dnum] + offset, 0) < 0 || read(source[dnum], buf+disk * chunk_size, chunk_size) != chunk_size) { -@@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned long long *offsets, +@@ -756,8 +759,8 @@ int restore_stripes(int *dest, unsigned long long *offsets, raid_disks, level, layout); if (src_buf == NULL) { /* read from file */ @@ -93,7 +93,7 @@ index a7a7229..1c03577 100644 rv = -1; goto abort; } -@@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned long long *offsets, +@@ -818,7 +821,7 @@ int restore_stripes(int *dest, unsigned long long *offsets, } for (i=0; i < raid_disks ; i++) if (dest[i] >= 0) { @@ -102,7 +102,7 @@ index a7a7229..1c03577 100644 offsets[i]+offset, 0) < 0) { rv = -1; goto abort; -@@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned long long *offsets, +@@ -868,7 +871,7 @@ int test_stripes(int *source, unsigned long long *offsets, int disk; for (i = 0 ; i < raid_disks ; i++) { @@ -112,7 +112,7 @@ index a7a7229..1c03577 100644 chunk_size)) { free(q); diff --git a/swap_super.c b/swap_super.c -index b6db574..18c89e2 100644 +index b6db5743..18c89e2b 100644 --- a/swap_super.c +++ b/swap_super.c @@ -1,3 +1,6 @@ diff --git a/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch b/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch deleted file mode 100644 index 0916efafdf5..00000000000 --- a/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8fa7d3cb96e8833743b635fb198675ad6c020b6e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 12 Mar 2024 10:51:51 +0100 -Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition - -Upstream-Status: Submitted [mariusz.tkaczyk@linux.intel.com,linux-raid@vger.kernel.org] -Signed-off-by: Alexander Kanavin ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index b145447..a9cb6c4 100644 ---- a/util.c -+++ b/util.c -@@ -36,7 +36,7 @@ - #include - #include - #include -- -+#include - - /* - * following taken from linux/blkpg.h because they aren't diff --git a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch index 145c65477ab..e425fc446e2 100644 --- a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch +++ b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch @@ -1,4 +1,4 @@ -From a22b2345b9773d362acd85dd4c4a6a3cda9100d4 Mon Sep 17 00:00:00 2001 +From 8de073c637a1ea968b7304f373a20b13a4a47bbc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 12 Mar 2024 10:54:08 +0100 Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE @@ -14,14 +14,14 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+) diff --git a/Create.c b/Create.c -index 8082f54..7071f0a 100644 +index fd6c9215..3210a03e 100644 --- a/Create.c +++ b/Create.c -@@ -31,6 +31,7 @@ +@@ -33,6 +33,7 @@ #include #include #include +#include - static int round_size_and_verify(unsigned long long *size, int chunk) - { + #ifndef FALLOC_FL_ZERO_RANGE + #define FALLOC_FL_ZERO_RANGE 16 diff --git a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch deleted file mode 100644 index b758fcd0ab2..00000000000 --- a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 319b3191f088cea7b0fb6038ab7625d5e049dcf7 Mon Sep 17 00:00:00 2001 -From: "martin f. krafft" -Date: Mon, 3 Jan 2022 19:14:12 +0000 -Subject: [PATCH] Remove -Werror from compiler flags - --Werror seems like a bad idea on released/packaged code because a toolchain -update (introducing new warnings) could break the build. We'll let upstream -use it to beautify the code, but remove it for out builds. - -Signed-off-by: martin f. krafft - -Upstream-Status: Pending ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9ab6a65..1141971 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) - CC := $(CROSS_COMPILE)gcc - endif - CXFLAGS ?= -ggdb --CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds -+CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds - ifdef WARN_UNUSED - CWFLAGS += -Wp -O3 - endif diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch deleted file mode 100644 index ecd1f037d01..00000000000 --- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ca91d9fc07943f209988411f2596e4b69828f208 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= -Date: Sun, 15 Mar 2015 09:02:14 +0000 -Subject: [PATCH] mdadm: Fix build in x32 ABI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When try to print time_t values as a long int it causes an error because time_t -data type in x32 ABI is long long int. - -Upstream-Status: Pending - -Signed-off-by: Aníbal Limón ---- - monitor.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/monitor.c b/monitor.c -index 4acec67..8dcdfd6 100644 ---- a/monitor.c -+++ b/monitor.c -@@ -447,9 +447,12 @@ static int read_and_act(struct active_array *a, fd_set *fds) - if (FD_ISSET(mdi->bb_fd, fds)) - check_for_cleared_bb(a, mdi); - } -- - gettimeofday(&tv, NULL); -+#if defined(__x86_64__) && defined(__ILP32__) -+ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", -+#else - dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", -+#endif - a->info.container_member, - tv.tv_sec, tv.tv_usec, - array_states[a->curr_state], diff --git a/meta/recipes-extended/mdadm/files/xmalloc.patch b/meta/recipes-extended/mdadm/files/xmalloc.patch new file mode 100644 index 00000000000..61774721d03 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/xmalloc.patch @@ -0,0 +1,32 @@ +From c5cf5a83be4e3ce04ebf3250f77aeb465eeb53a1 Mon Sep 17 00:00:00 2001 +From: Xiao Ni +Date: Fri, 17 Jan 2025 15:15:40 +0800 +Subject: [PATCH] mdadm/raid6check: add xmalloc.h to raid6check.c + +It reports building error: +raid6check.c:324:26: error: implicit declaration of function xmalloc + +Add xmalloc.h to raid6check.c file to fix this. + +Signed-off-by: Xiao Ni +Link: https://lore.kernel.org/r/20250117071540.4094-1-xni@redhat.com +Signed-off-by: Song Liu + +Upstream-Status: Backport [https://web.git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=e0df6c4c984d564e9e40913727e916a6cd8f466e] +Signed-off-by: Alexander Kanavin +--- + raid6check.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/raid6check.c b/raid6check.c +index 8e7f1421..486b10c6 100644 +--- a/raid6check.c ++++ b/raid6check.c +@@ -26,6 +26,7 @@ + #define _FILE_OFFSET_BITS 64 + + #include "mdadm.h" ++#include "xmalloc.h" + #include + #include + diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.4.bb similarity index 84% rename from meta/recipes-extended/mdadm/mdadm_4.3.bb rename to meta/recipes-extended/mdadm/mdadm_4.4.bb index e3b94d4b6fd..db45df43d3d 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.4.bb @@ -11,22 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;branch=main;tag=mdadm-${PV} \ file://run-ptest \ - file://mdadm-3.3.2_x32_abi_time_t.patch \ - file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ - file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ - file://0001-fix-gcc-8-format-truncation-warning.patch \ - file://debian-no-Werror.patch \ file://mdadm.init \ - file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ file://0001-Makefile-install-mdcheck.patch \ file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ - file://0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch \ - file://0001-include-libgen.h-for-basename-API.patch \ + file://xmalloc.patch \ " -SRCREV = "d709d4161d1dd51a976147e8372fbd99ff8183bd" +SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a" S = "${WORKDIR}/git" inherit ptest systemd @@ -44,7 +37,7 @@ CFLAGS:append:powerpc64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ +EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ SYSROOT="${STAGING_DIR_TARGET}" STRIP=' @@ -53,7 +46,7 @@ DEBUG_OPTIMIZATION:append = " -Wno-error" do_install() { oe_runmake 'DESTDIR=${D}' install install-systemd install -d ${D}/${sysconfdir}/ - install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf + install -m 644 ${S}/documentation/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor } From patchwork Mon Apr 7 09:40:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60851 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 9F13CC369A4 for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web11.42763.1744018859687631250 for ; Mon, 07 Apr 2025 02:40:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Dlmy0O1X; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso2438845f8f.2 for ; Mon, 07 Apr 2025 02:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018858; x=1744623658; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I99dpA5rLRDAqkKBTpWg+Xnpk1r51PFCJaXLeTWI4mg=; b=Dlmy0O1XC+bm7C6N/J7wK4TaBeN3aLh4fl8IXs8d3bzkNFZawpWQo4Ifz+bpqqeRM6 uM/JU8ycXhVTvGDXwrTbaLCiNfWpcrSa58XpAsZMKYRPLZW4ywyadVvJVrJnPfj45vQj DMVO6un41Oc+rYmz7zvpbvjG66ktFE76KWyjX4vDT/VzLg4iBEWATKWgCYl6+V1ijLtj oH8BEcCDY10TXzI7VljXWJ5gLZNO0UXwN++0TPUf/9Sv3HfwpZMk4YT5ecyoFibPnpWj VRfPXlQiA0QazwvXtruUePWLFRSMjGwi3c1//mXy2oJEfHxRgU22LEXID6pG5x5v5y8z QBXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018858; x=1744623658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I99dpA5rLRDAqkKBTpWg+Xnpk1r51PFCJaXLeTWI4mg=; b=Q+4S6igrlvdTYD5PQ/PF61byR3XEtS+mwgVh/5YhJyC7i9RLR1h/MMpeBe91g7ZwOT l6b0nTNt7Ehm9jupnBfYAmgZM6tpbW5lzFallHutai/USb5PVcYTA/YHM7CFyoLsFVqr ZIMXwAa4va61JcHXxLdiBmWdQljDLRhvQ3gGB/MbwXTAhL5gWJcPgJ0AdU//VzCzQqlj J/sRl9ucj9BZkQ74jkakpXjgx16iFk3MVSF40oOAmQassMoZTTpiBoLLPOfHGkUdJJRg V+oeZG7vVNBlHeDtC059vGrLiA00FiriK8ZtSXWk0ehW4nJVk2OxTN7XG+48esVP9XRu 7UEA== X-Gm-Message-State: AOJu0YyZU7C2qqfOZneBLLGjvYjwJgrzJzp73DyOqLazvyqBp5mNU8J9 4atrbochlsF7aw2IRJoYQWvWUKcE5oqMIWVvgMGbK6qzEpNJNUp/R6BFAA== X-Gm-Gg: ASbGnctM/enyhUdCcT43OxEXHPQfRA7GXFAj565n/XL3KFoPzwP+qLEE89nFrK1R4S0 0zoXRxcJM9zDYFuEmhrYHSPPPy3TSbYUu7yGfy7S2N8rsKlB3FzB7hBwb4C1vMNKkAPfF0H8XMQ 5uic2epLHgy+Khyv4qSwbj0hL2xLUnxKwMS8yx5aqSFQchtd8sZ5AiWiumeV+WWpyXJ9hx7Uojq gcsgJnRtDYwxcR3aIP9MJDo9QUOLzgNshzKm25sRXYA9NGtolsl72bEVDCAH94odINw5U45RuLx DV59gxuvJniGEdbxL8P7jgBhsk/rQ6SwkD8lc67Qt9qGxEg24MetMZyHrlDWT5cNS1cYUHSNwOH 0mccBh4OCMuU0Jd2v X-Google-Smtp-Source: AGHT+IGlCaZ9bKoqhHdRNwudPDOxdbnKDr/kLekj3IhZh7tN3yPTl5AmqOB7VYBumBXQ7h+29ZfM2w== X-Received: by 2002:a5d:5987:0:b0:391:3207:2e6f with SMTP id ffacd0b85a97d-39d0de5dd2fmr10443732f8f.42.1744018857857; Mon, 07 Apr 2025 02:40:57 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:57 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/18] ifupdown: mark defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch as Inappropriate Date: Mon, 7 Apr 2025 11:40:40 +0200 Message-Id: <20250407094045.753021-13-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214422 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch index 24e3ba0d9de..d47c50f2d5b 100644 --- a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch +++ b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch @@ -12,7 +12,7 @@ arch specific methods, and the end result will be strangeness like the loopback device not being configured/enabled. Signed-off-by: Paul Gortmaker -Upstream-Status: Pending +Upstream-Status: Inappropriate [avoiding debian-isms] --- defn2c.pl | 6 +++--- defn2man.pl | 6 +++--- From patchwork Mon Apr 7 09:40:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60850 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 927D6C369A5 for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web11.42764.1744018860344558280 for ; Mon, 07 Apr 2025 02:41:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BvaFw0O5; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43cf3192f3bso41155685e9.1 for ; Mon, 07 Apr 2025 02:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018859; x=1744623659; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7gGWe4sCI3RDpOybIzU75od5ugtAqNB9nmPh8VLZuXU=; b=BvaFw0O5FuhiRswmeZUchHxVhiZt+lE3NqA67yKvtUi8/W3n6xwZSYjcZs8RNQ2EeJ ec6TjrFBr7ApBXSNX/xxLP/8iYfrFgPeegzM1ivgLpvPmaclzz9S2ammpywF7ic10Bka ae2wzxjQxHhINJqkkHzXFra1nIrmgcHzK3/6UmjAXzp3W2C7pFi2VHQfHRgo3UgiHzw4 LddT7CxIA8g9EbVqIQHmRY0GLqxwD65WY72g1La5yrQsINhaFOTtu0S+4ntqaiMjBjBW hYnmLP4OLzmExmuAYnyId9d/NjCAvkiZOf/XjEDC2F+AGuhup6X35GirqvEYtaMmspRO nsHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018859; x=1744623659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7gGWe4sCI3RDpOybIzU75od5ugtAqNB9nmPh8VLZuXU=; b=DpXdOLjqXlzDcC6qofa6MEtx3uiEgDYkVGDl3qeInyvdf5wNtLAOnFmmPkFmmyJvAY A/Vzh1lQZ3Wzh0k0kIc61fGabwDMurrkEJjE9zEgwb8rp+Q3picxfMVuDY54fCYmmWHW Pf7Fm5NOUQe4kVflRGPeQkYc5jNDBlo5dDn5aWJ56JvXkPOqde+Y9F+G2139e8++5EPr 6w/zbKr0wobDFTTaj7f3t7p6cuOWblhgTaMirrhm3UPfgGvqGexx7Srn7n69eRSuZglD AGdCUkv2yeglAAE7LqH1f2/82GkH73iA2091ZDoNhjrHC0kzsm8ex3TR9lHJ/6i+bCAd /CDg== X-Gm-Message-State: AOJu0Yw9NGMoIs8NVqRS5P9nXjoEn1MI9qDP9nVfUxCDpyLHXtvwF7lG sgFWk96hphLTZxIFZ1QzrFU8QqiPKmTzzsb7q0mCR1Rt0nCG9hxHK0pBzA== X-Gm-Gg: ASbGncuduvPgdZxISuv1cKFJr+elWe3+kE2/cdR7R0meoAwtYf4iSM9WQv9YE0tpxtz ZOAJ0g5shM5oqSMaIhWcJhawBt+WyESUuCJzeSM8t0uOBK0Bbb61H1JRi17yPFylhrZrQYWO7Ac A9FDCt3T/49Lk7z78HdWKyI2Z64ji/1kTchxf88SC/Dc1DWAfpSLz3oN951IYIcPcqIv4JRobSV zlKssmyzbX5AVkgd2KFq1BG++fOTIfF14crS1l6q0p4eabNK8pC4QfwgoB0DtsIeDmcsm0s5Ek8 Vpa5kvEPHOA7wbWDB7/boYyGHaCuymSxNh19ndittf5UqlotXg/JG4VQmevbU5yBiITTemOGEdW DB4SHug== X-Google-Smtp-Source: AGHT+IGzSte2mMKfW5zeuHnhzXCV5YgxcJfF+UADwZRAiTh91Ndj5o9UDJ+woJe5VMXDduMti9jfPw== X-Received: by 2002:a05:600c:b93:b0:43c:fe85:e4ba with SMTP id 5b1f17b1804b1-43ed0c944efmr118101485e9.15.1744018858472; Mon, 07 Apr 2025 02:40:58 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:58 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/18] gst-devtools: submit 0001-connect-has-a-different-signature-on-musl.patch upstream Date: Mon, 7 Apr 2025 11:40:41 +0200 Message-Id: <20250407094045.753021-14-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214423 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../0001-connect-has-a-different-signature-on-musl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch index d7a3e2057ae..aeb296aa967 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +++ b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch @@ -8,7 +8,7 @@ API has a different signature, this patch fixes this so it can compile on musl, the functionality should remain same as it is immediately typcasted to struct sockaddr_in* type inside the function before use -Upstream-Status: Pending +Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8767] Signed-off-by: Khem Raj --- From patchwork Mon Apr 7 09:40:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60847 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 92282C369A3 for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web11.42765.1744018860833328399 for ; Mon, 07 Apr 2025 02:41:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UDDIBMLe; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43690d4605dso26959845e9.0 for ; Mon, 07 Apr 2025 02:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018859; x=1744623659; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/lZeYAf/nYvN0YAOxpIYW91MVMgCps50AcO8IFxyLwM=; b=UDDIBMLeu7rK0Vkpdo5bdX+zhhF0BxFDyaJaSZHonxuR2Ep8LePMC/SXJA8jkhdwzX uOfNxoHjCJ+/wV4hszjfTJ5nyh04eWHK0MFmQ1GLD0hfPD6MGqwobMYpbyQE6+K+oOBw XHG8sq43Kx1LRXq+OEQn/EcINe/lqm9S3Wqs2yX74UocJMLET9ZfnOCHhNAh3Mu/3ae9 4dGR5UHoxdtOJuA7uGxXQwKrpHGJK8xRq6NBUYhs3+BLyIJjqg9HKc7jTNGQEMw8HGY6 zcBajthEbPIiGVflvh+Ow/OqX5p67AXMPNuwOOj0bN2ZL6V9bNHx3tg18A/pC6TcIMpg oe2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018859; x=1744623659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/lZeYAf/nYvN0YAOxpIYW91MVMgCps50AcO8IFxyLwM=; b=fNtRegoDytCVQTjmB2R6jdgy/rP6j9+OdRHFG4KhYXrzCQloP9JD2HvA8mL7V7lnVz Oyy38TWdoQKuYzA3OPktWtaPV8QlWjcytQNuftnyIrxn5zo0i+6R0ge++vsOuDGsuXU/ DNYQWAKZnpbZIWIznTGri/Ln+eEo3XsazHQ+QaijaJMHCE0orq5PsUBTdBQJLLHlMyYP 0qPL3lyGdrR8LgcdgHjrk1gqY/agKEAX/CpJ10QxdOz/5CaK9OIEJ8JwYUhamBdvmopZ qVUeupmEDX2juCMMKawv0XHFzECUexXTYi/IFZtxyoM44UVo0ODp2JWqoOGOYAHJy7ZR 92ZA== X-Gm-Message-State: AOJu0YwZBQmgf6DhkpYVTtRdMrxtuKV7crEIx3FwnXZGSzn4pJCJH0Ge 6Qx6qz31BcF4O+QiBCdgGWVqasvOG5ee4TPo6j64uvJoWPY3o1YZ8Zo9Sg== X-Gm-Gg: ASbGncuNlV3d/xncFLweU4amqWwM3U6QtU1TZ0lS/hwHJ26yb7spl7g+HSX+B86z6km 7rw27lQTC2i7nkR2p7JEDmIo3ty8DxYVsPTbAY1aD3BCBEzSBeusGZn6834xCGpuEcrLfjoU6pB bdsZYg/49W/Z8vZpwQagkMQmvJn07+pDr6IWYiVBXZh7pMTepICteXuyulSMPtF9gFvO3Z3WIG/ aznhCEgsZXvl7PbYl8vlA0XBl2ZesMGN+fOlo5zEpzI2x7yLqxSvG5pqTqitgU0U60bXLxKf851 FOeQT8FI2hx2TYKAvFq3y29YoPme1d0oUf1SECqNoWYYM85U5j72Io/OjfC9Xk9/ZIhj8W1bNVi uqmmBTA== X-Google-Smtp-Source: AGHT+IH08DUQtxLAlLV/EHBnJPurtka7B0eTPE4BzhRnSotjCCk4h0UbrHnD535e2Ga/HdwQP7HxMQ== X-Received: by 2002:a05:6000:220c:b0:390:fbba:e64b with SMTP id ffacd0b85a97d-39cb35aa70amr9123768f8f.31.1744018859125; Mon, 07 Apr 2025 02:40:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:58 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/18] vim: mark no-path-adjust.patch as Inappropriate Date: Mon, 7 Apr 2025 11:40:42 +0200 Message-Id: <20250407094045.753021-15-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214424 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-support/vim/files/no-path-adjust.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 908459a95ec..a92b1e7cdcf 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch @@ -6,7 +6,7 @@ Subject: [PATCH] vim: do not adjust script pathnames When cross-compiling, we do not want to reference the host versions of things like perl and awk. -Upstream-Status: Pending +Upstream-Status: Inappropriate [specific to cross compilation and sysroots] Signed-off-by: Joe Slater Signed-off-by: Mingli Yu From patchwork Mon Apr 7 09:40:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60848 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 7F56CC3601A for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.42766.1744018861840260610 for ; Mon, 07 Apr 2025 02:41:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=S/wq/fD9; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43cf0d787eeso45445425e9.3 for ; Mon, 07 Apr 2025 02:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018860; x=1744623660; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dBeaq5ZBXnLDICZZe+kBIXZpXj/d1KA+NFFXMr6ovrs=; b=S/wq/fD9zGE8TdgmWmaW0+irVB0bRJDmwaTmKKz85NZKC8afRJ3ZXHKuFVx3VnYx05 LHP3lO7852I3ZnVJGst0japqftyY/6cP7sor7YJVS4S8mNaFLnQE3KH8Be9UgpKEnubJ /qxfqzj5PdeNkRRb8/kq6jVfFlCL8Yg8tHKRe6IbrNsAxPyBYHVN5QrFv0T3SzYT8kFc AR4mU1eS3r/HxMeuO9ykHzAwtFd5HjqBVBbYtTr8TPrYg0ruiMIhIfWYM6gv1GI2v+bR BPW6KCHk4iWk+zzVR5hLRyhGEDCva4FyTd51xkRsH6YCBYnSvocZrb4ifrcFGOwt2xgo FI9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018860; x=1744623660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dBeaq5ZBXnLDICZZe+kBIXZpXj/d1KA+NFFXMr6ovrs=; b=KNr5TbGILAW97FNNTa5wUprIYd1e+YCUAWjDtDe7UGG/4RaLbpavD8va+l1io2P7ht 9JfoOOaN8eaYtt9o6c76xMgD8ZMUfMwHcYQ4WVQxMFbSKqGmYCjuorSDk7rVIZWERGEH Yx0uMw8I43Qc+qCrLxV1O6egLns6XsxTQJjNEHI3LMj0QRe7w8sfcKhv83vG1gW5kPba 6p2zAtPTfzcdl0B5tt3bb3iqXAIAytry6VBB4wrOghXeqQPYt04ehhdIz3Uom4GhTd4/ kWzO9qI6oMM9QKBO2M8Qafl0ej9QvyFuZMRYainpe72BM64DKB864ShXkfux4hIjKWKx Aumw== X-Gm-Message-State: AOJu0Yw6NyxGcfK2xqZ4JCXu5OqlzOgljVmi6oOTunRHv+Qv4pSaL1v4 4tovrE5ckoojt+a10XuscSwUcYuqSFjoxwCLWLO3QvZ9KcYitFISYPGJRQ== X-Gm-Gg: ASbGncvyFQHG6SkHtZ5h8yIhWelJQEN7q6Sqx+jIM381g2oLH9UI8TsgH7vQV8ejEBO ukuhhtQ/5ZSg0/qqElqrXAdTm6ZJrvHBXK/tD/5aXnxMsVadVZGLTry8ee273Xll0IE7M4Wzvs3 P7fsExPQ7F3VgdNXnH3ecz78Ly2miqSoXH7u/8v1XefoOT+SqIo1mB7XbaxaR8KLWnbtzh2z4Xm t3tKzNBwSiTU+3kLMH6KFuEnO5eWvwSxu+V9UUy5ZmkdyK7nVJpTLPtqqil3oEaeTBddVpwpjSS OyvK8G4VLIq4aMqHbkMqgqc5Zbz8giMCG5sOKykx4EOHsV1W0Ho7ghquFDnnHMVJDMMDbAK4zmr 3ABj9uw== X-Google-Smtp-Source: AGHT+IFAavZ6S305JLEFRv/pKAbd3aBsSOiYLnH/AmrioR3nxkyL8QeQtx8g5J0YahjriA7YgPVoKQ== X-Received: by 2002:a05:600c:698c:b0:43c:fa0e:471a with SMTP id 5b1f17b1804b1-43ed6615862mr102187055e9.5.1744018859845; Mon, 07 Apr 2025 02:40:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:40:59 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/18] avahi: mark initscript.patch as Inappropriate Date: Mon, 7 Apr 2025 11:40:43 +0200 Message-Id: <20250407094045.753021-16-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214425 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-connectivity/avahi/files/initscript.patch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch index c856c3df046..e1176888df1 100644 --- a/meta/recipes-connectivity/avahi/files/initscript.patch +++ b/meta/recipes-connectivity/avahi/files/initscript.patch @@ -1,4 +1,8 @@ -Upstream-Status: Pending +Note: upcoming avahi 0.9 drops debian initscripts altogether, +so any version update would probably have to copy the last +upstream versions into oe-core, and install them from the recipe. + +Upstream-Status: Inappropriate [upstream removed the files] Index: avahi-0.7/initscript/debian/avahi-daemon.in =================================================================== From patchwork Mon Apr 7 09:40:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60845 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 77DB3C3601E for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web11.42768.1744018862474334463 for ; Mon, 07 Apr 2025 02:41:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NwTYLhxV; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-39129fc51f8so3277672f8f.0 for ; Mon, 07 Apr 2025 02:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018861; x=1744623661; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hL/MufrReW153H65/MLeDdxoEm5B9TwrzH1x9gVOOi4=; b=NwTYLhxV/wWFDk0yli0WnLPx5Bawt5VUWT5AR7A31gYLbghsfP1OxwsI2o1fiFJlA9 QcOVSrYX3tymBDm+7Df1B3UrKSGjsOy9bShZ4WatWLzyVoJZ20lTjEYI7Wy7DGnhCXkc jAsOODMaQ0xsyJQFpv34hBphC2v3BonECZ0XZht0CBXyBtl1wNS/Ym8swFh25YB1C+il mbtfgE/dVT+PvCvdBjvbjz8XGmF9MI/nxwDsJUpuhD5IZoSMDC5SPM1vmvTJkDJhZ/Bh MTPl0zGPOrPVVdC5YnI7jwvH86lKeky/SWZuFan+EL5rZLScdrJJ79vgAG1ieFmOYABj L5GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018861; x=1744623661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hL/MufrReW153H65/MLeDdxoEm5B9TwrzH1x9gVOOi4=; b=Zk0qAEO+Y7WtAyFoVTJY2JVd8aRcwN+BpLk/CVxWV8q6aXW+v7jx1blyMN64HF01wE tgXGaN/mkoo7tyCRUSUN6bKJp/gTqM3sTXcP+lgEhbZt0+qRy7SQZhBkGubPTqeozRq+ cXVnPgh1g0hPZGKitvKJ0RwBSFyZe5SMlioRXZhFSdBQ2+1hLj7NBigYG0j/WbaIe6ns aWNG3XFt/PRQ0iCk8ZJ1lJgb1lC7mrGKTtIDh0czoFKZIjsBX3Vt2VsrjowhIQy+JzQw O1LMu1+PzOpZuDVI93rgd5zXhyMHY07X15cbyVomNWyQwSVpmUrDZ4GXn7lQco04hro/ noKg== X-Gm-Message-State: AOJu0YyTAiwPjwEw0CEtrgO/mGpRZQqzAJQRkmfFnP+iGV+ouh9yuT+8 i7Gkugsj+C0/8IkTMgs3EFSqlqs5T82rIsi5oRHmgDSNr5PN6ep/0LTD7A== X-Gm-Gg: ASbGnctQsyfj6SyrDQvAGkJUFWbjjLjObubGE+3VR2+JhowfyASmSYdrDohI9o1vsJ1 LHUpwas7b1bnNX7KweKl8elYrtxdMCQKEp/YTHIy5H7SoucYQtgbvPEayc8azo7P8KC3TWvt+cR /KkvWeuJ+FKyfrERa3ox1PUY8j2JpYfH9W3x94+zAF4Gifm83/N3tbETPjC/MqMwb0zrjmfsZDj YRws0e7hn4BdYZdYw08l5/DvkGfuCWOd1vcwXc4RtrN6ncOX3K2Z9vKVgkB/b+TgtkTY0hvwjgZ gHbrypb+qTSIGbpfCxKlzViqPAcj/nXMxC5gq3zQuPYA0OArJTESnOscLkc1HumsyB4YoAUmzjm k7Mxh9w== X-Google-Smtp-Source: AGHT+IFjv809J/692v7XuR2Z2Zvcp9gIMg7KNBZENNUqhKYhzAuG5cs98YRlRXw0oA/cdDBU+RFDIQ== X-Received: by 2002:a05:6000:1acc:b0:391:41c9:7a8d with SMTP id ffacd0b85a97d-39d1475e1f7mr10436612f8f.54.1744018860485; Mon, 07 Apr 2025 02:41:00 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:41:00 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/18] apr: drop libtoolize_check.patch Date: Mon, 7 Apr 2025 11:40:44 +0200 Message-Id: <20250407094045.753021-17-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214426 From: Alexander Kanavin It's not clear what the intent was: libtool executable is present in the native sysroot and can be used to obtain versions during build time. Signed-off-by: Alexander Kanavin --- .../apr/apr/libtoolize_check.patch | 37 ------------------- meta/recipes-support/apr/apr_1.7.5.bb | 1 - 2 files changed, 38 deletions(-) delete mode 100644 meta/recipes-support/apr/apr/libtoolize_check.patch diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch deleted file mode 100644 index 80ce43caa40..00000000000 --- a/meta/recipes-support/apr/apr/libtoolize_check.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 -From: Helmut Grohne -Date: Tue, 7 Feb 2023 07:04:00 +0000 -Subject: [PATCH] check for libtoolize rather than libtool - -libtool is now in package libtool-bin, but apr only needs libtoolize. - -Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] - -Signed-off-by: Robert Yang - ---- - build/buildcheck.sh | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/build/buildcheck.sh b/build/buildcheck.sh -index 44921b5..08bc8a8 100755 ---- a/build/buildcheck.sh -+++ b/build/buildcheck.sh -@@ -39,13 +39,11 @@ fi - # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a - # output is multiline from 1.5 onwards - --# Require libtool 1.4 or newer --if test -z "$libtool"; then -- libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` --fi --lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -+# Require libtoolize 1.4 or newer -+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` -+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then -- echo "buildconf: libtool not found." -+ echo "buildconf: libtoolize not found." - echo " You need libtool version 1.4 or newer installed" - echo " to build APR from SVN." - res=1 diff --git a/meta/recipes-support/apr/apr_1.7.5.bb b/meta/recipes-support/apr/apr_1.7.5.bb index 215ac4b4b8b..83d84bfdb64 100644 --- a/meta/recipes-support/apr/apr_1.7.5.bb +++ b/meta/recipes-support/apr/apr_1.7.5.bb @@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ file://0004-Fix-packet-discards-HTTP-redirect.patch \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ file://autoconf-2.73.patch \ From patchwork Mon Apr 7 09:40:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 60849 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 6F365C36010 for ; Mon, 7 Apr 2025 09:41:09 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web10.43313.1744018863095613639 for ; Mon, 07 Apr 2025 02:41:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JxGj0GT2; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43cf848528aso34005175e9.2 for ; Mon, 07 Apr 2025 02:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744018861; x=1744623661; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UzSai3ITPKMzGdaYq9x/uq+Xk1lpS+Eh2lHHNzUFXFk=; b=JxGj0GT2fQXdzT013e3QPRFKSZ+yONVi/MBzZ482GIB9a2n+I1MtsWH+VnLTHTa0Lj AyOsmeQoM5bgIoK5pPW6yn3pYCBpFLjoy2Xox+Lbn6mtqhETYx5bA4+Ft/8nmfXVvqFs 3MKDwrHxoY4v17sVOoiWHPlrjRoybNxqPLLUseIYbHI/hs8+nzb164BN54xKWdtW5ceK gxsP27GQCF5keYLUUQyiJgxCQcYJ44zQOPdTsldeSfK0I504vXOzpOc9as9XY76uASFj J0oWRgrKXeeD8UmZvrbniDg7JhdbVhxTm0uXtb2H9lfsFE+Pyz5SQXXtqXjmoWze76B3 QIKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744018861; x=1744623661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UzSai3ITPKMzGdaYq9x/uq+Xk1lpS+Eh2lHHNzUFXFk=; b=Z5YpKzLXg/b8+6abV5R68X4AH61e2fwdMlWSH/ATvR8MwRicWAniaexXUqw00xjwlF 3jVDiIcHMrXHtXshhPtz3rbXPyZVjpoi3r42wORN7z/Bb5rJl1wqDmzcbx43bu60nIXD xlgYsZvH29S6ZIHMLIFxJLfQN/FQAheCi4gSjNS3Dn0yOAqJZxA7wFaOF99t8I6rhGLH QnwbaoTbKZbySdLAJVlw9QWOu0D26R0db8ECiruM0atQUEw+GtCaMZXMTyOrBW6a5pg9 /UUQw6Hj0hBWxjduZCfmz7sf8eU+i/kxC6ZYwhlQ8Q3gsPT/09KR7B+v/+Gc0IpuvSgi Mbug== X-Gm-Message-State: AOJu0YykD8ySfr0CUfoc1L9RaNBjGPcToVa4pbn+OJWrC5R82stCbAm5 2y1fOWayQY2kXAHkNXhz02DcGI/AsKWRLvHV3UuQp1djfA3VUmGxlK18dg== X-Gm-Gg: ASbGncsmzs6VKs2/Hx84Db0c9/SSg/hrhKri52aIX3vTU7Dso5wgC2RU/Tm2vZgAjgY IodI4IkDSpWeO75zaRNj/YweDxW++vR2TmrF5fE0qqKY4Doo0pJbJWovcDFvwhMD5wZdQon/Zah M01KsCieyMHgleItc7oqbfLJZ4Uj4uWrxpze4iqErzJChPm8yPTurFqr8SuTKb/H6sB84G9MheU APdDAL4LBcIo0h+ps0fpPOsXYvlYZXljOJgoVBKxGUD+V0rlEe8M3058miNVha2XzmAKIOvq2g7 N5C01JBz7LfSWf+XWykM4ozSZ6M8qhta0yAqbD8dr3kxc1vBGzY8IhSYh0YBL72MtkAZyR2hai2 oBSgddg== X-Google-Smtp-Source: AGHT+IEz0rn9hOeDG2fYM2KoZbya5ZxOE3gWH4kVeppCd71wxxBXebYnP6d4gnJo5fEBalIjX57O7w== X-Received: by 2002:a05:600c:a016:b0:439:9b2a:1b2f with SMTP id 5b1f17b1804b1-43ee0613661mr101936125e9.3.1744018861148; Mon, 07 Apr 2025 02:41:01 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a76cesm11562459f8f.37.2025.04.07.02.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 02:41:00 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/18] numactl: mark Fix-the-test-output-format.patch as Inappropriate Date: Mon, 7 Apr 2025 11:40:45 +0200 Message-Id: <20250407094045.753021-18-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407094045.753021-1-alex.kanavin@gmail.com> References: <20250407094045.753021-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 07 Apr 2025 09:41:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214427 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../numactl/numactl/Fix-the-test-output-format.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch index 8345f71d72b..b7a2e51582b 100644 --- a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch @@ -3,7 +3,7 @@ From: Li xin Date: Tue, 21 Jul 2015 02:01:22 +0900 Subject: [PATCH] Fix the test output format -Upstream-Status: Pending +Upstream-Status: Inappropriate [needs a Makefile fix: regress/regress2 should be part of 'make check' rather than 'make test'] Signed-off-by: Roy Li Signed-off-by: Li Xin