From patchwork Sun Nov 30 09:27:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4673 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sun, 30 Nov 2025 10:28:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f60.google.com (mail-wr1-f60.google.com [209.85.221.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AU9S5Ia005783 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Nov 2025 10:28:05 +0100 Received: by mail-wr1-f60.google.com with SMTP id ffacd0b85a97d-42b5556d80bsf2266749f8f.2 for ; Sun, 30 Nov 2025 01:28:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1764494873; cv=pass; d=google.com; s=arc-20240605; b=VOaRJzcdoUSPrsDYmRtiY5UTfL1HdF+XNSm2zx74WTyOliLWyJVboNizj4JeimkgXz daMdLyDMUud274Zwfr21OXI44QJ41mnv/G++kxil67tsoOU4pAQEBWur7no/9Mez+I5G NsXgxu5nMyImmsxj0MzaDr1Nk8QQjxPJxeIkkSNP0W5Z5BgJWmv3cnXhAxHzYfMJf/u9 6zDO7IlBdeuhOwOkQ5cB2AVM49PjNpyUez3uCY/BSLWkNWAQtGcqQr3620fW/1eT6U8o GGwfc/BHDxp4Poa0jJE/fUnVhMoAbYoFgmJlhwuWBXCli3U6RCZwA5wZuKIK8tmi+GTl Kt8w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ndnp9vn7QrtAT/lWoHFOvjVHQET1tSoX3vKSZ2wlzPI=; fh=SZINY6ptDp+c2s0rVc3j0+1o7oSQ/rFN8iy11NJObCc=; b=Cxq7b2RK5pzbCKd9GQF6NO3stU6hv7ksnKHDNI4zbPcnixaVYPhodHG8JuxXZuxnMv CPr9qKd0sxhAtIojtZc+MBsSD9R7h1odnVTnSAoOu9kbT4wkCbrK9UoeU9dcC+eX9ezV TVwLp3OM4OHYSpKO9Ia+hOs9Nwgk4to/Djibwk794zMgNI/tiugMmCkubf0FqvxIHr7L o+bldMS58ynRsHVhrOm+cV8OryXGf+pqOwNSeOmbLTsI1XGQJRT7KUQS9dYLgK/qcgBa yn+Q8bgkCG7CoaY1XRA4ZLpN0elq/8+n/P+2+G7g1bxTRCMtzy6PhqfrZ03sWs3/eC8n tRAQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BcE8nb+Q; spf=pass (google.com: domain of fm-294854-20251130092749a2fc69effa000207bb-v2ool1@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251130092749a2fc69effa000207bb-v2OOL1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1764494873; x=1765099673; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=ndnp9vn7QrtAT/lWoHFOvjVHQET1tSoX3vKSZ2wlzPI=; b=xShMrkvT7TaL6m6ZdNR29GVczBQeU9sfwsJMeS+3Q5PgPZjwggB93oK1Cad4nQH7HX FZB60abaFKMOJ6QR6ZyMz/Xao/QGMxfSq6ScPeTF65symoN95Ao4NvVuYE+S3shc1OqF aJ5CnzhL9w6GLkK4bYimmpg/nZvub8DHfUVka/AUj55OoG1o6SX9hhf3K1ifzlAiVOCb RJ0XpolC6+/QC1s3pEPu8Wp1DCaQYINTzM75FCnGZcF/5Abkh/AN5/DbKbYu8DT10LL3 tSmSA706pCBzzWq4LAgGDZwuXs26qm2m2Ndi7aBdIJp6wuSx5zs1VFniDam6F0rOs5LE E9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764494873; x=1765099673; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ndnp9vn7QrtAT/lWoHFOvjVHQET1tSoX3vKSZ2wlzPI=; b=CXR4sUfujWo5xzm4uVIJa/hmNz7ar7VwgB1NzdgfW3tdleN3PYUiVAxZxDiwdz/1dc mtV3cYl/n2EpX1I6deTjvQyL4R9AS/gXVRA+PyjNDz4pxDY/VV5q9RUsBpP2szwNDvlV +kNruYA5hWqK+TFQs0jym6T9KDiKo+fUUSb3F+BPEtAEyKIcGGRQG3NFHcc8RdR5oFJB zixqsQadCDBtKI1E5+8wy6Mow0gqoQI8tF8naJKl+NYIiecIYCwF0g8hULnIjS2Dch0L gqefO4YiQajwmz54A2YhGhVrqX5X9ioph4+C/14q8xbFgvk+w8tg+FqtNQZ1h+Q37F2A 4aPw== X-Forwarded-Encrypted: i=2; AJvYcCX6ZMpRrrIlb8/Gado2P9U34ie/CtkjzMLZipFEh8yZK28+afm1WhBvdAe2TEvSP5/4DfCwJu8=@isar-build.org X-Gm-Message-State: AOJu0Yy4KFyOUi8fivyXE8lOpwnKzCPbLKbqOfUdkssI8OAUy25JNoV0 hbZPtm5gzOYoUNaPPppHyzqD/g1Y6wWpC9BryKI0iHWLZI/2tvbJ+/cE X-Google-Smtp-Source: AGHT+IEbPKF08lP0tDuGu3LfIB/caLUhtrvDL6GBYtYCbaidBzWTzJcuIVdQKQI0bJzPP+hEiiqWyQ== X-Received: by 2002:a5d:5f82:0:b0:42b:394a:9b1 with SMTP id ffacd0b85a97d-42e0f343c5amr21351332f8f.37.1764494872607; Sun, 30 Nov 2025 01:27:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+b10foQEtWAzJBScc5be7hmuK/zUnFy2MprRvSQCDuErw==" Received: by 2002:a05:6000:18a7:b0:424:21d6:1fad with SMTP id ffacd0b85a97d-42e1b384e9cls1767745f8f.1.-pod-prod-07-eu; Sun, 30 Nov 2025 01:27:49 -0800 (PST) X-Received: by 2002:a5d:5f55:0:b0:42b:39d0:6377 with SMTP id ffacd0b85a97d-42e0f2047e7mr23642594f8f.17.1764494869697; Sun, 30 Nov 2025 01:27:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764494869; cv=none; d=google.com; s=arc-20240605; b=ceHiD6B7f2DHXzrAAC2BDikX8fGpiOEWzIDKvpn7gSC5Cx9EEzOi2A63JgDQGjBSuu S0Wt3s5A892mnJRpAQdKYaI+0ZQYZbb+it+EIIINJTKwciXisZQrpea7WCtFtMjEEqpb CuJxNxpYDOOyLy9JE6rgui50hRz9DV18DPz04nHTOYFLH/faPrwM9r4nc/1TGxaZRtRa ABnaXsY6qL4VSy3pF+qifTT8wlgoi2ev1Wm5aOuv8g5zk/kKLaNEnjn1IdcL2YOHiudW KuWkjHGQPmyyLSB6b7dnqUP9pATBMc/2TLSVdKg/zssLjf/D5FCJ8/MNC4XvHv+/XFEp /SDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=bGNR1hGuPfMZepHn45haKl76np7nZu1dk3dODghqe/8=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=Rjl9xNDgaKhcIVR6w74SgM66Sxlcl4ae39hEBTYd7c6sXrlJSAGzg+jAr/a+cvvqlR QhJUQm/0CgLnfYEzKr/z4w2iLa4XGzo+vkp13fHsS2jwgblAAGODf+G2ckk35+LhDf8b vbVUjmpkO6tFegZhpTo5m82JBY+mmH0xDmTqSIljboTEcVV2qnjyYZ7HRrtGtx0RLn2H Mndacei2DFIjtt7rTSFTDXIB2IfntGpXMyIhTbyM4VWKKutdyaBZZY98KY1OtcRs321/ b+iKXkGaxONCELSwifc+barj7TnBuaMu5yujVvqIjTD50slubRE9b9gRtsd5kZr0zKSN 5eFg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BcE8nb+Q; spf=pass (google.com: domain of fm-294854-20251130092749a2fc69effa000207bb-v2ool1@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251130092749a2fc69effa000207bb-v2OOL1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-42e1ca546f2si117384f8f.8.2025.11.30.01.27.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Nov 2025 01:27:49 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20251130092749a2fc69effa000207bb-v2ool1@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20251130092749a2fc69effa000207bb for ; Sun, 30 Nov 2025 10:27:49 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH v3 07/27] linux-module: Migrate to a bbclasss Date: Sun, 30 Nov 2025 10:27:27 +0100 Message-ID: <1da2ea11a4d8d1901d1ce5ed7d184037fcf10003.1764494867.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=BcE8nb+Q; spf=pass (google.com: domain of fm-294854-20251130092749a2fc69effa000207bb-v2ool1@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251130092749a2fc69effa000207bb-v2OOL1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka "inherit linux-module" is shorter and a more common pattern compared to OE/yocto. Keep the original .inc file as transitional helper, issuing a warning when it's used with a migration suggestion. Signed-off-by: Jan Kiszka --- .../linux-module.bbclass} | 3 +- meta/recipes-kernel/linux-module/module.inc | 86 ++----------------- 2 files changed, 7 insertions(+), 82 deletions(-) copy meta/{recipes-kernel/linux-module/module.inc => classes-recipe/linux-module.bbclass} (97%) diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/classes-recipe/linux-module.bbclass similarity index 97% copy from meta/recipes-kernel/linux-module/module.inc copy to meta/classes-recipe/linux-module.bbclass index 093ea19f..5ad2ba4c 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/classes-recipe/linux-module.bbclass @@ -5,8 +5,6 @@ # # SPDX-License-Identifier: MIT -FILESPATH:append := ":${FILE_DIRNAME}/files" - DESCRIPTION ?= "Custom kernel module ${PN}" MAINTAINER ?= "isar-users " @@ -35,6 +33,7 @@ DEB_BUILD_PROFILES += "${@'pkg.signwith' if bb.utils.to_boolean(d.getVar('KERNEL DEPENDS += "${@'module-signer secure-boot-secrets' if bb.utils.to_boolean(d.getVar('KERNEL_MODULE_SIGNATURES')) else ''}" DEBIAN_BUILD_DEPENDS .= "${@', module-signer, secure-boot-secrets' if bb.utils.to_boolean(d.getVar('KERNEL_MODULE_SIGNATURES')) else ''}" +FILESPATH:append = ":${LAYERDIR_core}/recipes-kernel/linux-module/files" SRC_URI += "file://debian/" AUTOLOAD ?= "" diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index 093ea19f..52541a29 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -1,87 +1,13 @@ -# Custom kernel module recipe include +# Transitional include for linux-module.bbclass # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 +# Copyright (c) Siemens AG, 2025 # # SPDX-License-Identifier: MIT -FILESPATH:append := ":${FILE_DIRNAME}/files" +inherit linux-module -DESCRIPTION ?= "Custom kernel module ${PN}" -MAINTAINER ?= "isar-users " - -KERNEL_NAME ?= "" -# directory with KBuild file (M=${MODULE_DIR}) -MODULE_DIR ?= "$(PWD)" - -PN .= "-${KERNEL_NAME}" - -KERNEL_IMAGE_PKG ??= "linux-image-${KERNEL_NAME}" -KERNEL_HEADERS_PKG ??= "linux-headers-${KERNEL_NAME}" -DEPENDS += "${KERNEL_HEADERS_PKG}-native" -DEBIAN_BUILD_DEPENDS = "${KERNEL_HEADERS_PKG}" -# Do not generate debug symbols packages, as not supported for modules -DEB_BUILD_OPTIONS += "noautodbgsym" - -SIGNATURE_KEYFILE ??= "/usr/share/secure-boot-secrets/secure-boot.key" -SIGNATURE_CERTFILE ??= "/usr/share/secure-boot-secrets/secure-boot.pem" -SIGNATURE_HASHFN ??= "sha256" -SIGNATURE_SIGNWITH ??= "/usr/bin/sign-module.sh" - -KERNEL_MODULE_SIGNATURES ??= "" - -# Define signing profile and dependencies if KERNEL_MODULE_SIGNATURES is set to "1" -DEB_BUILD_PROFILES += "${@'pkg.signwith' if bb.utils.to_boolean(d.getVar('KERNEL_MODULE_SIGNATURES')) else ''}" -DEPENDS += "${@'module-signer secure-boot-secrets' if bb.utils.to_boolean(d.getVar('KERNEL_MODULE_SIGNATURES')) else ''}" -DEBIAN_BUILD_DEPENDS .= "${@', module-signer, secure-boot-secrets' if bb.utils.to_boolean(d.getVar('KERNEL_MODULE_SIGNATURES')) else ''}" - -SRC_URI += "file://debian/" - -AUTOLOAD ?= "" - -# Cross-compilation is not supported for the default Debian kernels. -# For example, package with kernel headers for ARM: -# linux-headers-armmp -# has hard dependencies from linux-compiler-gcc-4.8-arm, what -# conflicts with the host binaries. -python() { - if d.getVar('KERNEL_NAME') in d.getVar('DISTRO_KERNELS').split(): - d.setVar('ISAR_CROSS_COMPILE', '0') -} - -inherit dpkg -inherit per-kernel - -TEMPLATE_FILES = "debian/control.tmpl \ - debian/rules.tmpl" -TEMPLATE_VARS += " \ - KERNEL_NAME \ - KERNEL_TYPE \ - KERNEL_IMAGE_PKG \ - KERNEL_HEADERS_PKG \ - KCFLAGS \ - KAFLAGS \ - MODULE_DIR \ - DEBIAN_BUILD_DEPENDS \ - SIGNATURE_KEYFILE \ - SIGNATURE_CERTFILE \ - SIGNATURE_HASHFN \ - SIGNATURE_SIGNWITH \ - PN \ - DEBIAN_COMPAT \ - DEBIAN_STANDARDS_VERSION" - -# Add custom cflags to the kernel build -KCFLAGS ?= "-fdebug-prefix-map=${CURDIR}=. -fmacro-prefix-map=${CURDIR}=." -KAFLAGS ?= "-fdebug-prefix-map=${CURDIR}=." - -do_prepare_build() { - rm -rf ${S}/debian - cp -r ${WORKDIR}/debian ${S}/ - - deb_add_changelog - - for module in ${AUTOLOAD}; do - echo "echo $module >> /etc/modules" >> ${S}/debian/postinst - done +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-kernel/linux-module/module.inc\" to \"inherit linux-module\"" } +addtask warn_custom_inc before do_unpack