From patchwork Thu Jun 22 08:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 26164 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 A24B3EB64DC for ; Thu, 22 Jun 2023 08:48:35 +0000 (UTC) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by mx.groups.io with SMTP id smtpd.web10.6942.1687423706285483860 for ; Thu, 22 Jun 2023 01:48:26 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=JKrbZxYi; spf=pass (domain: gmail.com, ip: 209.85.208.181, mailfrom: quaresma.jose@gmail.com) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2b46bfa66d2so75279551fa.2 for ; Thu, 22 Jun 2023 01:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687423704; x=1690015704; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cRvDF0cQyzoo7aOVxlFXNlPpuTow9I3RWIjOrO55Qcc=; b=JKrbZxYiARsQ8c9zrB3ZNLgFdJR1jsDiC/0So2NHvnVi3XVLn7ZMo2K+7gZzio61F0 PkNPoxbC0KjcxQHyczSJKDZhBIZNUifTEYDMLzuxKlDPITJqeKebKDZR1TGqvFENFbtB EljntxbJY0O3WYVZO7nunIZiD4ZUGcV0P9dkcm7byiN3ovZJkEgslst+NaxGRSGMs/7V b4YNIwEACR/sucZmJy89MBBpKmJT1+m686fGyPYAKcF+mCjDRfo2HVDaDIAcmYRlmuPe NEDDv0qMbyxdmD7XBVrkITp8GsGxAXcqlFOqB8BwMs107hrThrT82MmEqNgzSg9FYeQF X0Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687423704; x=1690015704; 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=cRvDF0cQyzoo7aOVxlFXNlPpuTow9I3RWIjOrO55Qcc=; b=Punuk+28OWpsSYSP6BpDgkR/8+y+vqPCK2sUFVuEsc73V1yVSk6HgwGfZJb6Lwitu9 AwKiJtKp3ygUD9OZ1DIk94l4v/eS5zMkMJVeins3DxbsLKief/h70TKsazdyUIO7N29D GNNPfG7i6MSb+ALanVb6tMBJd6mW5kc5vxUl8OY8yOhjfMzYO0xAizZaAyaHnaUQsZqx 77jVeBsNuIUU/AZjafnpZ2Jxmx8MxqoFEUFPQWuxSlx7uKj6xaqiinr4QxhFHeizsTcm aunB2hRUPSgMS9JF0PSp6ajUNDZKEILuHTOXop68XARQDNsvziK5HhCFq14yANzD8p+F IAXA== X-Gm-Message-State: AC+VfDz207VofBMgOIBw97FVNWaM07EeRt7a4Cm9jLt4YelgoWapa9/5 MdBVu68kHDVOxvbZKc3/dAt59VnBsQ93Tg== X-Google-Smtp-Source: ACHHUZ6+3fSkw/uu7Ja1UGkK7AsmrVzeAIHXBwcdMya9ij+5D3MMB2vRmvV5kmE2+P9HZuXsg7vB3w== X-Received: by 2002:a2e:81c5:0:b0:2b4:8487:5f65 with SMTP id s5-20020a2e81c5000000b002b484875f65mr6246434ljg.39.1687423703820; Thu, 22 Jun 2023 01:48:23 -0700 (PDT) Received: from og-worker-dev-01.infra.foundries.io.net (51-159-19-113.rev.poneytelecom.eu. [51.159.19.113]) by smtp.gmail.com with ESMTPSA id az27-20020a05600c601b00b003f9bb026e5fsm2018295wmb.0.2023.06.22.01.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 01:48:23 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-core@lists.openembedded.org Cc: Jose Quaresma , Ola x Nilsson , Peter Kjellerstedt Subject: [PATCH V4 1/3] kernel-module-split: make autoload and probeconf distribution specific Date: Thu, 22 Jun 2023 08:44:51 +0000 Message-Id: <20230622084452.2026849-1-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.34.1 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 ; Thu, 22 Jun 2023 08:48:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183229 Also take the oportunity to only add configuration files to FILES and CONFFILES when they exist and are used. The modules-load.d [1] - Configure kernel modules to load at boot should install their configuration files in /usr/lib/modules-load.d. The modprobe.d [2] - Configuration directory for modprobe should install their configuration files in /lib/modprobe.d [1] https://www.freedesktop.org/software/systemd/man/modules-load.d.html [2] https://www.man7.org/linux/man-pages//man5/modprobe.d.5.html [YOCTO #12212] https://bugzilla.yoctoproject.org/show_bug.cgi?id=12212 CC: Ola x Nilsson CC: Peter Kjellerstedt Signed-off-by: Jose Quaresma --- v4: also remove the sysconfdir when systemd is not used as it causes QA Issue: linux-yocto: Files/directories were installed but not shipped in any package v3: fix v2 build issue and only add configuration files to FILES and CONFFILES when they exist and are used. v2: use the same location as before on the class and define the new location just for systemd. .../kernel-module-split.bbclass | 38 ++++++++++--------- .../distro/include/init-manager-systemd.inc | 4 ++ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass index 50882c31a7..1d5e39b44d 100644 --- a/meta/classes-recipe/kernel-module-split.bbclass +++ b/meta/classes-recipe/kernel-module-split.bbclass @@ -30,8 +30,11 @@ fi PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross" +modulesloaddir ??= "${sysconfdir}/modules-load.d" +modprobedir ??= "${sysconfdir}/modprobe.d" + do_install:append() { - install -d ${D}${sysconfdir}/modules-load.d/ ${D}${sysconfdir}/modprobe.d/ + install -d ${D}${modulesloaddir} ${D}${modprobedir} } KERNEL_SPLIT_MODULES ?= "1" @@ -93,8 +96,9 @@ python split_kernel_module_packages () { dvar = d.getVar('PKGD') - # If autoloading is requested, output /etc/modules-load.d/.conf and append + # If autoloading is requested, output ${modulesloaddir}/.conf and append # appropriate modprobe commands to the postinst + autoloadpath = '%s/%s.conf' % (d.getVar('modulesloaddir'), basename) autoloadlist = (d.getVar("KERNEL_MODULE_AUTOLOAD") or "").split() autoload = d.getVar('module_autoload_%s' % basename) if autoload and autoload == basename: @@ -102,14 +106,16 @@ python split_kernel_module_packages () { if autoload and basename not in autoloadlist: bb.warn("module_autoload_%s is defined but '%s' isn't included in KERNEL_MODULE_AUTOLOAD, please add it there" % (basename, basename)) if basename in autoloadlist: - name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename) - f = open(name, 'w') + f = open("%s%s" % (dvar, autoloadpath), 'w') if autoload: for m in autoload.split(): f.write('%s\n' % m) else: f.write('%s\n' % basename) f.close() + autoloadpath2append = ' %s' % autoloadpath + d.appendVar('FILES:%s' % pkg, autoloadpath2append) + d.appendVar('CONFFILES:%s' % pkg, autoloadpath2append) postinst = d.getVar('pkg_postinst:%s' % pkg) if not postinst: bb.fatal("pkg_postinst:%s not defined" % pkg) @@ -117,24 +123,19 @@ python split_kernel_module_packages () { d.setVar('pkg_postinst:%s' % pkg, postinst) # Write out any modconf fragment + modconfpath = '%s/%s.conf' % (d.getVar('modprobedir'), basename) modconflist = (d.getVar("KERNEL_MODULE_PROBECONF") or "").split() modconf = d.getVar('module_conf_%s' % basename) if modconf and basename in modconflist: - name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename) - f = open(name, 'w') + f = open("%s%s" % (dvar, modconfpath), 'w') f.write("%s\n" % modconf) f.close() + modconfpath2append = ' %s' % modconfpath + d.appendVar('FILES:%s' % pkg, modconfpath2append) + d.appendVar('CONFFILES:%s' % pkg, modconfpath2append) elif modconf: bb.error("Please ensure module %s is listed in KERNEL_MODULE_PROBECONF since module_conf_%s is set" % (basename, basename)) - files = d.getVar('FILES:%s' % pkg) - files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename) - d.setVar('FILES:%s' % pkg, files) - - conffiles = d.getVar('CONFFILES:%s' % pkg) - conffiles = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (conffiles, basename, basename) - d.setVar('CONFFILES:%s' % pkg, conffiles) - if "description" in vals: old_desc = d.getVar('DESCRIPTION:' + pkg) or "" d.setVar('DESCRIPTION:' + pkg, old_desc + "; " + vals["description"]) @@ -167,10 +168,11 @@ python split_kernel_module_packages () { splitmods = d.getVar('KERNEL_SPLIT_MODULES') postinst = d.getVar('pkg_postinst:modules') postrm = d.getVar('pkg_postrm:modules') + modulesloaddir = d.getVar('modulesloaddir') + modprobedir = d.getVar('modprobedir') if splitmods != '1': - etcdir = d.getVar('sysconfdir') - d.appendVar('FILES:' + metapkg, '%s/modules-load.d/ %s/modprobe.d/ %s/modules/' % (etcdir, etcdir, d.getVar("nonarch_base_libdir"))) + d.appendVar('FILES:' + metapkg, '%s %s %s/modules' % (modulesloaddir, modprobedir, d.getVar("nonarch_base_libdir"))) d.appendVar('pkg_postinst:%s' % metapkg, postinst) d.prependVar('pkg_postrm:%s' % metapkg, postrm); return @@ -189,8 +191,8 @@ python split_kernel_module_packages () { # avoid warnings. removedirs only raises an OSError if an empty # directory cannot be removed. dvar = d.getVar('PKGD') - for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]: - if len(os.listdir(dir)) == 0: + for dir in ["%s%s" % (dvar, modprobedir), "%s%s" % (dvar, modulesloaddir), "%s%s" % (dvar, d.getVar('sysconfdir'))]: + if os.path.isdir(dir) and len(os.listdir(dir)) == 0: os.rmdir(dir) } diff --git a/meta/conf/distro/include/init-manager-systemd.inc b/meta/conf/distro/include/init-manager-systemd.inc index 7867d90028..fc13089764 100644 --- a/meta/conf/distro/include/init-manager-systemd.inc +++ b/meta/conf/distro/include/init-manager-systemd.inc @@ -5,3 +5,7 @@ VIRTUAL-RUNTIME_init_manager ??= "systemd" VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units" VIRTUAL-RUNTIME_login_manager ??= "shadow-base" VIRTUAL-RUNTIME_dev_manager ??= "systemd" + +# use autoload and probeconf distribution specific +modulesloaddir ?= "${libdir}/modules-load.d" +modprobedir ?= "${nonarch_base_libdir}/modprobe.d"