kernel.bbclass, module.bbclass: Make update-modules optional
The update-modules mechanism is something of a historical relic and it isn't entirely clear that it has a great deal of value nowadays. Also, it causes a problem when building a read-only rootfs since update-modules itself refuses to configure offline. Allow DISTROs to circumvent this whole thing by declaring (via DISTRO_FEATURES) that they don't wish to use update-modules. This is backfilled for existing distributions and will have to be marked as CONSIDERED by those who actually don't want it. (From OE-Core rev: 14bf8ed115453077b4d4042b4b70ed6b3bca2a9f) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
895994afd8
commit
8f85691860
|
@ -398,10 +398,12 @@ python populate_packages_prepend () {
|
||||||
|
|
||||||
dvar = d.getVar('PKGD', True)
|
dvar = d.getVar('PKGD', True)
|
||||||
|
|
||||||
|
use_update_modules = oe.utils.contains('DISTRO_FEATURES', 'update-modules', True, False, d)
|
||||||
|
|
||||||
# If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
|
# If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
|
||||||
# appropriate modprobe commands to the postinst
|
# appropriate modprobe commands to the postinst
|
||||||
autoload = d.getVar('module_autoload_%s' % basename, True)
|
autoload = d.getVar('module_autoload_%s' % basename, True)
|
||||||
if autoload:
|
if autoload and use_update_modules:
|
||||||
name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
|
name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
|
||||||
f = open(name, 'w')
|
f = open(name, 'w')
|
||||||
for m in autoload.split():
|
for m in autoload.split():
|
||||||
|
@ -415,15 +417,16 @@ python populate_packages_prepend () {
|
||||||
|
|
||||||
# Write out any modconf fragment
|
# Write out any modconf fragment
|
||||||
modconf = d.getVar('module_conf_%s' % basename, True)
|
modconf = d.getVar('module_conf_%s' % basename, True)
|
||||||
if modconf:
|
if modconf and use_update_modules:
|
||||||
name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
|
name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
|
||||||
f = open(name, 'w')
|
f = open(name, 'w')
|
||||||
f.write("%s\n" % modconf)
|
f.write("%s\n" % modconf)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
files = d.getVar('FILES_%s' % pkg, True)
|
if use_update_modules:
|
||||||
files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
|
files = d.getVar('FILES_%s' % pkg, True)
|
||||||
d.setVar('FILES_%s' % pkg, files)
|
files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
|
||||||
|
d.setVar('FILES_%s' % pkg, files)
|
||||||
|
|
||||||
if vals.has_key("description"):
|
if vals.has_key("description"):
|
||||||
old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
|
old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
|
||||||
|
@ -439,12 +442,17 @@ python populate_packages_prepend () {
|
||||||
module_regex = '^(.*)\.k?o$'
|
module_regex = '^(.*)\.k?o$'
|
||||||
module_pattern = 'kernel-module-%s'
|
module_pattern = 'kernel-module-%s'
|
||||||
|
|
||||||
postinst = d.getVar('pkg_postinst_modules', True)
|
use_update_modules = oe.utils.contains('DISTRO_FEATURES', 'update-modules', True, False, d)
|
||||||
postrm = d.getVar('pkg_postrm_modules', True)
|
if use_update_modules:
|
||||||
|
postinst = d.getVar('pkg_postinst_modules', True)
|
||||||
|
postrm = d.getVar('pkg_postrm_modules', True)
|
||||||
|
else:
|
||||||
|
postinst = None
|
||||||
|
postrm = None
|
||||||
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||||
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||||
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||||
do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
|
do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='%skernel-%s' % (['', 'update-modules '][use_update_modules], d.getVar("KERNEL_VERSION", True)))
|
||||||
|
|
||||||
# If modules-load.d and modprobe.d are empty at this point, remove them to
|
# If modules-load.d and modprobe.d are empty at this point, remove them to
|
||||||
# avoid warnings. removedirs only raises an OSError if an empty
|
# avoid warnings. removedirs only raises an OSError if an empty
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
RDEPENDS += "kernel-image update-modules"
|
RDEPENDS_${PN} += "kernel-image ${@oe.utils.contains('DISTRO_FEATURES', 'update-modules', 'update-modules', '', d)}"
|
||||||
DEPENDS += "virtual/kernel"
|
DEPENDS += "virtual/kernel"
|
||||||
|
|
||||||
inherit module-base
|
inherit module-base
|
||||||
|
|
|
@ -727,7 +727,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
|
||||||
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
|
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
|
||||||
IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
|
IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
|
||||||
|
|
||||||
DISTRO_FEATURES_BACKFILL = "pulseaudio"
|
DISTRO_FEATURES_BACKFILL = "pulseaudio update-modules"
|
||||||
DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
|
DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
|
||||||
|
|
||||||
MACHINE_FEATURES_BACKFILL = "rtc"
|
MACHINE_FEATURES_BACKFILL = "rtc"
|
||||||
|
|
Loading…
Reference in New Issue