[FE training-materials-updates] kernel labs: fix git lab - Ready to be used

Michael Opdenacker michael.opdenacker at free-electrons.com
Fri Oct 4 14:28:44 CEST 2013


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

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

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

commit ae44e61cbf8b2c5d9da84118e5ed3cbe447bfa9e
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Fri Oct 4 14:27:33 2013 +0200

    kernel labs: fix git lab - Ready to be used
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


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

ae44e61cbf8b2c5d9da84118e5ed3cbe447bfa9e
 Makefile                                 |    7 ++++---
 labs/kernel-git/kernel-git.tex           |   28 ++++------------------------
 slides/kernel-git-lab/kernel-git-lab.tex |    2 +-
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index 886c73b..948a5de 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,8 @@ KERNEL_SLIDES = \
 		kernel-driver-development-dma \
 		kernel-driver-development-mmap \
 		kernel-git-title \
-		kernel-git-content
+		kernel-git-content \
+		kernel-git-lab 
 
 SYSDEV_SLIDES = \
 		licensing \
@@ -233,10 +234,10 @@ KERNEL_LABS   = setup \
 		kernel-serial-iomem \
 		kernel-serial-output \
 		kernel-debugging \
-		backup
+		kernel-git \
 #		kernel-serial-interrupt \
 #		kernel-locking \
-#		kernel-git \
+#		backup # Currently broken for kernel course
 
 ANDROID_LABS  = setup \
 		android-source-code \
diff --git a/labs/kernel-git/kernel-git.tex b/labs/kernel-git/kernel-git.tex
index af37d19..735fd75 100644
--- a/labs/kernel-git/kernel-git.tex
+++ b/labs/kernel-git/kernel-git.tex
@@ -1,9 +1,8 @@
-\subchapter{Git}{Objective: Get familiar with git by contributing to the Linux kernel}
+\subchapter{Going further: Git}{Objective: Get familiar with git by contributing to the Linux kernel}
 
 After this lab, you will be able to:
 
 \begin{itemize}
-\item Clone a Git repository
 \item Explore the history of a Git repository
 \item Create a branch and use it to make improvements to the Linux kernel sources
 \item Make your first contribution to the official Linux kernel sources
@@ -13,26 +12,7 @@ After this lab, you will be able to:
 
 \section{Setup}
 
-Go to \code{$USER/felabs/linux/git/}
-
-This lab assumes that you already installed git software and cloned
-the Linus Torvalds' git tree. See our {\em Kernel source code} lab for
-details (\url{http://free-electrons.com/doc/training/linux-kernel/}).
-
-\section{Configuring Git}
-
-Configure your name and email address in git with \code{git config}.
-
-\section{Clone a repository}
-
-We already cloned Linus Torvalds' git tree, but it is useful to remember
-how to do it again. Go to \url{http://git.kernel.org} and make sure you know
-how to find the \code{git://} URL of his Linux tree.
-
-Cloning downloaded quite a lot of data, but then at the end, we have
-the full history of the Linux kernel (since the kernel developers
-started to use Git, around kernel 2.6.12). We can access and explore
-this history offline.
+Go to your kernel source tree in \code{~/felabs/linux/src/linux}
 
 \section{Exploring the history}
 
@@ -50,8 +30,8 @@ With \code{git diff}, look at the differences between \code{fs/jffs2/}
 With \code{gitk}, look at the full history of the UBIFS filesystem (in
 \code{fs/ubifs/}).
 
-On the {\em gitweb} interface of Linus Torvalds tree, available at
-\url{http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git},
+On the {\em cgit} interface of Linus Torvalds tree, available at
+\url{https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/},
 search all commits that have been done by Free Electrons (hint: use
 the search engine by author).
 
diff --git a/slides/kernel-git-lab/kernel-git-lab.tex b/slides/kernel-git-lab/kernel-git-lab.tex
index 487db6c..0ffd944 100644
--- a/slides/kernel-git-lab/kernel-git-lab.tex
+++ b/slides/kernel-git-lab/kernel-git-lab.tex
@@ -1,5 +1,5 @@
 \setuplabframe
-{Git}
+{Going further: git}
 {
   \begin{itemize}
   \item Get familiar with git by contributing to a real project: the



More information about the training-materials-updates mailing list