From 721a9340d63245199dc80f4e798f13d3b1fe8d74 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 8 Feb 2011 11:24:00 -0600 Subject: documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Fixed common_pc [BUGID# 597] - Changed the string "common_pc" to "common-pc". Signed-off-by: Scott Rifenbark --- documentation/kernel-manual/kernel-how-to.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'documentation/kernel-manual') diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 6b326b556..6b70e5c4b 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml @@ -426,7 +426,7 @@ repository. # 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. For example, the following command pushes the changes from your local branch - common_pc-standard to the remote branch with the same name + common-pc-standard to the remote branch with the same name in the master repository //git.mycompany.com/pub/git/kernel-2.6.27. - > 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 @@ -866,9 +866,9 @@ repository. 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: - > git checkout common_pc-standard + > git checkout common-pc-standard > cd .. ; echo linux/.git > .cvsignore > cvs import -m "initial import" linux MY_COMPANY start @@ -881,7 +881,7 @@ repository. The following commands illustrate how you can condense and merge two BSPs into a second SCM: - > 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 -- cgit v1.2.3 From 2a8c4a32be789e4101b24b0d9ea6d8116968fc72 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 8 Feb 2011 13:35:45 -0600 Subject: documentation/kernel-manual/kernel-how-to.xml: [BUGID# 597] Reversing common-pc-standard [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 --- documentation/kernel-manual/kernel-how-to.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'documentation/kernel-manual') diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 6b70e5c4b..6b326b556 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml @@ -426,7 +426,7 @@ repository. # 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. For example, the following command pushes the changes from your local branch - common-pc-standard to the remote branch with the same name + common_pc-standard to the remote branch with the same name in the master repository //git.mycompany.com/pub/git/kernel-2.6.27. - > 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 @@ -866,9 +866,9 @@ repository. 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: - > git checkout common-pc-standard + > git checkout common_pc-standard > cd .. ; echo linux/.git > .cvsignore > cvs import -m "initial import" linux MY_COMPANY start @@ -881,7 +881,7 @@ repository. The following commands illustrate how you can condense and merge two BSPs into a second SCM: - > 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 -- cgit v1.2.3 From 09e2aac993621fb1eaca8d1f7d150139472f7dae Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 8 Feb 2011 13:48:13 -0600 Subject: documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed. 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 --- documentation/kernel-manual/kernel-how-to.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'documentation/kernel-manual') diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 6b326b556..01a78e685 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: > 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 -- cgit v1.2.3 From 05ac368888879255a30bec604d92cddef1b589af Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 9 Feb 2011 12:32:15 -0600 Subject: documentation/kernel-manual/kernel-how-to.xml: Fixed type 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 --- documentation/kernel-manual/kernel-how-to.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'documentation/kernel-manual') diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 01a78e685..07e4d7828 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 linux-yocto_git.bbappend file (linux-yocto is the kernel listed in meta-crownbay/conf/machine/crownbay.conf. - Add a new entry in the build/donf/bblayers.conf + Add a new entry in the build/conf/bblayers.conf so the new layer can be found by Bitbake. -- cgit v1.2.3 From 647aaad6fb8b9c22c5287d387cb1fb691a7bd5ee Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Mon, 14 Feb 2011 17:04:23 -0600 Subject: documentation/kernel-manual/kernel-how-to.xml: More changes to the creating BSP section. These changes implemented Bruce Ashfield's next round of changes to the section 4.3.3 example. Signed-off-by: Scott Rifenbark --- documentation/kernel-manual/kernel-how-to.xml | 29 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'documentation/kernel-manual') diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 07e4d7828..c3c9569ad 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. - Point the build at the new kernel git tree. - + In a layer, create a linux-yocto_git.bbappend + file with the following: + - You can do this by commenting out the SRC_URI variable in - meta/recipes-kernel/linux/linux-yocto_git.bb and using a SRC_URI - that points to your new bare git tree. - You should also be able to do this in linux-yocto_git.bbappend in the layer: - # 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" -- cgit v1.2.3