[FE training-materials-updates] android: compilation: Create a branch for the ccache bump commit

Maxime Ripard maxime.ripard at free-electrons.com
Fri Feb 13 14:49:35 CET 2015


Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=8f89e792ebb605fa2a8e1cd29ff1851cc9a7210e

>---------------------------------------------------------------

commit 8f89e792ebb605fa2a8e1cd29ff1851cc9a7210e
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Fri Feb 13 14:47:08 2015 +0100

    android: compilation: Create a branch for the ccache bump commit
    
    Otherwise, any subsequent repo sync will discard this commit, and even if it's
    mentionned in the repo sync output, chances are high that it will be
    overlooked.
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>


>---------------------------------------------------------------

8f89e792ebb605fa2a8e1cd29ff1851cc9a7210e
 .../android-first-compilation/android-first-compilation.tex | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/labs/android-first-compilation/android-first-compilation.tex b/labs/android-first-compilation/android-first-compilation.tex
index 2315c83..84ba13f 100644
--- a/labs/android-first-compilation/android-first-compilation.tex
+++ b/labs/android-first-compilation/android-first-compilation.tex
@@ -16,9 +16,16 @@ To be able to use \code{ccache} properly, we need to apply a commit
 present in the AOSP master that will bump the version of ccache to a
 more recent and much more adapted version of \code{ccache}.
 
-To do so, go in the \code{prebuilts/misc} directory, and use the
-command \code{git cherry-pick 81012983}. This will apply the given
-commit in our current branch.
+We will first need to create a new branch where we will store the
+commit doing such a change. To do that, we will obviously use
+\code{repo}, and especially the \code{start} sub-command, on the
+\code{prebuilts/misc} repository. We can call that branch
+\code{ccache} for example.
+
+Now, go in the \code{prebuilts/misc} directory, and use the command
+\code{git cherry-pick 81012983}. This will apply the given commit in
+our current branch, and since we have created a new branch,
+\code{repo} will carry our commits, even if we do \code{repo sync}.
 
 \section{Build environment}
 



More information about the training-materials-updates mailing list