summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2017-10-02 13:11:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-06 12:06:33 +0100
commitdc2f2ae714dd380c353d74b0cccdd2bca897d073 (patch)
tree48f708674e6fd7dcfdd4338a45077f54849c4eda
parent99151aef7765d8d33d0746fbea131ad2ca1387ec (diff)
downloadpoky-dc2f2ae714dd380c353d74b0cccdd2bca897d073.tar.gz
kernel-dev: Updated example in metadata outside recipe-space
Went from 4.4 kernel to 4.12. (From yocto-docs rev: 4cf2710a381925b8bf13536c1f8da3d12938fffe) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/kernel-dev/kernel-dev-advanced.xml46
1 files changed, 3 insertions, 43 deletions
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml
index 29052de9c1..3d19ed2cf2 100644
--- a/documentation/kernel-dev/kernel-dev-advanced.xml
+++ b/documentation/kernel-dev/kernel-dev-advanced.xml
@@ -987,11 +987,11 @@
987 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRC_URI'><filename>SRC_URI</filename></ulink> 987 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRC_URI'><filename>SRC_URI</filename></ulink>
988 variable. 988 variable.
989 As an example, consider the following <filename>SRC_URI</filename> 989 As an example, consider the following <filename>SRC_URI</filename>
990 statement from the <filename>linux-yocto_4.4.bb</filename> 990 statement from the <filename>linux-yocto_4.12.bb</filename>
991 kernel recipe: 991 kernel recipe:
992 <literallayout class='monospaced'> 992 <literallayout class='monospaced'>
993 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 993 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \
994 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 994 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
995 </literallayout> 995 </literallayout>
996 <filename>${KMETA}</filename>, in this context, is simply used to 996 <filename>${KMETA}</filename>, in this context, is simply used to
997 name the directory into which the Git fetcher places the Metadata. 997 name the directory into which the Git fetcher places the Metadata.
@@ -1010,46 +1010,6 @@
1010 configuration phase. 1010 configuration phase.
1011 </para> 1011 </para>
1012 1012
1013<!--
1014
1015
1016 <para>
1017 Following is an example that shows how a trivial tree of Metadata
1018 is stored in a custom Linux kernel Git repository:
1019 <literallayout class='monospaced'>
1020 meta/
1021 `&dash;&dash; cfg
1022 `&dash;&dash; kernel-cache
1023 |&dash;&dash; bsp-standard.scc
1024 |&dash;&dash; bsp.cfg
1025 `&dash;&dash; standard.cfg
1026 </literallayout>
1027 </para>
1028
1029 <para>
1030 To use a branch different from where the sources reside,
1031 specify the branch in the <filename>KMETA</filename> variable
1032 in your Linux kernel recipe.
1033 Here is an example:
1034 <literallayout class='monospaced'>
1035 KMETA = "meta"
1036 </literallayout>
1037 To use the same branch as the sources, set
1038 <filename>KMETA</filename> to an empty string:
1039 <literallayout class='monospaced'>
1040 KMETA = ""
1041 </literallayout>
1042 If you are working with your own sources and want to create an
1043 orphan <filename>meta</filename> branch, use these commands
1044 from within your Linux kernel Git repository:
1045 <literallayout class='monospaced'>
1046 $ git checkout &dash;&dash;orphan meta
1047 $ git rm -rf .
1048 $ git commit &dash;&dash;allow-empty -m "Create orphan meta branch"
1049 </literallayout>
1050 </para>
1051-->
1052
1053 <para> 1013 <para>
1054 If you modify the Metadata, you must not forget to update the 1014 If you modify the Metadata, you must not forget to update the
1055 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRCREV'><filename>SRCREV</filename></ulink> 1015 <ulink url='&YOCTO_DOCS_REF_URL;#var-SRCREV'><filename>SRCREV</filename></ulink>