From patchwork Tue Jun 20 22:19:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 26078 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 6D4E0EB64D7 for ; Tue, 20 Jun 2023 22:22:49 +0000 (UTC) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web10.3216.1687299762979654673 for ; Tue, 20 Jun 2023 15:22:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=cNOUDrsg; spf=pass (domain: gmail.com, ip: 209.85.167.43, mailfrom: quaresma.jose@gmail.com) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-4f8735ac3e3so3721035e87.2 for ; Tue, 20 Jun 2023 15:22:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687299761; x=1689891761; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tT112n1TQ/kg4iecmwwSDhFFp4mfh675fOUpFoZunoo=; b=cNOUDrsgWqG6LNlzSqKLvOAbKdifIGsCbjEQumeoyQmOnMlTqZj8giQqC8YWlf9w3E SbjbYfUhVcWw8+wV8FtO2510Hlq66Ggepk9NEH4wOOTkQrCjEEkxJsYJiOm/4p0yJQLw 8RO50PxzGXnB533M65EVJz8huCIu0iZ+7eCltvqK4d7YsRSLCcLJCxnMFycqB//1QYHN ATf5oZPt9rBvyByflILWh4WbyZEoOr1rNU+ZTY4D2SzJJ0y8L6Z4Zl3FfNMV+rNZIMUF EzooN2CEdVrGgJlovtvE0Bh+Lc05EutpVrLkmM5+z4JUgP5TQYFdLWTb4oczhG9I/VQk iCVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687299761; x=1689891761; 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=tT112n1TQ/kg4iecmwwSDhFFp4mfh675fOUpFoZunoo=; b=LofVYJdxzUSSxEXP7nLdPNRYNDz3MjbmPHtqPLZqydp2C6WLyNv+WytrGp023GZwAh NObGzZP4EKqTo1vyz36IGXICUnqBU8NMfvMaZGfyHNIyXx7Q8IClnb//avsy+XOok7m5 wUEamgEPdUfLqvFMC1FrSvST9l1S073a0mZEldhVdeE6DhHFSbLOrKzo+fNFL3EOCqSm joI/FdnOLwJiJqr0+AYkz8B3BifNX2zLc1TH4WHUkqp6beBXNOO99B+1+28V3plcslfd Kegn6UQLLP8xlRNUr57Us0bke/+OtqQsn3M6ZWWxGj3LthX8DwspDbYlGX1fQeYmW1nV 3IYg== X-Gm-Message-State: AC+VfDwOTY85LvlfswWse0g0eAjRwh02TDt2oJBGHlFI0/3ZuTqptLlr Fjm9bBLZjKEv2X4ecOWEX/F1XNxoBQ2mOKuV X-Google-Smtp-Source: ACHHUZ6HNJRb9H3YSHNPKKOnnFei5YuMRncalU/+bxUA52zLJUaWVprdwuR41b7E3J3vfWtwSzFgkA== X-Received: by 2002:a19:ca04:0:b0:4f8:5960:49a9 with SMTP id a4-20020a19ca04000000b004f8596049a9mr6934427lfg.23.1687299760612; Tue, 20 Jun 2023 15:22:40 -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 l13-20020a1c790d000000b003f7ed463954sm3302928wme.25.2023.06.20.15.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 15:22:40 -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 V3 1/3] kernel-module-split: make autoload and probeconf distribution specific Date: Tue, 20 Jun 2023 22:19:42 +0000 Message-Id: <20230620221942.2801107-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 ; Tue, 20 Jun 2023 22:22:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183158 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 --- 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 | 36 ++++++++++--------- .../distro/include/init-manager-systemd.inc | 4 +++ 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass index 50882c31a7..e7ee6c55be 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,7 +191,7 @@ 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)]: + for dir in ["%s%s" % (dvar, modprobedir), "%s%s" % (dvar, modulesloaddir)]: if 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" From patchwork Tue Jun 20 22:19:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 26079 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 50EDAEB64D7 for ; Tue, 20 Jun 2023 22:23:39 +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.web10.3240.1687299817591901321 for ; Tue, 20 Jun 2023 15:23:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=EQP1/hPz; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3f8f3786f1dso57436185e9.2 for ; Tue, 20 Jun 2023 15:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687299816; x=1689891816; 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=G1JRSoVAvPvRbzYXJnc/vim6qKlp+3HP1acwaNNpTmc=; b=EQP1/hPzr2ubryja8vtAcjAPttlWOakqx1j0oP0+rvLSJDbE4RjFaTSwXJk+dHsRGI oGtzQIdnVreXWL+6ZSGA73nmy1DtoLZrc2e+qj+3Ctl2SMJau/MpdoaH8V7dRixAsAIt P/kJpHcDs8t2PYm6tkzVt06W9yGLG2iNc2FBadUSwO4gW47PPd1Z1Dusvw4QVP0KwzoG TLN6w4Iy+Uexp9uPMoHXArc/d6AGV+g+NiF8fkfwg+4sMDTMLobr/nmXRRUwmDLHqcne dMid4LFRiL8t5LTov0aJqd+KQqRRRISMGZhA6niwLa4NjRSgUDOfVJebUFBPFmexw/il mRmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687299816; x=1689891816; 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=G1JRSoVAvPvRbzYXJnc/vim6qKlp+3HP1acwaNNpTmc=; b=MqO/SGmzLXzm52UtfHAdBn7xakw56wUivp+b9EHKWJwQz4yW12Rn4FZ9A9Yvfd6s6d X4rQxTx+etAEt66ONCOEM+mEy8AT4egQ9yOfesRifH9VTog72x2N1vz8eWiGGRRbZRpB hu+36/Mc3+QM/ji1kTtqtO2AavJguNriZtVWkeU9XBUshmF0vYx+jhDVuB8QsTHMKsoB by9dJrFu1pJ7iCd02TREWQStAnI2rZ/5WpnrXaJ8deB+tld3flwKuojy/gTyKPo8Lc1R p2Zr63GB7/dXFld1cODkF+WQlFJ+3b61C64yPSd/zZhFRISmdQQGIJsy43Q6IuBJzPFG QWZw== X-Gm-Message-State: AC+VfDzCS4+6XcP004WHS2w1fU/2BAxQP3oOwcfEWEIvg8n9JiHHxN0J ayfxUwA0i5jqAchEgS0TMFSM31qSZOOQvg== X-Google-Smtp-Source: ACHHUZ40E7PU1hGBNd9TyoPMwU+WXU9avQ2vNZiXAJjgp3Z/XgqOEIMEpU/N8+Ce5xYU9CtrBb5FDQ== X-Received: by 2002:a7b:cd89:0:b0:3f9:137:af7c with SMTP id y9-20020a7bcd89000000b003f90137af7cmr10630698wmj.10.1687299815621; Tue, 20 Jun 2023 15:23:35 -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 l13-20020a1c790d000000b003f7ed463954sm3302928wme.25.2023.06.20.15.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 15:23:35 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-core@lists.openembedded.org Cc: Jose Quaresma Subject: [PATCH V3 2/3] kernel-module-split: use context manager to open files Date: Tue, 20 Jun 2023 22:19:44 +0000 Message-Id: <20230620221942.2801107-2-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230620221942.2801107-1-jose.quaresma@foundries.io> References: <20230620221942.2801107-1-jose.quaresma@foundries.io> 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 ; Tue, 20 Jun 2023 22:23:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183159 Signed-off-by: Jose Quaresma --- v3: new patch in added tu use context manager to open files .../kernel-module-split.bbclass | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass index e7ee6c55be..a8ed9e3976 100644 --- a/meta/classes-recipe/kernel-module-split.bbclass +++ b/meta/classes-recipe/kernel-module-split.bbclass @@ -76,9 +76,8 @@ python split_kernel_module_packages () { cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile) subprocess.check_call(cmd, shell=True) # errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'รถ') - f = open(tmpfile, errors='replace') - l = f.read().split("\000") - f.close() + with open(tmpfile, errors='replace') as f: + l = f.read().split("\000") os.close(tf[0]) os.unlink(tmpfile) if compressed: @@ -106,13 +105,12 @@ 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: - 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() + with open("%s%s" % (dvar, autoloadpath), 'w') as f: + if autoload: + for m in autoload.split(): + f.write('%s\n' % m) + else: + f.write('%s\n' % basename) autoloadpath2append = ' %s' % autoloadpath d.appendVar('FILES:%s' % pkg, autoloadpath2append) d.appendVar('CONFFILES:%s' % pkg, autoloadpath2append) @@ -127,9 +125,8 @@ python split_kernel_module_packages () { modconflist = (d.getVar("KERNEL_MODULE_PROBECONF") or "").split() modconf = d.getVar('module_conf_%s' % basename) if modconf and basename in modconflist: - f = open("%s%s" % (dvar, modconfpath), 'w') - f.write("%s\n" % modconf) - f.close() + with open("%s%s" % (dvar, modconfpath), 'w') as f: + f.write("%s\n" % modconf) modconfpath2append = ' %s' % modconfpath d.appendVar('FILES:%s' % pkg, modconfpath2append) d.appendVar('CONFFILES:%s' % pkg, modconfpath2append) From patchwork Tue Jun 20 22:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 26080 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 5F046EB64D7 for ; Tue, 20 Jun 2023 22:23:49 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web10.3242.1687299819396592523 for ; Tue, 20 Jun 2023 15:23:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=LfZTTyhE; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3f9002a1a39so36607855e9.2 for ; Tue, 20 Jun 2023 15:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687299817; x=1689891817; 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=pmBUGkO8ropd1SPvStSWTmpMPxlMjQO6DoiDBu6laHI=; b=LfZTTyhEpi0s0hixa/9+s0ra+nK5aA/u/r/OqZUpUkOnlA6cHBmUdapMiCMWh5ch1L f6+uGkrbnR3W8XP4aXQ7g5XCtQwyLozJXCDtudZaCPmHth4Mg8b75L+kDkaaNyEg+VF0 bETzIkljiJk43P2+sXIZ7WoaRm0jmZcvJmbtVY0WbLvK4RhcV+dDpf6iR2bB7bejyml2 ZD6n9va2YyvRrSPD58EGWkj3IrYCGrXAuYNkLDx1nH5y/8dbV0h157YoCVeK/MP7tSRb iAAsr0iDYBAfSyrTu6RWsftm6tLW0FcEPS9/JHcOnXQ2BSCW4rwmzY+vkHJCcFRuRzwm 2zdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687299817; x=1689891817; 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=pmBUGkO8ropd1SPvStSWTmpMPxlMjQO6DoiDBu6laHI=; b=IFXs9VvWL2UxMeHIC9kIMd4NPzJZybKI2pjdld+qcg/PfobdC8rG7kYoXEe3m3xc9z 3Hn1fKxVl3pkQzpbT1X0bVQwRrwyyqkuReKL3JuPmdfwOw9QRhWhaSmByFIgvvyXuxr8 w4ONqUo5bDDegQ+7qOvUanzAi0eglP/tPnE57gnaFTXJvy8yX1xROgScMMX6OSGcaNAH 7+H52PPYP6uCS+DtJ4nadqAgVADj71QYX860JkIkIoWJ/KSowSiU/aXt7vwj8BsZ/m8F P5U1aIhF4ciXCBsXTsZFTxGuApU0NgI/KDpaxsd0lzNtUacnmzh2IjWnj9LZkljtxCAZ CJAQ== X-Gm-Message-State: AC+VfDybm3USQWY9fndfFi9Pwc9TwLhTBRG6BHxuFQV6lTbnPiVEEN4J Ww0KC9/+7u/+iWosD5Pye+393tv5f8BCTw== X-Google-Smtp-Source: ACHHUZ7AJnNmTS6ScwzitZmX1Z+kDOvfRF4lMilRXhuKf1XjllQ8+pJ6WwBrOvYn/9y1V2mxWcKjUQ== X-Received: by 2002:a1c:770a:0:b0:3f9:b972:731b with SMTP id t10-20020a1c770a000000b003f9b972731bmr1672465wmi.11.1687299817520; Tue, 20 Jun 2023 15:23:37 -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 l13-20020a1c790d000000b003f7ed463954sm3302928wme.25.2023.06.20.15.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 15:23:37 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-core@lists.openembedded.org Cc: Jose Quaresma Subject: [PATCH V3 3/3] kernel: autoload and probeconf are handled by kernel-module-split Date: Tue, 20 Jun 2023 22:19:45 +0000 Message-Id: <20230620221942.2801107-3-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230620221942.2801107-1-jose.quaresma@foundries.io> References: <20230620221942.2801107-1-jose.quaresma@foundries.io> 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 ; Tue, 20 Jun 2023 22:23:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183160 Signed-off-by: Jose Quaresma --- meta/classes-recipe/kernel.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 81513173b1..91a33bcbdd 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -463,8 +463,6 @@ kernel_do_install() { install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION} install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION} [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION} - install -d ${D}${sysconfdir}/modules-load.d - install -d ${D}${sysconfdir}/modprobe.d } # Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile