* [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual
@ 2011-02-14 23:16 scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 1/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc scott.m.rifenbark
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
[BUGID# 631] - I added a tip in the section where we show a sample build.
The tip says that you can add 'INHERIT += "rm_work"' to the local.conf file
to help conserve disk space during a build.
Typo fixed in kernel manual. Also, the example used to show how to condense
and merge two BSPs into a second
SCM used a non-existant machine (cav_ebt5800-standard). I replaced this
machine with 'common_pc_64-standard, which is a real machine.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: srifenbark/docs
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=srifenbark/docs
Thanks,
<scott.m.rifenbark@intel.com>
---
Scott Rifenbark (6):
documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed
common_pc
documentation/yocto-project-qs/yocto-project-qs.xml: [BUGID# 631] -
Added tip for saving disk space during a build.
documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing
common-pc-standard
documentation/kernel-manual/kernel-how-to.xml: - Condense and merge
example changed.
documentation/kernel-manual/kernel-how-to.xml: Fixed type
documentation/kernel-manual/kernel-how-to.xml: More changes to the
creating BSP section.
documentation/kernel-manual/kernel-how-to.xml | 33 +++++++++++--------
.../yocto-project-qs/yocto-project-qs.xml | 11 ++++++
2 files changed, 30 insertions(+), 14 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
@ 2011-02-14 23:16 ` scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 2/6] documentation/yocto-project-qs/yocto-project-qs.xml: [BUGID# 631] - Added tip for saving disk space during a build scott.m.rifenbark
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
[BUGID# 597] - Changed the string "common_pc" to "common-pc".
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/kernel-manual/kernel-how-to.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 6b326b5..6b70e5c 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -426,7 +426,7 @@ repository.
<literallayout class='monospaced'>
# full description of the changes
> git whatchanged <kernel type>..<bsp>-<kernel type>
- > eg: git whatchanged standard..common_pc-standard
+ > eg: git whatchanged standard..common-pc-standard
# summary of the changes
> git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type>
@@ -733,10 +733,10 @@ repository.
<para>
For example, the following command pushes the changes from your local branch
- <filename>common_pc-standard</filename> to the remote branch with the same name
+ <filename>common-pc-standard</filename> to the remote branch with the same name
in the master repository <filename>//git.mycompany.com/pub/git/kernel-2.6.27</filename>.
<literallayout class='monospaced'>
- > push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common_pc-standard:common_pc-standard
+ > push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common-pc-standard:common-pc-standard
</literallayout>
</para>
@@ -866,9 +866,9 @@ repository.
<para>
The following commands illustrate some of the steps you could use to
- import the common_pc-standard kernel into a secondary SCM:
+ import the common-pc-standard kernel into a secondary SCM:
<literallayout class='monospaced'>
- > git checkout common_pc-standard
+ > git checkout common-pc-standard
> cd .. ; echo linux/.git > .cvsignore
> cvs import -m "initial import" linux MY_COMPANY start
</literallayout>
@@ -881,7 +881,7 @@ repository.
<para>
The following commands illustrate how you can condense and merge two BSPs into a second SCM:
<literallayout class='monospaced'>
- > git checkout common_pc-standard
+ > git checkout common-pc-standard
> git merge cav_ebt5800-standard
# resolve any conflicts and commit them
> cd .. ; echo linux/.git > .cvsignore
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] documentation/yocto-project-qs/yocto-project-qs.xml: [BUGID# 631] - Added tip for saving disk space during a build.
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 1/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc scott.m.rifenbark
@ 2011-02-14 23:16 ` scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 3/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing common-pc-standard scott.m.rifenbark
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
[BUGID# 631] - I added a tip in the section where we show a sample build.
The tip says that you can add 'INHERIT += "rm_work"' to the local.conf file
to help conserve disk space during a build.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
.../yocto-project-qs/yocto-project-qs.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 24480bc..56dafe5 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -234,6 +234,17 @@
$ source poky-laverne-4.0/poky-init-build-env poky-4.0-build
</literallayout>
</para>
+
+ <tip><para>
+ To help conserve disk space during builds you can add the following statement
+ to your <filename>local.conf</filename> file.
+ Adding this statement deletes the work directory used for building a package
+ once the package is built.
+ <literallayout class='monospaced'>
+ INHERIT += "rm_work"
+ </literallayout>
+ </para></tip>
+
<itemizedlist>
<listitem><para>The first two commands extract the Yocto Project files from the
release tarball and place them into a subdirectory of your current directory.</para></listitem>
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing common-pc-standard
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 1/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 2/6] documentation/yocto-project-qs/yocto-project-qs.xml: [BUGID# 631] - Added tip for saving disk space during a build scott.m.rifenbark
@ 2011-02-14 23:16 ` scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 4/6] documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed scott.m.rifenbark
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
[BUGID# 597] - After talking with Bruce Ashfield the kernel documentation
needs to support the 2.6.34 disribution. So, the 'common-pc-standard'
strings need to be changed back to 'common_pc-standard'. This fix restores
them.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/kernel-manual/kernel-how-to.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 6b70e5c..6b326b5 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -426,7 +426,7 @@ repository.
<literallayout class='monospaced'>
# full description of the changes
> git whatchanged <kernel type>..<bsp>-<kernel type>
- > eg: git whatchanged standard..common-pc-standard
+ > eg: git whatchanged standard..common_pc-standard
# summary of the changes
> git log --pretty=oneline --abbrev-commit <kernel type>..<bsp>-<kernel type>
@@ -733,10 +733,10 @@ repository.
<para>
For example, the following command pushes the changes from your local branch
- <filename>common-pc-standard</filename> to the remote branch with the same name
+ <filename>common_pc-standard</filename> to the remote branch with the same name
in the master repository <filename>//git.mycompany.com/pub/git/kernel-2.6.27</filename>.
<literallayout class='monospaced'>
- > push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common-pc-standard:common-pc-standard
+ > push ssh://git.mycompany.com/pub/git/kernel-2.6.27 common_pc-standard:common_pc-standard
</literallayout>
</para>
@@ -866,9 +866,9 @@ repository.
<para>
The following commands illustrate some of the steps you could use to
- import the common-pc-standard kernel into a secondary SCM:
+ import the common_pc-standard kernel into a secondary SCM:
<literallayout class='monospaced'>
- > git checkout common-pc-standard
+ > git checkout common_pc-standard
> cd .. ; echo linux/.git > .cvsignore
> cvs import -m "initial import" linux MY_COMPANY start
</literallayout>
@@ -881,7 +881,7 @@ repository.
<para>
The following commands illustrate how you can condense and merge two BSPs into a second SCM:
<literallayout class='monospaced'>
- > git checkout common-pc-standard
+ > git checkout common_pc-standard
> git merge cav_ebt5800-standard
# resolve any conflicts and commit them
> cd .. ; echo linux/.git > .cvsignore
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed.
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
` (2 preceding siblings ...)
2011-02-14 23:16 ` [PATCH 3/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing common-pc-standard scott.m.rifenbark
@ 2011-02-14 23:16 ` scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 5/6] documentation/kernel-manual/kernel-how-to.xml: Fixed type scott.m.rifenbark
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
The example used to show how to condense and merge two BSPs into a second
SCM used a non-existant machine (cav_ebt5800-standard). I replaced this
machine with 'common_pc_64-standard, which is a real machine.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/kernel-manual/kernel-how-to.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 6b326b5..01a78e6 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -882,7 +882,7 @@ repository.
The following commands illustrate how you can condense and merge two BSPs into a second SCM:
<literallayout class='monospaced'>
> git checkout common_pc-standard
- > git merge cav_ebt5800-standard
+ > git merge common_pc_64-standard
# resolve any conflicts and commit them
> cd .. ; echo linux/.git > .cvsignore
> cvs import -m "initial import" linux MY_COMPANY start
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] documentation/kernel-manual/kernel-how-to.xml: Fixed type
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
` (3 preceding siblings ...)
2011-02-14 23:16 ` [PATCH 4/6] documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed scott.m.rifenbark
@ 2011-02-14 23:16 ` scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 6/6] documentation/kernel-manual/kernel-how-to.xml: More changes to the creating BSP section scott.m.rifenbark
2011-02-15 10:02 ` [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
In section 4.3.3 step 2 there was a directory 'build/donf/bblayers.conf'.
I fixed the typo to 'build/conf/bblayers.conf'.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/kernel-manual/kernel-how-to.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 01a78e6..07e4d78 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -1054,7 +1054,7 @@ That's it. Configure and build.
For this example the only thing left was the kernel directory with a
<filename>linux-yocto_git.bbappend</filename> file (linux-yocto is the kernel listed in
<filename>meta-crownbay/conf/machine/crownbay.conf</filename></para></listitem>.
- <listitem><para>Add a new entry in the <filename>build/donf/bblayers.conf</filename>
+ <listitem><para>Add a new entry in the <filename>build/conf/bblayers.conf</filename>
so the new layer can be found by Bitbake.</para></listitem>
</itemizedlist>
</para></listitem>
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] documentation/kernel-manual/kernel-how-to.xml: More changes to the creating BSP section.
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
` (4 preceding siblings ...)
2011-02-14 23:16 ` [PATCH 5/6] documentation/kernel-manual/kernel-how-to.xml: Fixed type scott.m.rifenbark
@ 2011-02-14 23:16 ` scott.m.rifenbark
2011-02-15 10:02 ` [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: scott.m.rifenbark @ 2011-02-14 23:16 UTC (permalink / raw)
To: poky
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
These changes implemented Bruce Ashfield's next round of changes to the
section 4.3.3 example.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
documentation/kernel-manual/kernel-how-to.xml | 29 ++++++++++++++----------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 07e4d78..c3c9569 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -1088,21 +1088,26 @@ That's it. Configure and build.
</para></listitem>
<listitem><para>
- Point the build at the new kernel git tree.
- </para>
+ In a layer, create a <filename>linux-yocto_git.bbappend</filename>
+ file with the following:
+ </para>
<para>
- You can do this by commenting out the SRC_URI variable in
- <filename>meta/recipes-kernel/linux/linux-yocto_git.bb</filename> and using a SRC_URI
- that points to your new bare git tree.
- You should also be able to do this in <filename>linux-yocto_git.bbappend</filename> in the layer:
<literallayout class='monospaced'>
- # To use a staged, on-disk bare clone of a Wind River Kernel, use a variant of the
- # below SRC_URI = "git://///path/to/kernel/default_kernel.git;fullclone=1"
- #
- SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine
-\
- git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
+ COMPATIBLE_MACHINE = ${MACHINE}
+
+ # It is often nice to have a local clone of the kernel repository, to
+ # allow patches to be staged, branches created, and so forth. Modify
+ # KSRC to point to your local clone as appropriate.
+
+ # KSRC ?= /path/to/your/bare/clone/yocto-kernel
+
+ # KMACHINE is the branch to be built, or alternateively
+ # KBRANCH can be directly set.
+
+ # KBRANCH ?= "${KMACHINE}-${LINUX_KERNEL_TYPE}"
+
+ # SRC_URI = "git://${KSRC};nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
</literallayout>
</para>
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
` (5 preceding siblings ...)
2011-02-14 23:16 ` [PATCH 6/6] documentation/kernel-manual/kernel-how-to.xml: More changes to the creating BSP section scott.m.rifenbark
@ 2011-02-15 10:02 ` Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2011-02-15 10:02 UTC (permalink / raw)
To: scott.m.rifenbark; +Cc: poky
On Mon, 2011-02-14 at 17:16 -0600, scott.m.rifenbark@intel.com wrote:
> From: Scott Rifenbark <scott.m.rifenbark@intel.com>
>
> [BUGID# 631] - I added a tip in the section where we show a sample build.
> The tip says that you can add 'INHERIT += "rm_work"' to the local.conf file
> to help conserve disk space during a build.
>
> Typo fixed in kernel manual. Also, the example used to show how to condense
> and merge two BSPs into a second
> SCM used a non-existant machine (cav_ebt5800-standard). I replaced this
> machine with 'common_pc_64-standard, which is a real machine.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: srifenbark/docs
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=srifenbark/docs
>
> Thanks,
> <scott.m.rifenbark@intel.com>
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-02-15 10:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-14 23:16 [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 1/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 2/6] documentation/yocto-project-qs/yocto-project-qs.xml: [BUGID# 631] - Added tip for saving disk space during a build scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 3/6] documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing common-pc-standard scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 4/6] documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 5/6] documentation/kernel-manual/kernel-how-to.xml: Fixed type scott.m.rifenbark
2011-02-14 23:16 ` [PATCH 6/6] documentation/kernel-manual/kernel-how-to.xml: More changes to the creating BSP section scott.m.rifenbark
2011-02-15 10:02 ` [PATCH 0/6] [Docs] - Fix to Yocto Project QS [BUGID# 631] and the kernel manual Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox