From patchwork Thu Oct 1 07:50:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 99792 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 DC8F1CA5FC5 for ; Thu, 1 Oct 2026 07:50:53 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.84.5]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.6175.1790841048643880662 for ; Thu, 01 Oct 2026 00:50:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=moxLh+Wy; spf=pass (domain: est.tech, ip: 52.101.84.5, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FQzjuiQ7kPe90LsIEmfEmetAiabxOMGbd2gaHqehcsj9J8+gLBAuqTVLTG5fxitstzLC1bTEHtGu3RU65mcqXAJhs0XNTvQAAnI1jOr/xwtVC8n4gvPLQa1gEIRoA+/c2HeKrzaYyv6ZMEHjyrp17TXy6295wpobD8VA+N7PMgUe43DH3Ep6WxL+UeCSlaeZcpepxISLuys/jNpknZ/NfD2u+PMY6f4+o4mCSDttemdk3zwygIVPhUwnfA6jM2QOvNApfDO5+DqTX8bFrhF0MaVgidaxgsk7pdNlVRS1Ve4ZlNN42fbdY+HutBDJYlqEF9z1hEAPMfmmSAJY6PWIAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hjNKb2UOneL5fKtMlsuric+wZm0HSRdJPc46QckLre8=; b=reJcK6eMmMGg+nQcd/7OzvvHwGKjZxLWL3lBQbcjV2EXV2oKy4r6vkOHJEUZ3HdaDH2CWKmxPLNRxtCjV3+orbkNkt0U/LnD/nj4CbLVFQx5Clnhh0WIhqbyKBmH4h2j7WH27GKZnkLhSNBiZQLzdezkpRXoB5XcvRbjRA6klcbdiTZWEt02VvF27xfbS0vERzx3b8CYMYYOfHefB2umX9yaaW6cD6CQwKoe6kh5hl6GA4LbVUO8wizi6ETZTU3mJVFbb5fIGhfpgCjJIZW2qp5+5bbVdCZ4ybjRar4Ou8m8z8kyVxgk1gUHXhUksP47H5IvsYk13Nth+kdu7N7E2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hjNKb2UOneL5fKtMlsuric+wZm0HSRdJPc46QckLre8=; b=moxLh+Wy70/3gIiSvmpKmNtyWARVOASueLLr/IqdMyN4h+732QOiiSj0y02IhMAZUgbDh4HV58sNTlXW1AjympjvVNsgMQxi6cz/qdVKNz2EQmAsaYTuSewJsmC+/B7Agx8uhiE16EaX6VAwSeFnIbdWkUdkJd6rhkKEGt9NOsUeWWPEMlvMvIaNJhdkPVE+zAzvjtXklhbSqKgQvj6Wmp6uoEc+zW2+aMFwWBFzp6CTUsJ8oEjasQKpJMdt7sr6Aq/PdrJyBWt5QOgoBzhNHs07b7aHtwtRTVOTfFUATPLwFqwwAzDFL+5w/k0I2Ccv0MN6O5ry2Ble5FtdjgltkQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by MIWP189MB305102.EURP189.PROD.OUTLOOK.COM (2603:10a6:290:d5::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.472.15; Thu, 1 Oct 2026 07:50:43 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0472.015; Thu, 1 Oct 2026 07:50:41 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [PATCH v3] systemd: Upgrade 261.3 -> 262 Date: Thu, 1 Oct 2026 09:50:39 +0200 Message-ID: <20261001075039.4339-1-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260928113956.42485-2-jaipaul.cheernam@est.tech> References: <20260928113956.42485-2-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P123CA0469.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a8::6) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|MIWP189MB305102:EE_ X-MS-Office365-Filtering-Correlation-Id: bebeae19-10f5-4eb2-e247-08df1f90b0bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|366016|376014|260925021911599003|260925021311599003|260925022911599003|10067099003|56012099006|6133799003|3023799007|11063799006|22082099003|18002099003|13003099007; X-Microsoft-Antispam-Message-Info: v23e+nefm6lQQyauunlpAawllgAGngekka98prlFc9UPDx2DvF4czrTJ1Q5xFCNWPg7XF+9QsSKfNVChZqW8Cilz0E9vEbKxr6yudJmFJku8/hysFczGEgWabnOzTTxyQOds9M2yfrDnv6M9tuVz2HY+HB0AS6EH8gycRXNeOLlx+pcA1pwMchUuzIvThBJlFnozlkbwzmESK1rzt4JnPzJV+qS98jDkeP8VaHieLOAYjdY1wAnzgsRj+pYVnqPPg0IbHEjPLTWE2lPDS/8/cYdC2tY8P/T6oCNITkp5bPC0KDDYkiF6zfvb03f/iL9R0LWBnC0vSiqVETr96epZuEcYC8YrVGDnhvxInN+xTBFwmqLl2ZEPhIPqPgPY7cCGlTEy19GmEGzrduwkDzcAc853G0nrvdnLkRSY+VU1dzKrMKiUJDx8FLpafuiPAskCepCqKLRWfCXu3aoUIdkT+F/MKmbckA6CbvJcb1/TCsbyf3GnTt4PkPp5+1q8iirSw7S4Fn9/J/VmO6oX7hntwaWk/AqLi6q1e7Y2lM28myr1CtX5o7+YWETzIT3rmGR1bcfyYSF9jME4pnXZSMQ3vu7L/EyiyPJuaB/JEF6DjNKxCpRP08u8PVLV7+74K5xf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(366016)(376014)(260925021911599003)(260925021311599003)(260925022911599003)(10067099003)(56012099006)(6133799003)(3023799007)(11063799006)(22082099003)(18002099003)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1YuqFetGn8D/yJS5HqueI2Lh8qHE+nVvnJYg3Q85PCCuINzCewfLsxxshAnNyT7l1NlqciA8p1/rZKiuAAEH7batr8a6qAglo8F8nreXqGCC5vOzN50ggrVQoaWlJxxDleU0qjtvKFh/nEcdvcvv0eD1RDFinDvf9D9BukoMENbGhDuGvNltx0lm7xkbWaCy9qneGHxfJqGofrXt0DDb4lm7F+KP46QYhWtDyt4E7KuMxKhg8eBrSIpI8qn6RAtWQaIDHEay5dpY9pyXEwUR8sTQMjajpKnsziHPpZRJqt7W2XDrnfUxiIvF8m3tkjuxCuGW4IvX2I6hEPrsVmwAnuNAOfg9yickm0iE80OYRbNO1DJ1r7jW1gM5e/acV51BqGHQ7ujaG6mfg9GenOF97TDjVzaRLz289PoB5ltwCUJIvpbEjoqR+sjXvUK4lzj7kILUJ5ctIhNhTDFuG62H2K9e2wdkr+1IpmzofmV/vjlbnH+SuqS8Ccx364MJzKmrHdIdwHLTlhTSOaTWfCBYgIDXFZJ8urPXHwqaLw3Azn7qhVhYv0XlE2JoKLNUj1Qg99pSbHgDX2vE/XKqTDsjDivo9OH0fZjBWjOsiYQK3z1/Cl3+xNZH00JwyNkiE/k5RHOKoSVt/Exlzt4FckGQRn1M0I79aShyU9JnaYK6ZNiQ8ybnmx5wNmdKY4e/eAkUOdt4h4kPEMRFTHTEbOTm7gR/g6PnLCVbufkX11wJp7/i6eny1V/n0FObKhXNS5ljrBwKkiROVADoJbY1SxZnYRccY1Oyd+BB41RUbGTsthj4auwof1Rorhgvp98HgsM5MoAv/dec3Mo2hnjtzuczmsubJc3rXy5tE88yK2tP2KCiEEo/dD0avrC9fX+f/tWpLY0dNdzF8SkEEMfAFrYlH+BbEkfMs2M44/iYXtegePhZKFrtM2OJEFcD3icOu8feFCSZsLNPIgCvTU/3B0NZfKJvHJw38IXOVPydUVcCGr1gdIA+e5I7tBObxaUltqM52pQMZtyClxplHOL/86oucqS157FBoOGbLSJExGZXDVmtqwSlf0UKZH66BbnSK46+t/IdLqoLQC3heZX90aW+zge3OQJ1XDEeYsfnnhBoP4VLiGVOm0Sgbt+d1c3YdROfwabbLsYLxYqDgLHWfUhpK+BEuYGvTPhW+RUOO+PMnWjhfJem0V7pOjjd4EI/9i8R0EXrRAm2KK9Zmfaej4mDFCPYw0pMnZTlnDpPvneT9FKE80pjUSrvTkDznUgqctIYjdaneixIeidU+ZKI7RXZqJcbIxBHW+Mvm2g6C44K949GdGz9sppnlXMhjyVAle2phT1oHrcURrD/F6K/DRNM2M0pob5nRtueXfpk9ADPVyMmtGraP+CJDikJO98+CgvJWYUPMTOKt1oXzwPLsI9ehZAn4HvmA0WFbRXlVPZJ8daY1A9gEESx2T77dBbVGKNKyHOv8BXFlmIa/hrH+4+0yqb2RwzATg/C1j4LchIfTf/e/kLMdu0v3i6TZoDAQ8/rJ0gb5xRhZxal+nHqbIfeD9g3e3BBhTS0VjbHYhuSPU4noAzajOWo00lPTn/sEiZv47cpyKDGZnStC8ezWIItKl0lwpa0UuX4O9atgrdzH6nKFDbWAuTUf1bwYaFdLd5nfGkNXBuai01RN9JIMe5uWGJBlQKi1OVjJSXzz+nUvhiP5fsDf97frK9k9qXcDPVj4HAYz7ykB1uU83NLSrQ37w== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: bebeae19-10f5-4eb2-e247-08df1f90b0bf X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2026 07:50:41.2495 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N6ipo04vByw8c4li2fbJV/3WAhU047Ak48BBSaHeN2BuzIpyA/u4mJqZkIZriG/h593tSOD3Fxd95SnEJJnmyN3x29Qe0R0ATs4PCtVfI4Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MIWP189MB305102 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Oct 2026 07:50:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/247015 NEWS: https://github.com/systemd/systemd/blob/v262-stable/NEWS#L3-L877 - Refresh patches for v262 - Drop deprecated meson build options [1] - Drop 0001-include-fix-limits.h-override.patch [2] - Add rules: install 60-persistent-media-controller.rules [3] - Gate systemd-coredumpd.service on kernel >= 6.19 262's systemd-coredumpd.service needs PIDFD_INFO_COREDUMP_SIGNAL (Linux 6.19); on older kernels its ExecCondition fails and the unit flaps into start-limit-hit, failing test_systemd_failed on qemu*-alt (6.18). Add a ConditionKernelVersion=>=6.19 drop-in so it is skipped on 6.18 and active on 7.2. Upstream report: [4] [1] https://github.com/systemd/systemd/blob/v262-stable/NEWS#L41 [2] https://github.com/systemd/systemd/commit/6a131b32e0fe948e845ae4bf41f8fed003ec30ce [3] https://github.com/systemd/systemd/commit/d153b49473 [4] https://github.com/systemd/systemd/issues/43963 Signed-off-by: Jaipaul Cheernam --- Changes since v2: - Add conditional kernel version for systemd-coredumpd.service Changes since v1: - Drop 0001-include-fix-limits.h-override.patch ...ve_261.3.bb => systemd-boot-native_262.bb} | 0 ...temd-boot_261.3.bb => systemd-boot_262.bb} | 0 ...e_261.3.bb => systemd-tools-native_262.bb} | 3 - meta/recipes-core/systemd/systemd.inc | 4 +- ...tall-dependency-links-at-install-tim.patch | 8 +- .../0001-include-fix-limits.h-override.patch | 74 ------------------- .../0003-Do-not-create-var-log-README.patch | 2 +- .../systemd/coredumpd-kernel-version.conf | 14 ++++ .../{systemd_261.3.bb => systemd_262.bb} | 13 +++- 9 files changed, 32 insertions(+), 86 deletions(-) rename meta/recipes-core/systemd/{systemd-boot-native_261.3.bb => systemd-boot-native_262.bb} (100%) rename meta/recipes-core/systemd/{systemd-boot_261.3.bb => systemd-boot_262.bb} (100%) rename meta/recipes-core/systemd/{systemd-tools-native_261.3.bb => systemd-tools-native_262.bb} (93%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-include-fix-limits.h-override.patch create mode 100644 meta/recipes-core/systemd/systemd/coredumpd-kernel-version.conf rename meta/recipes-core/systemd/{systemd_261.3.bb => systemd_262.bb} (98%) diff --git a/meta/recipes-core/systemd/systemd-boot-native_261.3.bb b/meta/recipes-core/systemd/systemd-boot-native_262.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_261.3.bb rename to meta/recipes-core/systemd/systemd-boot-native_262.bb diff --git a/meta/recipes-core/systemd/systemd-boot_261.3.bb b/meta/recipes-core/systemd/systemd-boot_262.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_261.3.bb rename to meta/recipes-core/systemd/systemd-boot_262.bb diff --git a/meta/recipes-core/systemd/systemd-tools-native_261.3.bb b/meta/recipes-core/systemd/systemd-tools-native_262.bb similarity index 93% rename from meta/recipes-core/systemd/systemd-tools-native_261.3.bb rename to meta/recipes-core/systemd/systemd-tools-native_262.bb index bffaf5a2f08..359bc972ccf 100644 --- a/meta/recipes-core/systemd/systemd-tools-native_261.3.bb +++ b/meta/recipes-core/systemd/systemd-tools-native_262.bb @@ -18,9 +18,6 @@ EXTRA_OEMESON += "--auto-features disabled" # Link the binaries statically as we don't install libsystemd-shared.so EXTRA_OEMESON += "-Dlink-systemctl-shared=false -Dlink-udev-shared=false" -# Ensure unused build paths are not in the binary -EXTRA_OEMESON += "-Dsysvinit-path= -Dsysvrcnd-path=" - # Target-absolute paths that satisfy both tools from one meson configure: # - systemd-hwdb needs prefix=/usr so the compiled-in UDEVLIBEXECDIR # (/usr/lib/udev) matches the target rootfs layout, letting diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 3ee898958fd..5ea45a78b2d 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -15,8 +15,8 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=c09786363500a9acc29b147e6e72d2c6 \ file://LICENSE.LGPL2.1;md5=be0aaf4a380f73f7e00b420a007368f2" -SRCREV = "3255daee1572366b74fe92f002a3d60ecbb27103" -SRCBRANCH = "v261-stable" +SRCREV = "8cc40e0c5e9234bf45084751ac53b1fbfe70b492" +SRCBRANCH = "v262-stable" SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}" CVE_PRODUCT = "systemd" diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index b83803aa08e..0b9eb4ac3cc 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,4 +1,4 @@ -From 451af4755f0c1da552498682d910f4f4c5209639 Mon Sep 17 00:00:00 2001 +From 4793a67d3d738520f0193a9edff491989e8d77bc Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for @@ -25,10 +25,10 @@ Signed-off-by: Scott Murray 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/units/meson.build b/units/meson.build -index 27d8ef2f72..864caa44bb 100644 +index 9f8f8d0e41..9a74236690 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -168,7 +168,6 @@ units = [ +@@ -172,7 +172,6 @@ units = [ { 'file' : 'proc-sys-fs-binfmt_misc.automount', 'conditions' : ['ENABLE_BINFMT'], @@ -36,7 +36,7 @@ index 27d8ef2f72..864caa44bb 100644 }, { 'file' : 'proc-sys-fs-binfmt_misc.mount', -@@ -279,7 +278,6 @@ units = [ +@@ -283,7 +282,6 @@ units = [ { 'file' : 'systemd-binfmt.service.in', 'conditions' : ['ENABLE_BINFMT'], diff --git a/meta/recipes-core/systemd/systemd/0001-include-fix-limits.h-override.patch b/meta/recipes-core/systemd/systemd/0001-include-fix-limits.h-override.patch deleted file mode 100644 index d11a5fe3f82..00000000000 --- a/meta/recipes-core/systemd/systemd/0001-include-fix-limits.h-override.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6a131b32e0fe948e845ae4bf41f8fed003ec30ce Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 22 Sep 2026 01:55:01 +0900 -Subject: [PATCH] include: fix limits.h override - -This is especially necessary since GCC 16.x. - -===== -$ gcc --version -gcc (GCC) 16.2.1 20260819 (Red Hat 16.2.1-2) -Copyright (C) 2026 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -===== - -Without this change, /usr/include/limits.h is not included, hence POSIX -constants are not defined: -===== -$ echo '#include ' | gcc -E -H -isystem ~/git/systemd/src/include/musl - 2>&1 >/dev/null | grep '^\..*limit' -. /home/watanabe/git/systemd/src/include/musl/limits.h -.. /usr/lib/gcc/x86_64-redhat-linux/16/include/limits.h -... /usr/lib/gcc/x86_64-redhat-linux/16/include/syslimits.h -===== - -With this change, /usr/include/limits.h is included, thus POSIX -constants are defined: -===== -$ echo '#include ' | gcc -E -H -isystem ~/git/systemd/src/include/musl - 2>&1 >/dev/null | grep '^\..*limit' -. /home/watanabe/git/systemd/src/include/musl/limits.h -.. /usr/lib/gcc/x86_64-redhat-linux/16/include/limits.h -... /usr/include/limits.h -...... /usr/include/linux/limits.h -.. /usr/lib/gcc/x86_64-redhat-linux/16/include/limits.h -===== - -Replaces #43824. - -Upstream-Status: Backport [https://github.com/systemd/systemd/pull/43831] -Signed-off-by: Jaipaul Cheernam ---- - src/include/musl/limits.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/include/musl/limits.h b/src/include/musl/limits.h -index 9620a3b0ac..bcc585be2c 100644 ---- a/src/include/musl/limits.h -+++ b/src/include/musl/limits.h -@@ -1,6 +1,26 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once - -+/* GCC introduces a spurious, tricky inclusion cycle: -+ * GCC's limits.h -+ * -> GCC's syslimits.h -+ * -> GCC's limits.h (again!!!) -+ * -> glibc/musl's limits.h -+ * -> define POSIX defines -+ * -> define ISO C defines -+ * This works only when GCC's limits.h is included first, but a user override breaks the cycle. Hence, we -+ * need to manually achieve the cycle here. If GCC is not used (e.g., Clang), then including the compiler's -+ * limits.h twice should be redundant but harmless. */ -+ -+/* First, get the POSIX defines from glibc/musl's limits.h. When the two macros below are defined, GCC's -+ * limits.h includes the next limits.h, that is, one from glibc/musl. */ -+#define _GCC_LIMITS_H_ -+#define _GCC_NEXT_LIMITS_H -+#include_next /* IWYU pragma: export */ -+#undef _GCC_NEXT_LIMITS_H -+#undef _GCC_LIMITS_H_ -+ -+/* Next, get the ISO C defines from GCC's limits.h. */ - #include_next /* IWYU pragma: export */ - - #include diff --git a/meta/recipes-core/systemd/systemd/0003-Do-not-create-var-log-README.patch b/meta/recipes-core/systemd/systemd/0003-Do-not-create-var-log-README.patch index 175ec7955bd..c64bfa82491 100644 --- a/meta/recipes-core/systemd/systemd/0003-Do-not-create-var-log-README.patch +++ b/meta/recipes-core/systemd/systemd/0003-Do-not-create-var-log-README.patch @@ -1,4 +1,4 @@ -From 0d4a5976056387ff3801fdb7f53e6d0760df0475 Mon Sep 17 00:00:00 2001 +From e36f6fc852f8331791f391a216885b9bea543aff Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 21 Jan 2025 05:02:00 +0100 Subject: [PATCH] Do not create /var/log/README diff --git a/meta/recipes-core/systemd/systemd/coredumpd-kernel-version.conf b/meta/recipes-core/systemd/systemd/coredumpd-kernel-version.conf new file mode 100644 index 00000000000..dcc23825f42 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/coredumpd-kernel-version.conf @@ -0,0 +1,14 @@ +# systemd 262's kernel coredump socket manager (systemd-coredumpd.service) +# requires the PIDFD_INFO_COREDUMP_SIGNAL pidfd flag, added in Linux 6.19 +# (PIDFD_INFO_COREDUMP itself is from 6.16). Its ExecCondition +# (systemd-coredump --check-requirements) fails on older kernels, and combined +# with Restart=on-failure and the Upholds= relationship the unit flaps into +# start-limit-hit instead of being skipped, which fails the systemd runtime +# tests. OE-Core ships both linux-yocto 6.18 (< 6.19) and 7.2 (>= 6.19), so +# gate activation on the kernel version at runtime: this keeps coredumpd active +# on 7.2 while cleanly skipping it on 6.18. A ConditionKernelVersion= failure is +# a clean skip and does not trigger the restart/start-limit escalation. +# The per-coredump systemd-coredump@.service path remains available on all kernels. +# Upstream report: https://github.com/systemd/systemd/issues/43963 +[Unit] +ConditionKernelVersion=>=6.19 diff --git a/meta/recipes-core/systemd/systemd_261.3.bb b/meta/recipes-core/systemd/systemd_262.bb similarity index 98% rename from meta/recipes-core/systemd/systemd_261.3.bb rename to meta/recipes-core/systemd/systemd_262.bb index 0901736e7c9..d613f01c582 100644 --- a/meta/recipes-core/systemd/systemd_261.3.bb +++ b/meta/recipes-core/systemd/systemd_262.bb @@ -34,9 +34,9 @@ SRC_URI += "file://touchscreen.rules \ file://init \ file://99-default.preset \ file://systemd-pager.sh \ + file://coredumpd-kernel-version.conf \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-Do-not-create-var-log-README.patch \ - file://0001-include-fix-limits.h-override.patch \ " PAM_PLUGINS = " \ @@ -144,7 +144,6 @@ PACKAGECONFIG[journal-color] = ",,,less" PACKAGECONFIG[journal-upload] = "-Dlibcurl=enabled,-Dlibcurl=disabled,curl" PACKAGECONFIG[kmod] = "-Dkmod=enabled,-Dkmod=disabled,kmod,libkmod" PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig" -PACKAGECONFIG[libidn] = "-Dlibidn=enabled,-Dlibidn=disabled,libidn" PACKAGECONFIG[libidn2] = "-Dlibidn2=enabled,-Dlibidn2=disabled,libidn2" # Link udev shared with systemd helper library. # If enabled the udev package depends on the systemd package (which has the needed shared library). @@ -355,6 +354,15 @@ do_install() { # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto install -Dm 0644 ${UNPACKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset + # Gate the new (v262) kernel coredump socket manager on a kernel + # that actually supports it (>= 6.19). See the drop-in for the full rationale. + if [ -e ${D}${systemd_system_unitdir}/systemd-coredumpd.service ]; then + install -Dm 0644 ${UNPACKDIR}/coredumpd-kernel-version.conf \ + ${D}${systemd_system_unitdir}/systemd-coredumpd.service.d/99-kernel-version.conf + install -Dm 0644 ${UNPACKDIR}/coredumpd-kernel-version.conf \ + ${D}${systemd_system_unitdir}/systemd-coredump-register.service.d/99-kernel-version.conf + fi + # add a profile fragment to disable systemd pager with busybox less install -Dm 0644 ${UNPACKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh @@ -799,6 +807,7 @@ FILES:udev += "${base_sbindir}/udevd \ ${nonarch_libdir}/udev/rules.d/60-persistent-alsa.rules \ ${nonarch_libdir}/udev/rules.d/60-persistent-hidraw.rules \ ${nonarch_libdir}/udev/rules.d/60-persistent-input.rules \ + ${nonarch_libdir}/udev/rules.d/60-persistent-media-controller.rules \ ${nonarch_libdir}/udev/rules.d/60-persistent-storage.rules \ ${nonarch_libdir}/udev/rules.d/60-persistent-storage-mtd.rules \ ${nonarch_libdir}/udev/rules.d/60-persistent-storage-tape.rules \