From patchwork Sat Mar 15 10:24:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 59052 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 3ED51C28B28 for ; Sat, 15 Mar 2025 10:24:48 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.7204.1742034282463712376 for ; Sat, 15 Mar 2025 03:24:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bHK0K4fN; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so3146675e9.1 for ; Sat, 15 Mar 2025 03:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742034281; x=1742639081; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=UwkH+akqEM/sl7hthMHgdzFvfW9jjqRRcMUORZZW/0c=; b=bHK0K4fNsOAZPQiERoaKkh/meaLxdxqRHf9F9IPkUeMQjkCwiN5UaE4s/UKiMt2qKq oRZ/fIHy4R7fZLz6/fll1R4NZx9YLs91NB4VzQW+DqArAccKDhQeYArrbec+6YPdpFMr a6DAJnqg65IPK4l43zIpnvdA68wFA3DbEspn5YXn0ZCI9ehrp3orkgvKrQWg90vvf0A9 BWdnX1WrvUcuPp8kr9LetcunMnZpwrKlEqqU67crVCnH4VghE5fx4YvQCHrko97Xj8QX /Wpuuc98hXcqbze9xsTe15mah6W03rCA75Tb3UwgmlWpGXvdQNL+yx6oVJ2Kvp6k48Cf srww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742034281; x=1742639081; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UwkH+akqEM/sl7hthMHgdzFvfW9jjqRRcMUORZZW/0c=; b=ShHfZga7Uz+SQnzaT+F4E5q+IeQ3oygIEtb+hRyPwHxV8TKphVrYRju3h4pIEA4Rz7 TTHQUq7KR4UL7+fhV3rtQHV9lOKY9gCJh4mXOSx3gQYAGXyfZe4QHIzD6LiBgUu/At29 CqdTpCs67xAyWouJvd2yemr4WUhn8HQOghZ07ZSiL/f1pC7pr+1pXplAzKN2PZEXGIDV aarx1FU+K4Eq73zQ6Np+IxczdLlyJC4x0Wkd8FLfzMFYHrQWsV5dWuByRP+o6jL+81nx BVRA4As2o078CUtpPHuvHV1ADBLzwsOnsxkT9P1HFAxftVVd96FkmdaLoAQiluw/3xOU gH/Q== X-Gm-Message-State: AOJu0YwKHE5tAINEz2DKzhWuE3fAGNZlkuxRWyErLyfTEyKudrMqaW4m aGmkWQ1l2oR/v/ThvvlavVauViIvRTlaCVdEiSLmUbRvA451RVDa X-Gm-Gg: ASbGnct86t4z4HrnXP9MBoy1DEre4jTBy+CRHc4cjg43+IgQaqIxUc23PQ6skR40sV0 MLFni5prKciqpbYbgMYeOUExrN+gchf3myH6ildk0VmiTlgkqvMq1Dgwjf9jViqjbQ/O04/l0oy ylNp2Dragk8gPUslQL/Bmh968V0IhLMTrkOXoPSPz/py0U24fbbgU1bgIKptaKJxBOvNUhGs+LN L8PrR9WD3CZWu6C8CfXD0OlFmhUuV95M3y4HeimmPYYA9xo1zuOAfRKQ+2T7QXwGGhDZZ+2Wo4G tsJCOnhmONVufwxsFldAoRkdcv07WAOpxuSR36E21lR8+TAB6/OjyMnyy7gjW6rzJIipHCZdWPn 5+pDruEFl7aT+ryA2fmSD1A== X-Google-Smtp-Source: AGHT+IHQK4I9x9d/jscdG5mLN3XBnHQBQPb4G6yKN03rkZZon1FoTTrVMAoPe9Q1Skupo/1aZh2VPQ== X-Received: by 2002:a05:600c:548c:b0:43c:f8fc:f697 with SMTP id 5b1f17b1804b1-43d1ec7795fmr69294775e9.9.1742034280524; Sat, 15 Mar 2025 03:24:40 -0700 (PDT) Received: from ip-10-0-0-134.eu-west-1.compute.internal ([2a05:d018:db1:fb00:c4f8:7a97:b7aa:1bfd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fe05e8dsm45186145e9.9.2025.03.15.03.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 03:24:40 -0700 (PDT) From: Alex Kiernan Date: Sat, 15 Mar 2025 10:24:38 +0000 Subject: [PATCH OE-Core v4 1/5] scdoc: Import from meta-wayland MIME-Version: 1.0 Message-Id: <20250315-kmod-v4-1-946682cc4090@gmail.com> References: <20250315-kmod-v4-0-946682cc4090@gmail.com> In-Reply-To: <20250315-kmod-v4-0-946682cc4090@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan X-Mailer: b4 0.14.2 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 ; Sat, 15 Mar 2025 10:24:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212870 scdoc is a simple man page generator for POSIX systems written in C99. Signed-off-by: Alex Kiernan --- meta/conf/distro/include/maintainers.inc | 1 + .../0001-Makefile-dont-add-static-to-LDFLAGS.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/scdoc/scdoc_git.bb | 25 ++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5515d46ca5b1aad22c46665c78e4707bc22e3a0a..2b47d3103c03b1b8a11f40566fdd5334d906860d 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -761,6 +761,7 @@ RECIPE_MAINTAINER:pn-sassc = "Simone Weiß " RECIPE_MAINTAINER:pn-sato-screenshot = "Ross Burton " RECIPE_MAINTAINER:pn-sato-icon-theme = "Richard Purdie " RECIPE_MAINTAINER:pn-sbc = "Unassigned " +RECIPE_MAINTAINER:pn-scdoc = "Alex Kiernan " RECIPE_MAINTAINER:pn-screen = "Anuj Mittal " RECIPE_MAINTAINER:pn-seatd = "Unassigned " RECIPE_MAINTAINER:pn-sed = "Chen Qi " diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch new file mode 100644 index 0000000000000000000000000000000000000000..b520e949c0b31c0908118cba4f6c2b6ea26f5a26 --- /dev/null +++ b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch @@ -0,0 +1,27 @@ +From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Thu, 13 Jul 2023 19:26:40 +0200 +Subject: [PATCH] Makefile: dont add -static to LDFLAGS + +Signed-off-by: Markus Volk + +Upstream-Status: Inappropriate [oe-specific] +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 60a80b8..49021fa 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,6 @@ + VERSION=1.11.2 + CFLAGS?=-g + MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter +-LDFLAGS+=-static + INCLUDE+=-Iinclude + PREFIX?=/usr/local + BINDIR?=$(PREFIX)/bin +-- +2.39.3 + diff --git a/meta/recipes-extended/scdoc/scdoc_git.bb b/meta/recipes-extended/scdoc/scdoc_git.bb new file mode 100644 index 0000000000000000000000000000000000000000..224e5417342e9db820456ec54476a1e3cac0e4e4 --- /dev/null +++ b/meta/recipes-extended/scdoc/scdoc_git.bb @@ -0,0 +1,25 @@ +SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99." +HOMEPAGE = "https://github.com/ddevault/scdoc" +BUGTRACKER = "https://github.com/ddevault/scdoc/issues" +SECTION = "base/doc" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d" + +SRC_URI = " \ + git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \ + file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \ +" + +DEPENDS = "scdoc-native" + +S = "${WORKDIR}/git" +PV = "1.11.2" +SRCREV = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61" + +EXTRA_OEMAKE:class-native = "PREFIX=${prefix}" +EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" + +inherit autotools-brokensep + +BBCLASSEXTEND = "native" + From patchwork Sat Mar 15 10:24:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 59053 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 412B5C35FF1 for ; Sat, 15 Mar 2025 10:24:48 +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.7150.1742034284389332996 for ; Sat, 15 Mar 2025 03:24:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=V2xwTaGK; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so2668225e9.1 for ; Sat, 15 Mar 2025 03:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742034283; x=1742639083; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5htScLa71ypGe8w0grKuCOeDdk0zWky/U4v9up9V8SU=; b=V2xwTaGKv6RybOigRXCefrzI3tmI57R7E7f7h7Vt/ICTRRfr+H+I0jEsSW96e778VX 3OHgNYpshuaZdOAZOSiafpwSP7hCjZUOd7Ibg1K9BMhDYzq15pyo0l6VxCHz1x+EfFVC eY8ivXtR8FgA2crzGnFjZ2AS+AB5z8dzb2KWoSMyO+Tki/g1xGGKwH9gkeEkWvLRo9/I lLMf6/Z9qH0B0BnGmnCyygRdi+UunRlo8JE6csdO/Wb2c8T+xAlEvTNEP7re01O/rcms G/GXJcPP5yWEGoOpuKTk1abDcPZbUtcspA0xZmG2XkldB57/HZcfs11/XUIZp8ZwmXXF y39g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742034283; x=1742639083; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5htScLa71ypGe8w0grKuCOeDdk0zWky/U4v9up9V8SU=; b=AJ1NAWSYwk2tvOGIunyFzq5GGjYfBgoZAbkqBY7CBYij996UpR4D7XFxWm0ReaU0Ht KrM5c8v4uPx1393rGb72Os+4dsL541RlnIIvmibTFLAwaLLNt0goDKY+UiL+kq1DYq2k lS+5kHaLCoM2Kbr3adzuRJlbcNdvafsOMxh8OXVVZfq8e5Y1NO/WHyInMjkIUjm91o/0 A51YyYfd5e8wOuZ8Zts/FOZbXUy3KQ0ZAH3Ve8z6DlLg/MEITWH3jciJ+jSbFv9/Y+kL 48AmKkjYBEh5pPLR7axsyEs/74bZN68BzqcEOCnJYdm2XZz3/v8DDZFyEN2HPSuU+3m6 4+sQ== X-Gm-Message-State: AOJu0Yw5tsrg/kWWV+0EI4cnfcSJ8glpS43vMpUjDiO8KoANLNqDSbPT vMEuMGnqnjN1CNiI7xc+OzOxcFUhzZ/4V5jPeECYhiptoKh2GKPoM4550Z3t X-Gm-Gg: ASbGncsgOLVpWsNkNFjbfXzWPj2puifvOYz8Pi34FZYMooTia6v8xSSKTeoOY7I869i x3AQD7hq1aRemePc5dVPtj4XcSkU16s3AQhF34aEHese+pQ5B+lSkov8wxKvvNqEZAEP7zCIZD9 F5JG85BpPa6/R3vXqoKMRBg1vM4T1vRizkTGKNrKDmiLJ+N+3B8alvaCvooCyYy2ozGuFvg8zVW 2zCn5lBJWbA9FPztcendNwwfsmZrjCS/zmZIRO4HzMwfC9ErLW8N47o+dipKAh6IbObftrF8C1Z lgcdG9VoL3p8wKdKg/OtCMZZvg0RZtPKEwe8JKP0K9n95ieFHW1lSR1dRp4YtyWEd13kfOIubGX 35EhWFtQrRLo= X-Google-Smtp-Source: AGHT+IHvlkXC9M0zWjb3m1QRdycvp3dWWX5lWX8PL8ghHmiqu8KzvUlZWcNeQcuePvOpS8KxjfzViA== X-Received: by 2002:a05:600c:3c9e:b0:439:9737:675b with SMTP id 5b1f17b1804b1-43d1f1f3fccmr75632745e9.7.1742034282337; Sat, 15 Mar 2025 03:24:42 -0700 (PDT) Received: from ip-10-0-0-134.eu-west-1.compute.internal ([2a05:d018:db1:fb00:c4f8:7a97:b7aa:1bfd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fe05e8dsm45186145e9.9.2025.03.15.03.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 03:24:40 -0700 (PDT) From: Alex Kiernan Date: Sat, 15 Mar 2025 10:24:39 +0000 Subject: [PATCH OE-Core v4 2/5] scdoc: Upgrade 1.11.2 -> 1.11.3 MIME-Version: 1.0 Message-Id: <20250315-kmod-v4-2-946682cc4090@gmail.com> References: <20250315-kmod-v4-0-946682cc4090@gmail.com> In-Reply-To: <20250315-kmod-v4-0-946682cc4090@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan X-Mailer: b4 0.14.2 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 ; Sat, 15 Mar 2025 10:24:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212871 Swap static link removal patch to a backport of upstream, remove autotools usage (this is just a Makefile recipe), fix up metadata. Changes: Dimitry Andric (1): Fix clang 15 -Wstrict-prototypes warnings Drew DeVault (2): README.md: mention system packages Update version to 1.11.3 Eli Schwartz (2): remove useless re-declarations of standard functions get rid of some unused includes Humm (3): use .PP for paragraph breaks scdoc(1), scdoc(5): follow conventions more closely simplify list output Max Schillinger (1): fix formatting of escaped backticks Simon Branch (2): scdoc.5: fix capitalization of subsection headers scdoc.5: fix formatting in the preamble Simon Ser (1): man: add section about SOURCE_DATE_EPOCH jturtle (1): Emit '\e' instead of '\\' Signed-off-by: Alex Kiernan --- .../0001-Makefile-dont-add-static-to-LDFLAGS.patch | 27 ---------------------- .../scdoc/scdoc/0001-Makefile-drop-static.patch | 23 ++++++++++++++++++ meta/recipes-extended/scdoc/scdoc_1.11.3.bb | 22 ++++++++++++++++++ meta/recipes-extended/scdoc/scdoc_git.bb | 25 -------------------- 4 files changed, 45 insertions(+), 52 deletions(-) diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch deleted file mode 100644 index b520e949c0b31c0908118cba4f6c2b6ea26f5a26..0000000000000000000000000000000000000000 --- a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Thu, 13 Jul 2023 19:26:40 +0200 -Subject: [PATCH] Makefile: dont add -static to LDFLAGS - -Signed-off-by: Markus Volk - -Upstream-Status: Inappropriate [oe-specific] ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 60a80b8..49021fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,6 @@ - VERSION=1.11.2 - CFLAGS?=-g - MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter --LDFLAGS+=-static - INCLUDE+=-Iinclude - PREFIX?=/usr/local - BINDIR?=$(PREFIX)/bin --- -2.39.3 - diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch new file mode 100644 index 0000000000000000000000000000000000000000..631d06375b9dba7710d5054bc666eb6c71ec393c --- /dev/null +++ b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch @@ -0,0 +1,23 @@ +From 3667cced504bc40b176d4570d99a83fe67599f3a Mon Sep 17 00:00:00 2001 +From: Drew DeVault +Date: Wed, 4 Sep 2024 10:07:46 +0200 +Subject: [PATCH] Makefile: drop -static + +Upstream-Status: Backport [https://git.sr.ht/~sircmpwn/scdoc/commit/3667cced504bc40b176d4570d99a83fe67599f3a] +Signed-off-by: Alex Kiernan +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 96ad48cd04a6..49f076aadd39 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,6 @@ + VERSION=1.11.3 + CFLAGS?=-g + MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter +-LDFLAGS+=-static + INCLUDE+=-Iinclude + PREFIX?=/usr/local + BINDIR?=$(PREFIX)/bin diff --git a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb new file mode 100644 index 0000000000000000000000000000000000000000..7bbedcb66da024206445fb4061b1fa29437a7eb2 --- /dev/null +++ b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99." +HOMEPAGE = "https://git.sr.ht/~sircmpwn/scdoc" +SECTION = "base/doc" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d" + +DEPENDS = "scdoc-native" + +SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \ + file://0001-Makefile-drop-static.patch " +SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +EXTRA_OEMAKE = "PREFIX=${prefix}" +EXTRA_OEMAKE:append:class-target = " HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/scdoc/scdoc_git.bb b/meta/recipes-extended/scdoc/scdoc_git.bb deleted file mode 100644 index 224e5417342e9db820456ec54476a1e3cac0e4e4..0000000000000000000000000000000000000000 --- a/meta/recipes-extended/scdoc/scdoc_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "scdoc is a simple man page generator for POSIX systems written in C99." -HOMEPAGE = "https://github.com/ddevault/scdoc" -BUGTRACKER = "https://github.com/ddevault/scdoc/issues" -SECTION = "base/doc" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d" - -SRC_URI = " \ - git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \ - file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \ -" - -DEPENDS = "scdoc-native" - -S = "${WORKDIR}/git" -PV = "1.11.2" -SRCREV = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61" - -EXTRA_OEMAKE:class-native = "PREFIX=${prefix}" -EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" - -inherit autotools-brokensep - -BBCLASSEXTEND = "native" - From patchwork Sat Mar 15 10:24:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 59054 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 56382C35FF8 for ; Sat, 15 Mar 2025 10:24:48 +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.7151.1742034284566215806 for ; Sat, 15 Mar 2025 03:24:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GxSn+CCm; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso2503609f8f.1 for ; Sat, 15 Mar 2025 03:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742034283; x=1742639083; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6fu63JtcHPwpM6cFiXKz7Y+T14Et5hHvApyC++dTHvo=; b=GxSn+CCmBiTxendinEdvGZRa+K2TewCf0VKW0o7jRX1yoGSpyAsodHvT4teJ1RhQur uc/Bx3rC35sK/gGJcnZYpDsHfK2hSG6on8Ku8ICeQvjSDw44Pr8xKuXg3K+Q3AsgbUZK vigQGkWCLFSftZJPCH9jp8nmlca5xoKxyOUbrwnijG3tWs+7wVU8zXOghVCyvBv0NH6z u1lLXye1Pv5YRZql5tFVY6ZAqtxDP9LZjhSaezUTKbaarpkKzy6g+OL1mJXYbIDR8oap ZvS9ExE9n3cZFgIyExZhEkONvz68rwjvIHQx5wWvDQQyGOOk9gs13GjERyaw3CIyyYuk 2kAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742034283; x=1742639083; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6fu63JtcHPwpM6cFiXKz7Y+T14Et5hHvApyC++dTHvo=; b=ougqkYicfqm9lUKs46184NEIvlbaxeBfsjpEKJt6Q2qfS5Hn72bS7Cv27s+Mpo4JGo 44x+cUy2CbCOL/s/5kVU/WCBDbABVW880YbjN4ZW3Jfr8OeB9IgmWGDghs7LONw6T3Lt 3fFBM0O5ECBrDD0q4aKVLSbuWGHn+Igm7G77+ZER8jJ7Tkf6lC2PcAADBcl5z7m3KBg/ UKMP/fV1F1tri2pZ56N3okS1EbNqVU9/I2Kml0yCn6199KVwShkUcZ1w/w2WJVxWV5ZP QkVuP7fPhWtvcqSEvVBQgYd1URdzxUigrLeqO0+OtY9RGa3vBaRrI1zrhx+hMU0s611R pZpQ== X-Gm-Message-State: AOJu0YzO7AFD+SgipdjHK6ihtQQwbIscJJAXzQST4lHB+3Ldic/FRMxi sBLqt0nHauZeabGsKNA13yq8MkHCkgYyfUHlYc3QcIJEGqHiff2yHBDxd90E X-Gm-Gg: ASbGnctadJXAzX9dIW5PQduS9XCblIn71kvGjQCSqWeHyYLu9jakxV2vw1bwt0pbTWi PuimTJQ0mB1cPazLXzal9aO8+ufwWiuersSHk89iWLF5vFnnvVNoH2jeFt8aY8olfDYE0HTi7AD fTP/wMvKMcd+Bxga165geXdO9MH49uhfw52qcxpPm7qUyfbGytcbmpC1T7CzuJtc0+iUXuVd9Xz gfiGMTXx/doiKjfvu1oXqlCPvSI7IL6A0fww5WBqbBDnAcwJDGqtxnHMMBdfJMAhJ567TMb9NKl qLe7gkfuQHJJdiVT9/WjJmEocgldQLeubql4RuLlnTxxNKJaWVTx/z35FBr/DP8sWXYCmLmKvgB ZaWr3bGusni4= X-Google-Smtp-Source: AGHT+IFDGF7hw4DBCt3ujKm5aZMIIjBS+uUhvg7O/c8NXcU99n8poZFiyJ5V9CAYHhtMPrI0ormp5g== X-Received: by 2002:a5d:6c62:0:b0:391:952:c74a with SMTP id ffacd0b85a97d-395b758f7d1mr10930824f8f.8.1742034282868; Sat, 15 Mar 2025 03:24:42 -0700 (PDT) Received: from ip-10-0-0-134.eu-west-1.compute.internal ([2a05:d018:db1:fb00:c4f8:7a97:b7aa:1bfd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fe05e8dsm45186145e9.9.2025.03.15.03.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 03:24:42 -0700 (PDT) From: Alex Kiernan Date: Sat, 15 Mar 2025 10:24:40 +0000 Subject: [PATCH OE-Core v4 3/5] selftest: gdbserver: Adjust regex for change to output MIME-Version: 1.0 Message-Id: <20250315-kmod-v4-3-946682cc4090@gmail.com> References: <20250315-kmod-v4-0-946682cc4090@gmail.com> In-Reply-To: <20250315-kmod-v4-0-946682cc4090@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan X-Mailer: b4 0.14.2 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 ; Sat, 15 Mar 2025 10:24:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212872 The updated kmod build (using meson) causes the output which results from `info line kmod_help` to change. Relax the regex so that both old and new reponses will pass. Signed-off-by: Alex Kiernan --- meta/lib/oeqa/selftest/cases/gdbserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/gdbserver.py b/meta/lib/oeqa/selftest/cases/gdbserver.py index 9da97ae78037bfd13434e93cf235c62fbbcb66fe..b6b7c5c47337453a49d4aa90166e148eab9038b6 100644 --- a/meta/lib/oeqa/selftest/cases/gdbserver.py +++ b/meta/lib/oeqa/selftest/cases/gdbserver.py @@ -54,7 +54,7 @@ CORE_IMAGE_EXTRA_INSTALL = "gdbserver" self.logger.warning("starting gdb %s" % cmd) r = runCmd(cmd, native_sysroot=native_sysroot, target_sys=target_sys) self.assertEqual(0, r.status) - line_re = r"Line \d+ of \"/usr/src/debug/kmod/.*/tools/kmod.c\" starts at address 0x[0-9A-Fa-f]+ " + line_re = r"Line \d+ of \".*\" starts at address 0x[0-9A-Fa-f]+ " self.assertRegex(r.output, line_re) break else: From patchwork Sat Mar 15 10:24:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 59056 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 55E34C35FF3 for ; Sat, 15 Mar 2025 10:24:48 +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.7152.1742034285726228470 for ; Sat, 15 Mar 2025 03:24:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mXrHozeD; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43d07ca6a80so2351595e9.1 for ; Sat, 15 Mar 2025 03:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742034284; x=1742639084; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7CnUK594peqBwgUVIlwx4PGTJ42uUWecw1HYIT1XluI=; b=mXrHozeDmHTM62gwlmzgACce4tAAZ6dm/G22/R/dU6WEmJUWiwVfdVYvHjGdngBpio pRT8xoqDe2xrU7g+5D+yOaOy1/QzTwBgrcwT22Eej8lgt88rrKgfUFIcpR1YNfMSj1As Zwj1D9HSr43mpagP4yw0CCimn1B6Ov5kNVFANLv2eEeLdXQtPt4GgsIxkNuK6g8lpDVk rQJFCviSIBpg93cRTgBDZeipGVyXg8B4sB13QzGJ0hqLs5LrhLmuqN0LyX0afhTnpjVq r1b43AfENyDo4q+LSsP0DTa0kGcWcvJfftQOQuNr+8yKmCNYoURjwvpG+rbns160q6eh nLog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742034284; x=1742639084; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7CnUK594peqBwgUVIlwx4PGTJ42uUWecw1HYIT1XluI=; b=dBWEZPuFuAhlN7I2Ha8YoEYs7Sf1c66x6J1jpo3ZQik/EZi3HiWo+TIv1XXjm4VBbU vQr9W1lvX9ObikY48UNDEySP0ED8LlHykqA42sjZWGZPCObDfeh5RSiifvQrwARCjfJk aAwe5IRGhZcKXBU//KHM6UUKZE9A/lQZ1xLOmYKqeK+RXEeBZOOHwNMz+1JagRua8R2Z QBunYtPNHnr5DY4XtKZkC1vZ4Cb+z9EfmLzmDDbGS3sWYdYo5G+AFwHKmV9JG4/kw5yO DX5zJPq7Ph8Wz+HmKk6YNlgxkByqOoJmsHzEg3sMb7c1HjpGmP8pbaaa+o1OTEP1QyJ8 COrw== X-Gm-Message-State: AOJu0YyVr2BhYb7cMn3I6XvPTadZCCkVRJuxDobXdSlfJ0aFlgeczHSX oNza2kdbFJ+M8VLzg+cApkBD1GYeVTy0FaYJMKaHi7QJkCRqX281gv4jAOtD X-Gm-Gg: ASbGncviMyq2GUdP1BzxVjUpnLAWXvhN20pX/mOusaZWdPCogtlJKaW+2YqELGnbnqy 6022FPALvBggqyLWBJMjTHXjQqv5yYPfgDQbAATsQrMmyHl9qXaEG8mGAVzTs/tpVHYJXzHxCKH PhDmUOU93ll9XDAlVSsIHU5QIOncgRKrqmykkoCY05b+Liy4s+bY7Q+M6j0sIIwj9LhKOjNFkEB RSuPxpvBHAJ4HA3nwLUujYuWlUtQZTsOmzKnBIH4F5LGmGmk4VUUVUbOpwwv/e/LPM3ebv/fCh0 /Ex9HU6Xr5d0VfkaGxx7qBtkWBvg+GMHN+iUcyMt6aZqrlM9TB1zyglpxX6yuLPzNsl/0tEj+c+ cio7/Gm7UMpY= X-Google-Smtp-Source: AGHT+IHzi2p5ufEShKvBXDO4Ey6I7/kB/rheRUHdN0r2feFMt0MwY9o8UGRuKjq+jv/QsTE3sl415w== X-Received: by 2002:a05:600c:4706:b0:43b:ca39:6c7d with SMTP id 5b1f17b1804b1-43d1ec909edmr73291445e9.3.1742034283630; Sat, 15 Mar 2025 03:24:43 -0700 (PDT) Received: from ip-10-0-0-134.eu-west-1.compute.internal ([2a05:d018:db1:fb00:c4f8:7a97:b7aa:1bfd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fe05e8dsm45186145e9.9.2025.03.15.03.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 03:24:43 -0700 (PDT) From: Alex Kiernan Date: Sat, 15 Mar 2025 10:24:41 +0000 Subject: [PATCH OE-Core v4 4/5] kmod: Upgrade 33 -> 34.1 MIME-Version: 1.0 Message-Id: <20250315-kmod-v4-4-946682cc4090@gmail.com> References: <20250315-kmod-v4-0-946682cc4090@gmail.com> In-Reply-To: <20250315-kmod-v4-0-946682cc4090@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan X-Mailer: b4 0.14.2 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 ; Sat, 15 Mar 2025 10:24:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212873 Migrate to meson from autotools. Drop remnants of ptest support which was removed in 2015: https://git.openembedded.org/openembedded-core/commit/?id=f80d136bdd578468035a88125fa1b84973fd912b Remove configuration directory/symlink handling which is now done by the meson build. Fix manpage generation. kmod 34 ======= - Improvements - Drop pre-built .ko modules from git - distros/packages will need the linux-headers to be able to run the testsuite. There was limited use of the feature, while linters complained about "source-not-included" or "source-contains-prebuilt-binary". - Switch build system to meson: autotools is still supported but slated for removal on next release. This is the transition release to help distros and integrators to move to the new build system. Default options target distros while developers can use the build-dev.ini configuration file. - Allow to load decompression libraries on demand: liblzma.so, libz.so and libzstd.so can now be loaded on demand, only when there is such a need. For use during early boot for loading modules, if configured well it means none of these libraries are loaded: the module loading logic via finit_module() will just hand over to kernel the open file descriptor and kernel will use its own decompress routine. If kernel doesn't handle decompression or if the module is compressed with a different algorithm than the one configured in the kernel, libkmod can still open the module by dynamically loading the correspondent library. Tools inspecting the module contents, like modinfo, will load that single decompression library instead all of them. For distros building with meson it's possible to choose the behavior per library. Examples: a) -Ddlopen=all uses dlopen behavior for all the libraries; b) -Ddlopen=xz, will make only xz to be dlopen'ed while other enabled libraries will be linked in at build time. The use of dlopen is annotated in the ELF file by using the ELF Package Metadata spec as documented in https://systemd.io/ELF_PACKAGE_METADATA/. Example: $ dlopen-notes.py libkmod.so # build/libkmod.so [ { "feature": "xz", "description": "Support for uncompressing xz-compressed modules", "priority": "recommended", "soname": [ "liblzma.so.5" ] } ] - Add -m / --moduledir to depmod to override in runtime the module directory that was already possible to set on build time. Document the interaction between the dir options: base, module and output. - Better error propagation in libkmod for its internal APIs and libc functions up to the callers. - Improve libkmod API documentation by adding new sections, documenting functions previously missing, rewording existing ones, adding version information, cross-referencing, etc. - Remove deprecated arguments for depmod: --unresolved-error, --quiet, --root and --map. - Remove deprecated arguments for rmmod: -w. - Remove deprecated arguments for insmod: -p and -s. - Add --syslog and --force for insmod to normalize it with other tools. - Add bash, fish and zsh shell-completion for insmod, rmmod and lsmod. - Remove depmod_module_directory_override from .pc as the kernel side is not making use of it and will likely not need it. - Improve builtin module listing and retrieving information from its modinfo index which reduces the amount of needed syscalls by 90%. - Improve zstd decompression by using streaming bufferless mode which reduces the amount of syscalls by 65%. - Increase use of pread while parsing ELF and indexes in order to reduce syscalls and improve performance. - Improve module sorting in depmod to speedup the use of the modules.order index and support duplicate lines in it. - Avoid misaligned memory access while reading module signature in libkmod. - Add more documentation for contributing to kmod. New developers are welcome to look at the new README.md and CONTRIBUTING.md files for information on process, coding style, build/installation, etc. - Overhaul man pages with multiple clarifications, section rewrites and additional documentation. - Drop --with-rootlibdir as it's seldom used and was partially broken. - Drop strndupa() and alloca() for increased libc compatibility. - Better handling of LFS for increased compatibility with libc. - Protect kmod_get_dirname() and kmod_new() against NULL argument. - Normalize --version / --help output across all tools. - Always include log priority in messages, even when building with debug. - Optimize index reading by lazily reading nodes on demand, reducing FILE overhead and reducing code duplication wrt FILE vs mmap implementations, etc. - Switch index to pre-order to improve performance in both read and write, meaning faster lookup and faster depmod. Some examples: a) traversing all indexes via configuration dump shows a 9% improvement on Raspberry Pi 2. b) writing the indexes takes 90% less lseek() calls, leading to a performance gain of 13%. - Make symlink install locations more similar to what distros are using: by default it installs the kmod binary as bin/kmod and the symlinks are located in e.g. `sbin/depmod -> ../bin/kmod`. Changing the sbin location is sufficient to move the symlinks to the appropriate place, so distros using `--sbin /usr/bin` will have them installed in that directory. This avoids distros having to remove the symlink and add the symlinks by themselves. (meson only) - Install configuration directories, /{etc,usr/lib}/{depmod,modprobe}.d/ as part of installation, matching what several distros do during packaging. (meson only) - Bug fixes - Fix testsuite using when using configurable module dir. - Fix typos on documentation and source code. - Fix out of bound access in multiple places when using long paths, synthetic huge files, or handling memory allocation errors, or inconsistent variable types, particularly on 32b builds. - Fix internal array APIs, with better error checking: improve execution on very memory-constrained scenarios or very long paths. - Fix absolute path handling in depmod. - Fix libkmod memory leaks on error handling when getting builtin module list. - Do not crash on invalid modules.builtin.modinfo file. - Fix link with lld resulting in empty testsuite. - Fix testsuite build/execution with musl. - Others - Adopt clang-format and editorconfig for coding style and setup CI action to keep the codebase consistent. - Adopt codespell in CI. - Adopt CodeQL integration in CI. - Adopt Codecov in CI. - Adopt SPDX copyright and license identifiers throughout the project. - Add more distros to CI, 32b builds, clang as compiler and lld as linker. - Add support for clang sanitizers and squelch warnings. - Add tests for builtin modules from modinfo index file. - Multiple testsuite refactors and fixes to make it simpler to write tests. - Add CI coverage for docs - Improve strbuf implementation with more error checks and generalize it to cover the role of scratchbuf. This allows to remove the scratchbuf implementation. - Use common array and strbuf code in depmod to remove duplication. - Add abstraction and use more compiler builtins for addition and multiplication with overflow checking. - Normalize use of C attributes throughout the project. Signed-off-by: Alex Kiernan --- .../kmod/kmod/avoid_parallel_tests.patch | 30 ----------- meta/recipes-kernel/kmod/kmod/gtkdocdir.patch | 30 ----------- meta/recipes-kernel/kmod/kmod/run-ptest | 5 -- .../kmod/{kmod_33.bb => kmod_34.1.bb} | 58 +++++++++------------- 4 files changed, 23 insertions(+), 100 deletions(-) diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch deleted file mode 100644 index 6db4fa7e97e55ea0d9e34c8caa35357ff2052adb..0000000000000000000000000000000000000000 --- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7a22abf188e5b688080bb1321a77588474114339 Mon Sep 17 00:00:00 2001 -From: Tudor Florea -Date: Fri, 6 Sep 2013 21:11:57 +0000 -Subject: [PATCH] kmod: avoid parallel-tests - -Avoid parallel-tests as it remove -buildtest-TESTS and runtest-TESTS targets required by ptest. -In automake 1.13.4 parallel-tests is assumed by defauls. -In order to have buildtest-TESTS and runtest-TESTS targets -serial-tests is now required - -Signed-off-by: Tudor Florea -Upstream-Status: Inappropriate (disable feature incompatible with ptest) ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2f1c525..7056aae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS - AC_SYS_LARGEFILE - AC_PREFIX_DEFAULT([/usr]) - AM_MAINTAINER_MODE([enable]) --AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) -+AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) - AM_SILENT_RULES([yes]) - LT_INIT([disable-static pic-only]) - diff --git a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch b/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch deleted file mode 100644 index 91d622b8c7b04a34b875efb8c2579614bdb90668..0000000000000000000000000000000000000000 --- a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90fb7bb85002cde39de3b3d2e2481933390832af Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 8 Dec 2023 22:35:45 +0000 -Subject: [PATCH] configure: set docdir in GTK_DOC_CHECK - -By passing --docdir in the GTK_DOC_CHECK arguments (to match -autogen.sh) autoreconf will work out of the box. - -Without this autoreconf fails due to the documentation not being in -./docs, the default location. - -Upstream-Status: Submitted [https://lore.kernel.org/linux-modules/20231208224511.1363066-1-ross.burton@arm.com/T/#u] -Signed-off-by: Ross Burton ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7056aae..d53a20c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -236,7 +236,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [ - AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$enable_coverage" = "xyes"]) - - m4_ifdef([GTK_DOC_CHECK], [ --GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat]) -+GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat --docdir libkmod/docs]) - ], [ - AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) - diff --git a/meta/recipes-kernel/kmod/kmod/run-ptest b/meta/recipes-kernel/kmod/kmod/run-ptest deleted file mode 100755 index 598dd2cb5fbad194a135e5d06601847e00df1586..0000000000000000000000000000000000000000 --- a/meta/recipes-kernel/kmod/kmod/run-ptest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -touch testsuite/stamp-rootfs -tar xf testmodule.tar -make -k runtest-TESTS 2>/dev/null| grep -e ^PASS -e ^FAIL -find testsuite -name *.ko -exec rm -f {} \; diff --git a/meta/recipes-kernel/kmod/kmod_33.bb b/meta/recipes-kernel/kmod/kmod_34.1.bb similarity index 58% rename from meta/recipes-kernel/kmod/kmod_33.bb rename to meta/recipes-kernel/kmod/kmod_34.1.bb index 15f42766f3b5e484a8f0519fc037b32fa62a4754..8154e6ec57498711d8948d94787962e73c866b7f 100644 --- a/meta/recipes-kernel/kmod/kmod_33.bb +++ b/meta/recipes-kernel/kmod/kmod_34.1.bb @@ -13,28 +13,28 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tools/COPYING;md5=751419260aa954499f7abaabaa882bbe \ " -inherit autotools bash-completion gtk-doc pkgconfig update-alternatives +inherit bash-completion gtk-doc manpages meson pkgconfig update-alternatives -SRCREV = "e193aeb99a04fb4b63ce47eb2c7f119db59446a0" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \ +SRC_URI = "https://www.kernel.org/pub/linux/utils/kernel/${BPN}/${BP}.tar.xz \ file://depmod-search.conf \ - file://avoid_parallel_tests.patch \ - file://gtkdocdir.patch \ " +SRC_URI[sha256sum] = "125957c9125fc5db1bd6a2641a1c9a6a0b500882fb8ccf7fb6483fcae5309b17" -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--enable-tools" +EXTRA_OEMESON += "\ + -Ddistconfdir=${nonarch_base_libdir} \ + --bindir=${base_bindir} \ + --sbindir=${base_sbindir} \ + -Dtools=true \ +" PACKAGECONFIG ??= "zlib xz openssl" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, scdoc-native" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" +PACKAGECONFIG[debug] = "-Ddebug-messages=true,-Ddebug-messages=false" +PACKAGECONFIG[logging] = " -Dlogging=true,-Dlogging=false" +PACKAGECONFIG[manpages] = "-Dmanpages=true,-Dmanpages=false,scdoc-native" +PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" +PACKAGECONFIG[xz] = "-Dxz=enabled,-Dxz=disabled,xz" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" +PACKAGECONFIG[zstd] = "-Dzstd=enabled,-Dzstd=disabled,zstd" PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" @@ -44,24 +44,7 @@ RREPLACES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod mod # to force user to remove old module-init-tools and replace them with kmod variants RCONFLICTS:libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" -# autotools set prefix to /usr, however we want them in /bin and /sbin -EXTRA_OECONF += "--bindir=${base_bindir} --sbindir=${base_sbindir}" - do_install:append () { - install -dm755 ${D}${base_bindir} - install -dm755 ${D}${base_sbindir} - # add symlinks to kmod - [ -e ${D}${base_bindir}/lsmod ] || ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod - for tool in insmod rmmod depmod modinfo modprobe; do - rm -f ${D}${base_bindir}/${tool} - ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} - done - # configuration directories - install -dm755 ${D}${nonarch_base_libdir}/depmod.d - install -dm755 ${D}${nonarch_base_libdir}/modprobe.d - install -dm755 ${D}${sysconfdir}/depmod.d - install -dm755 ${D}${sysconfdir}/modprobe.d - # install depmod.d file for search/ dir install -Dm644 "${UNPACKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" @@ -69,6 +52,11 @@ do_install:append () { echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf } +PACKAGES += "${PN}-fish-completion ${PN}-zsh-completion" + +FILES:${PN}-fish-completion = "${datadir}/fish" +FILES:${PN}-zsh-completion = "${datadir}/zsh" + ALTERNATIVE_PRIORITY = "70" ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" @@ -78,9 +66,9 @@ ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" ALTERNATIVE_LINK_NAME[rmmod] = "${base_sbindir}/rmmod" ALTERNATIVE_LINK_NAME[modinfo] = "${base_sbindir}/modinfo" -ALTERNATIVE_LINK_NAME[bin-lsmod] = "${base_bindir}/lsmod" +ALTERNATIVE_LINK_NAME[bin-lsmod] = "${base_sbindir}/lsmod" ALTERNATIVE_LINK_NAME[lsmod] = "${base_sbindir}/lsmod" -ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}" +ALTERNATIVE_TARGET[lsmod] = "${base_sbindir}/lsmod.${BPN}" PACKAGES =+ "libkmod" FILES:libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" From patchwork Sat Mar 15 10:24:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 59055 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 6ACB9C35FF9 for ; Sat, 15 Mar 2025 10:24:48 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.7206.1742034286340065974 for ; Sat, 15 Mar 2025 03:24:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PbQ4hdwt; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so5551875e9.3 for ; Sat, 15 Mar 2025 03:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742034285; x=1742639085; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tFl6TKtG+VCWRFN0ARm8el3ubuDwENnGZL+tU1N6Jvs=; b=PbQ4hdwtAVHF25G+0BT9lEEftVEnLc9Y+g158sphCIKhlS12j8q1Mm/90Y3E9aO007 iqvvsfBHkdbYudJeJV3q2nDGDyqYbYzyPVxjDJQr1psbglgAO8aFjUJ+Ul/fA1+5y5tV pO+6TsU7vCsNiW1XxH1B3ibFaywofKkcc5kewP8EBj5ATUBc4fNW5XmH1Qh6/eKYIRSb magi8aHRg5xMuhXMbuCGOEvdZJWu83mAUpflt3foH9QwQU+2kA5CSzyR/G/yY0GQ03Pk 0SzHfgsHuE7iX7t4QrUAHqgXrMHw6X6tHz/LIb3hpUbSIHt0jAagRjK8GSK+ouYt1WFm td4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742034285; x=1742639085; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tFl6TKtG+VCWRFN0ARm8el3ubuDwENnGZL+tU1N6Jvs=; b=FjEBaXzXWikWHuja2+kchncU+8rF1+MVGyth4G/e5FC4wSI9D/hqq9WZgD0FlhpR69 Z1R4CQZfsjEeIzZFq6py/81bDvpkKVGwMGm4iJkvAjewPuQ8rs70zHoPtZFsTNw6qGHY z6v+jkZevK+ILJfUNAMUtanh0z0DIHmZ2Z9Q6iO3GgqKjDCsrwyumaRkwo/cR+PrGUC0 pd38ArnKDrc88QEjOcjqJ9TCW1PLaUgWV5qqGaTkzYheq9m9Jm+qKt49oQfIigmlirlp ZPE+gsvJ4x7U5xFzpyA8+FFw92wjbZ+g/K/qJHDLXr1mqKVFKUBA6lDBIrPilElisBKC w9Gg== X-Gm-Message-State: AOJu0Yww0fg4ses8mqDTaJKMtqbSQIsqv01TllM6i8jVdzz8jtJ9bgWh r07xkz67kBl6uAtT7YKmSwgeMpN7MJW/hKciBTNTe6WveKuq9pQ7+UUZQ5CK X-Gm-Gg: ASbGnctGLT8CmRm2gN3kEosMRzCSwLpwGum20f5g2e/LMIgLQYh/T/9keTV6E91bYKc f5JLUwbDWnUN/9ionxcBqwO+KVZgfcZvNnn/kB3wqax7H0c9KBJcbPb0qwdhtAUwApYKherg0PM S/+4p8vbVIiCQLr5C7QQuvCo0wSOJEm9oDAUJTXs5XUYlEg3UDhNxh1ZzSotSwx/b77/MHfDfOQ Yvtf6FRTszJRHTsw3pguV0s7wogVblw3isuIo7l+BRuiLphaWe34zLJOhCblUvugubNP1U9tzlw zEfEX24c3KBRbBGrSOhLOikI+vnBE9ILziqKLeX1+ypnxlNUa+eFr1vE4sUtK/TB+7KOmQUYZkZ 0AuCeddr2wN3JYidk9PzYNw== X-Google-Smtp-Source: AGHT+IHbYLW8kemtYz9anDwg7fxM2K3QEyVCA+K6IRTHyipJOktXBgUDOCNNXi+kK1OJr42bdiA6Ig== X-Received: by 2002:a05:600c:548e:b0:43c:fb95:c752 with SMTP id 5b1f17b1804b1-43d1ec74ec4mr75440885e9.3.1742034284569; Sat, 15 Mar 2025 03:24:44 -0700 (PDT) Received: from ip-10-0-0-134.eu-west-1.compute.internal ([2a05:d018:db1:fb00:c4f8:7a97:b7aa:1bfd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fe05e8dsm45186145e9.9.2025.03.15.03.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 03:24:43 -0700 (PDT) From: Alex Kiernan Date: Sat, 15 Mar 2025 10:24:42 +0000 Subject: [PATCH OE-Core v4 5/5] eudev: Drop --output=... from kmod call in init script MIME-Version: 1.0 Message-Id: <20250315-kmod-v4-5-946682cc4090@gmail.com> References: <20250315-kmod-v4-0-946682cc4090@gmail.com> In-Reply-To: <20250315-kmod-v4-0-946682cc4090@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan X-Mailer: b4 0.14.2 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 ; Sat, 15 Mar 2025 10:24:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/212874 This awkward invocation is no longer required as kmod just uses the stdout file descriptor, rather than explicitly opening /dev/stdout. Signed-off-by: Alex Kiernan --- meta/recipes-core/udev/eudev/init | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/udev/eudev/init b/meta/recipes-core/udev/eudev/init index 477a525b21212ad72d2661e27e1218fca9fee5db..790cd3b9339b6334dbab1feaa65f8948d72c76ea 100644 --- a/meta/recipes-core/udev/eudev/init +++ b/meta/recipes-core/udev/eudev/init @@ -27,8 +27,7 @@ make_static_nodes () { [ -e /lib/modules/$(uname -r)/modules.devname ] || return 0 [ -x @KMOD@ ] || return 0 - #output to /proc/self/fd/1 since /dev/stdout not created by udevd yet - @KMOD@ static-nodes --format=tmpfiles --output=/proc/self/fd/1 | + @KMOD@ static-nodes --format=tmpfiles | while read TTYPE TPATH TMODE TUSER TGROUP TAGE TARG; do case "${TTYPE}" in 'd')