Merge branch 'dunfell' into main

jynik · Feb 27, 2022 · 67f6378 · 67f6378
2 parents f5ac841 + d53eb21
commit 67f6378
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ready-set-yocto.html b/ready-set-yocto.html
@@ -34,7 +34,7 @@ <h1 id="introduction">Introduction</h1>
 <ul>
   <li><a href="https://docs.yoctoproject.org/3.1.14/brief-yoctoprojectqs/brief-yoctoprojectqs.html">Yocto Project Quick Build</a></li>
   <li><a href="https://docs.yoctoproject.org/bitbake/1.46/">Bitbake User Manual</a></li>
-  <li><a href="https://docs.yoctoproject.org/3.1.14/">Yocto Mega-Manual</a></li>
+  <li><a href="https://docs.yoctoproject.org/3.1.14/singleindex.html">Yocto Mega-Manual</a></li>
 </ul>
 
 <h2 id="shameless-plug">Shameless Plug</h2>
@@ -264,7 +264,7 @@ <h2 id="a-quick-aside-regarding-machine">A quick aside regarding MACHINE…</h2>
 <p>If you look at the content in these machine configuration files, you’ll find that
 there’s not a whole lot in there. This is because a majority of the “common stuff”
 is all tucked away in files that are included (<em>think #include in C/C++</em>) via the
-<a href="https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#include-directive"><code>include</code></a> and <a href="https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#require-inclusion"><code>required</code></a> directives.</p>
+<a href="https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#include-directive"><code>include</code></a> and <a href="https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#require-inclusion"><code>require</code></a> directives.</p>
 
 <p>Thus, the machine configuration files only override or expand upon variable definitions as-needed to do things like…</p>
 
@@ -558,7 +558,7 @@ <h2 id="first-a-bit-of-background">First, a bit of background</h2>
 matter of best practice, should be located in the same relative path within the
 layer.</p>
 
-<p>The BusyBox recipe is found in <a href="https://git.yoctoproject.org/poky/tree/meta/recipes-core/busybox/busybox_1.31.1.bb?h=dunfell"><code>poky/meta/recipes-core/busybox/busybox_1.31.01.bb</code></a>. 
+<p>The BusyBox recipe is found in <a href="https://git.yoctoproject.org/poky/tree/meta/recipes-core/busybox/busybox_1.31.1.bb?h=dunfell"><code>poky/meta/recipes-core/busybox/busybox_1.31.1.bb</code></a>. 
 (The exact version string may have change since this tutorial was last updated.)</p>
 
 <p>Note that this bitbake recipe includes the <a href="https://git.yoctoproject.org/poky/tree/meta/recipes-core/busybox/busybox.inc?h=dunfell"><code>busybox.inc</code></a> file (via the <code>require</code> directive),

diff --git a/ready-set-yocto.md b/ready-set-yocto.md
@@ -63,7 +63,7 @@ comparisons of all three projects [here](https://www.yoctoproject.org/learn-item
 
 [Bitbake User Manual]: https://docs.yoctoproject.org/bitbake/1.46/
 
-[Yocto Mega-Manual]: https://docs.yoctoproject.org/3.1.14/
+[Yocto Mega-Manual]: https://docs.yoctoproject.org/3.1.14/singleindex.html
 
 [OpenEmbedded]: https://www.openembedded.org/wiki/Main_Page
 
@@ -266,7 +266,7 @@ operates it in 32-bit mode.
 If you look at the content in these machine configuration files, you'll find that
 there's not a whole lot in there. This is because a majority of the "common stuff"
 is all tucked away in files that are included (*think #include in C/C++*) via the
-[`include`](https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#include-directive) and [`required`](https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#require-inclusion) directives.
+[`include`](https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#include-directive) and [`require`](https://www.yoctoproject.org/docs/3.1/bitbake-user-manual/bitbake-user-manual.html#require-inclusion) directives.
 
 Thus, the machine configuration files only override or expand upon variable definitions as-needed to do things like...
 
@@ -572,7 +572,7 @@ A `.bbappend` file must have the same name as its `.bb` counterpart. As a
 matter of best practice, should be located in the same relative path within the
 layer.
 
-The BusyBox recipe is found in [`poky/meta/recipes-core/busybox/busybox_1.31.01.bb`](https://git.yoctoproject.org/poky/tree/meta/recipes-core/busybox/busybox_1.31.1.bb?h=dunfell). 
+The BusyBox recipe is found in [`poky/meta/recipes-core/busybox/busybox_1.31.1.bb`](https://git.yoctoproject.org/poky/tree/meta/recipes-core/busybox/busybox_1.31.1.bb?h=dunfell). 
 (The exact version string may have change since this tutorial was last updated.)
 
 Note that this bitbake recipe includes the [`busybox.inc`](https://git.yoctoproject.org/poky/tree/meta/recipes-core/busybox/busybox.inc?h=dunfell) file (via the `require` directive),
@@ -608,7 +608,7 @@ Busybox binary we've already built.
 
 To do this, we can do a few things, including:
 
-1. Inspect the [`poky/meta/recipes-core/busybox/busybox/defconfig`](https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-core/busybox/busybox/defconfig?h=dunfell)file, which gets combined with configuration fragments at build time.
+1. Inspect the [`poky/meta/recipes-core/busybox/busybox/defconfig`](https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-core/busybox/busybox/defconfig?h=dunfell) file, which gets combined with configuration fragments at build time.
 
 2. Look at the actual `.config` file that was used to configure the build that has already happened.