From d6e89e7122c7d588cf3a505d4eb5f67fdb520a9d Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Thu, 16 Oct 2014 17:18:18 -0700 Subject: kernel-dev: Scrubbed and fixed all user-supplied input formatting. In the manual I was using angled brackets to denote user-supplied input values. This was confusing so I changed to using the tag pair. (From yocto-docs rev: dc73a78f11038a1ff04b16867e7513f31f02374b) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/kernel-dev/kernel-dev-advanced.xml | 35 ++++++++++++------------ 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'documentation/kernel-dev/kernel-dev-advanced.xml') diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml index 4a6aeb7391..283f483112 100644 --- a/documentation/kernel-dev/kernel-dev-advanced.xml +++ b/documentation/kernel-dev/kernel-dev-advanced.xml @@ -214,7 +214,7 @@ Here is an example that shows a trivial tree of kernel Metadata stored in recipe-space within a BSP layer: - meta-my_bsp_layer/ + meta-my_bsp_layer/ `-- recipes-kernel `-- linux `-- linux-yocto @@ -370,7 +370,7 @@ of Metadata. The following Metadata file hierarchy is recommended: - <base>/ + base/ bsp/ cfg/ features/ @@ -513,7 +513,7 @@ patch mypatch.patch patches/mypatch.patch: - <typical-patch> + typical-patch You can create the typical .patch file using diff -Nurp or @@ -968,37 +968,38 @@ hierarchical branching system similar to what the linux-yocto Linux kernel repositories use: - <common>/<kernel_type>/<machine> + common/kernel_type/machine If you had two kernel types, "standard" and "small" for - instance, and three machines, the branches in your + instance, three machines, and common + as mydir, the branches in your Git repository might look like this: - common/base - common/standard/base - common/standard/machine_a - common/standard/machine_b - common/standard/machine_c - common/small/base - common/small/machine_a + mydir/base + mydir/standard/base + mydir/standard/machine_a + mydir/standard/machine_b + mydir/standard/machine_c + mydir/small/base + mydir/small/machine_a This organization can help clarify the branch relationships. - In this case, common/standard/machine_a - includes everything in common/base and - common/standard/base. + In this case, mydir/standard/machine_a + includes everything in mydir/base and + mydir/standard/base. The "standard" and "small" branches add sources specific to those kernel types that for whatever reason are not appropriate for the other branches. The "base" branches are an artifact of the way Git manages its data internally on the filesystem: Git will not allow you - to use common/standard and - common/standard/machine_a because it + to use mydir/standard and + mydir/standard/machine_a because it would have to create a file and a directory named "standard". -- cgit v1.2.3-54-g00ecf