summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2014-10-13 10:12:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-18 16:15:26 +0200
commit55169b9141eae5bf5a9a9d81923779e036d312b2 (patch)
treec44c293862cfcb5eb302abb73fd4f07364169b82 /documentation
parent75fda358c338c6459d953b9f1d4de8f49333a016 (diff)
downloadpoky-55169b9141eae5bf5a9a9d81923779e036d312b2.tar.gz
ref-manual: Updated module_conf variable
This description was a bit confusing with the way the general syntax was described so I re-wrote it a bit. Also, added the requirement that if you use module_conf for a given <modname>, then you must also include the <modname> as part of the new KERNEL_MODULE_PROBECONF variable. (From yocto-docs rev: 15b7819a0d9946ad6565576a6f28897e2dd724f9) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/ref-manual/ref-variables.xml19
1 files changed, 13 insertions, 6 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 22b8f2e03e..b869bc91a1 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -5344,8 +5344,9 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5344 <glossentry id='var-module_conf'><glossterm>module_conf</glossterm> 5344 <glossentry id='var-module_conf'><glossterm>module_conf</glossterm>
5345 <glossdef> 5345 <glossdef>
5346 <para> 5346 <para>
5347 Specifies <filename>modprobe.d</filename> syntax lines 5347 Specifies
5348 for inclusion in the 5348 <ulink url='http://linux.die.net/man/5/modprobe.d'><filename>modprobe.d</filename></ulink>
5349 syntax lines for inclusion in the
5349 <filename>/etc/modprobe.d/modname.conf</filename> file. 5350 <filename>/etc/modprobe.d/modname.conf</filename> file.
5350 </para> 5351 </para>
5351 5352
@@ -5355,19 +5356,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5355 module recipe (e.g. a machine configuration file, a 5356 module recipe (e.g. a machine configuration file, a
5356 distribution configuration file, an append file for the 5357 distribution configuration file, an append file for the
5357 recipe, or the recipe itself). 5358 recipe, or the recipe itself).
5359 If you use this variable, you must also be sure to list
5360 the module name in the
5361 <filename>KERNEL_MODULE_PROBECONF</filename>
5362 variable.
5358 </para> 5363 </para>
5359 5364
5360 <para> 5365 <para>
5361 Here is the general syntax: 5366 Here is the general syntax:
5362 <literallayout class='monospaced'> 5367 <literallayout class='monospaced'>
5363 module_conf_&lt;modname&gt; = "modprobe.d-syntax" 5368 module_conf_&lt;modname&gt; = "&lt;modprobe.d syntax&gt;"
5364 </literallayout> 5369 </literallayout>
5365 You must use the kernel module name override. 5370 You must use the kernel module name override.
5366 </para> 5371 </para>
5367 5372
5368 <para> 5373 <para>
5369 Run <filename>man modprobe.d</filename> in the shell to 5374 Run <filename>man modprobe.d</filename> in the shell to
5370 find out more information on the exact syntax for lines 5375 find out more information on the exact syntax
5371 you want to provide with <filename>module_conf</filename>. 5376 you want to provide with <filename>module_conf</filename>.
5372 </para> 5377 </para>
5373 5378
@@ -5376,9 +5381,11 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
5376 OpenEmbedded build system to populate the 5381 OpenEmbedded build system to populate the
5377 <filename>/etc/modprobe.d/modname.conf</filename> 5382 <filename>/etc/modprobe.d/modname.conf</filename>
5378 file with <filename>modprobe.d</filename> syntax lines. 5383 file with <filename>modprobe.d</filename> syntax lines.
5379 Here is an example: 5384 Here is an example that adds the options
5385 <filename>arg1</filename> and <filename>arg2</filename>
5386 to a module named <filename>mymodule</filename>:
5380 <literallayout class='monospaced'> 5387 <literallayout class='monospaced'>
5381 module_conf_&lt;modname&gt; = "options modname arg1=val1 arg2=val2" 5388 module_conf_mymodule = "options mymodule arg1=val1 arg2=val2"
5382 </literallayout> 5389 </literallayout>
5383 </para> 5390 </para>
5384 5391