Merge branch 'layout'

3 files changed, 63 insertions, 67 deletions

diff --git a/configpres.tex b/configpres.tex
index b9c59b4..698fcfa 100644
--- a/configpres.tex
+++ b/configpres.tex
@@ -10,32 +10,33 @@
 \usepackage{xltxtra,fontspec,xunicode}
 
 \defaultfontfeatures{Scale=MatchLowercase}
-\setromanfont[Numbers=Uppercase]{TheMixB W5 Plain}
+\setromanfont{TheMixB W5 Plain}
 \setsansfont{TheMixB W7 Bold}
-\setmonofont[Scale=0.90,Ligatures=NoCommon]{Source Code Pro}
+\setmonofont[Scale=0.7]{Source Code Pro}
+\linespread{0.5}
 
 \mode<presentation>{\usetheme{linutronix}}
 
 \institute{Linutronix GmbH}
 \definecolor{lbcolor}{RGB}{255,210,150}
-\lstset{
-	language=C++,
-	numbers=left,
-	stepnumber=1,
-	numbersep=5pt,
-	breaklines=true,
-	breakautoindent=true,
-	postbreak=\space,
-	tabsize=2,
-	basicstyle=\ttfamily\small,
-	showspaces=false,
-	showstringspaces=false,
-	extendedchars=true,
-	backgroundcolor=\color{lbcolor},
-	keywordstyle=\bf ,
-	commentstyle=\color{blue},
-	stringstyle=\color{red}
-}
+%\lstset{
+%	language=C++,
+%	numbers=left,
+%	stepnumber=1,
+%	numbersep=5pt,
+%	breaklines=true,
+%	breakautoindent=true,
+%	postbreak=\space,
+%	tabsize=2,
+%	basicstyle=\ttfamily\small,
+%	showspaces=false,
+%	showstringspaces=false,
+%	extendedchars=true,
+%	backgroundcolor=\color{lbcolor},
+%	keywordstyle=\bf ,
+%	commentstyle=\color{blue},
+%	stringstyle=\color{red}
+%}
 
 \begin{document}
 
diff --git a/distribution/elbe-example/pres_elbe-example_en.tex b/distribution/elbe-example/pres_elbe-example_en.tex
index db8c2d7..e80a2e1 100644
--- a/distribution/elbe-example/pres_elbe-example_en.tex
+++ b/distribution/elbe-example/pres_elbe-example_en.tex
@@ -19,10 +19,9 @@
 
 \subsection{generate a buildenv}
 
-\lstset{language=xml}
 \begin{frame}[fragile]
 \frametitle{minimal XML file}
-\begin{lstlisting}
+\begin{verbatim}
 <ns0:RootFileSystem
  xmlns:ns0="https://www.linutronix.de/projects/Elbe"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -45,12 +44,12 @@
         </url>
       </url-list>
     </mirror>
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
 \frametitle{minimal XML file}
-\begin{lstlisting}
+\begin{verbatim}
     <suite>wheezy</suite>
     <buildimage>
       <kinitrd>elbe-bootstrap</kinitrd>
@@ -74,7 +73,7 @@
     </pkg-list>
   </target>
 </ns0:RootFileSystem>
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
@@ -132,7 +131,7 @@ $ rm autoscan.log
 \begin{lstlisting}
 $ $EDITOR configure.ac
 \end{lstlisting}
-\begin{lstlisting}
+\begin{verbatim}
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
@@ -156,7 +155,7 @@ AC_PROG_CC
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
@@ -193,7 +192,6 @@ $ make
 $ ./myapp
 Hello ELBE
 Hello ELBE
-Hello ELBE
 ^C
 \end{lstlisting}
 \end{frame}
@@ -255,7 +253,7 @@ $ mkdir -p myrepo/conf
 $ cd myrepo
 $ $EDITOR conf/distributions
 \end{lstlisting}
-\begin{lstlisting}
+\begin{verbatim}
 Origin: myrepo
 Label: myrepo
 Suite: stable
@@ -265,18 +263,7 @@ Version:
 Architectures: i386 amd64 source
 Components: main
 Description: my debian packages
-\end{lstlisting}
-\begin{lstlisting}
-$ $EDITOR conf/updates
-\end{lstlisting}
-\begin{lstlisting}
-Name: myremoterepo
-Method: http://localhost/myrepo
-Components: main
-Architectures: i386 amd64 armel source
-VerifyRelease: blindtrust
-IgnoreRelease: yes
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 
@@ -285,7 +272,8 @@ IgnoreRelease: yes
 \begin{lstlisting}
 $ reprepro include wheezy ../myapp_1.0_i386.changes
 $ sudo mkdir /var/www/
-$ sudo rsync -av --exclude=db --exclude=conf * /var/www/myrepo/
+$ sudo rsync -av --exclude=db --exclude=conf * \
+/var/www/myrepo/
 \end{lstlisting}
 \end{frame}
 
@@ -322,7 +310,8 @@ $ myapp
 \begin{lstlisting}
 $ cd ../myrepo
 $ reprepro include wheezy /tmp/myapp_1.0_armel.changes
-$ sudo rsync -av --exclude=db --exclude=conf * /var/www/myrepo/
+$ sudo rsync -av --exclude=db --exclude=conf * \
+/var/www/myrepo/
 \end{lstlisting}
 \end{frame}
 
@@ -335,7 +324,7 @@ $ sudo rsync -av --exclude=db --exclude=conf * /var/www/myrepo/
 $ cd ..
 $ $EDIT mini.xml
 \end{lstlisting}
-\begin{lstlisting}
+\begin{verbatim}
 ...
     <mirror>
       <primary_host>ftp.debian.org</primary_host>
@@ -353,12 +342,12 @@ $ $EDIT mini.xml
     </mirror>
     <noauth/>
 ...
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
 \frametitle{add myapp}
-\begin{lstlisting}
+\begin{verbatim}
 ...
   <target>
     <hostname>mini</hostname>
@@ -373,13 +362,13 @@ $ $EDIT mini.xml
     </pkg-list>
   </target>
 </ns0:RootFileSystem>
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \subsection{define a striped target RFS}
 \begin{frame}[fragile]
 \frametitle{define sdcard image}
-\begin{lstlisting}
+\begin{verbatim}
 ...
   <target>
     <hostname>mini</hostname>
@@ -402,12 +391,12 @@ $ $EDIT mini.xml
       </msdoshd>
     </images>
 ...
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
 \frametitle{create fstab and set elbe mode}
-\begin{lstlisting}
+\begin{verbatim}
 ...
     </images>
     <fstab>
@@ -424,7 +413,7 @@ $ $EDIT mini.xml
     <norecommend />
     <finetuning>
 ...
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \begin{frame}[fragile]
@@ -442,14 +431,16 @@ host the nfs root filesystem
 \begin{lstlisting}
 $ sudo mkdir -p /nfs/elbe-armel
 $ sudo tar xzf rootfs.tar.gz -C /nfs/elbe-armel
-$ su -c 'echo "/nfs *(rw,sync,no_subtree_check,insecure) >> /etc/exports"'
+$ su -c \
+'echo "/nfs *(rw,sync,no_subtree_check,insecure) \
+>> /etc/exports"'
 $ sudo /etc/init.d/nfs-kernel-server restart
 \end{lstlisting}
 \end{frame}
 
 \begin{frame}[fragile]
 \frametitle{build current kernel for qemu armel boot}
-\begin{lstlisting}
+\begin{verbatim}
 $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
 $ cd linux
 $ mkdir ../linux-qemu-arm
@@ -461,7 +452,7 @@ $ #           IP: kernel level autoconfiguration / IP: DHCP Support
 $ ARCH=arm CROSS_COMPILE=arm-none-eabi- make O=../linux-qemu-arm menuconfig
 $ ARCH=arm CROSS_COMPILE=arm-none-eabi- make O=../linux-qemu-arm -j5 
 $ cd ..
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 
@@ -471,13 +462,14 @@ $ cd ..
 qemu-system-arm -M versatilepb -no-reboot \
   -m 256 -usb \
   -kernel linux-qemu-arm/arch/arm/boot/zImage \
-  -append 'root=/dev/nfs nfsroot=10.0.2.2:/nfs/elbe-armel ip=dhcp init=/usr/bin/myapp'
+  -append 'root=/dev/nfs nfsroot=10.0.2.2:/nfs/elbe-armel
+           ip=dhcp init=/usr/bin/myapp'
 \end{lstlisting}
 \end{frame}
 
 \begin{frame}[fragile]
 \frametitle{strip the nfsroot}
-\begin{lstlisting}
+\begin{verbatim}
 $ sudo rm -rf /nfs/elbe-armel/etc
 $ sudo rm -rf /nfs/elbe-armel/sbin
 $ sudo rm -rf /nfs/elbe-armel/var
@@ -494,27 +486,27 @@ $ sudo rm /nfs/elbe-armel/lib/arm-linux-gnueabi/*
 $ sudo mv libc-2.13.so /nfs/elbe-armel/lib/arm-linux-gnueabi/
 $ sudo mv libc.so.6 /nfs/elbe-armel/lib/arm-linux-gnueabi/
 $ sudo mv ld-* /nfs/elbe-armel/lib/arm-linux-gnueabi/
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 
 \begin{frame}[fragile]
 \frametitle{update the ELBE XML file}
-\begin{lstlisting}
+\begin{verbatim}
 $ sudo mkdir /nfs/elbe-armel-orig
 $ sudo tar xzf rootfs.tar.gz -C /nfs/elbe-armel-orig/
 $ elbe pkgdiff
 $ sudo elbe diff /nfs/elbe-armel-orig /nfs/elbe-armel > diff.txt
 $ cd ..
-\end{lstlisting}
-\begin{lstlisting}
+\end{verbatim}
+\begin{verbatim}
 $ vim mini.xml
 $ # place cursor in finetuning section
 $ <ESC>:read target/diff.txt<RETURN>
 $ # remove everything until 'suggesting:'
 $ <ESC>:x<RETURN>
-\end{lstlisting}
-\begin{lstlisting}
+\end{verbatim}
+\begin{verbatim}
 $ elbe create --directory=target-stripped mini.xml
 $ cd target-stripped
 $ make
@@ -524,7 +516,7 @@ $ # boot the image
 $ qemu-system-arm -M versatilepb \
 -kernel .elbe-vm/vmkernel -initrd .elbe-vm/vminitrd \
 -append 'root=/dev/sda1 init=/usr/bin/myapp' my.img
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 
 \subsection{setup own debian mirror}
@@ -534,8 +526,10 @@ $ qemu-system-arm -M versatilepb \
 \begin{lstlisting}
 $ mkdir -p /mirrors/debian
 $ cd debian
-$ debmirror -p -d wheezy, -a i386,amd64,armel,armhf --di-dist=wheezy \
---method=http --no-check-gpg -h ftp.de.debian.org .
+$ debmirror -p -d wheezy, -a i386,amd64,armel,armhf \
+     --di-dist=wheezy \
+     --method=http --no-check-gpg \
+     -h ftp.de.debian.org .
 $ cd /var/www/html
 $ ln -s  /mirrors/debian
 \end{lstlisting}
diff --git a/tailpres.tex b/tailpres.tex
index 8461be1..69460de 100644
--- a/tailpres.tex
+++ b/tailpres.tex
@@ -1,4 +1,4 @@
-\begin{frame}
+\begin{frame}[fragile]
   \begin{columns}
     \column[c]{.50\textwidth}
 Vielen Dank f\"ur Ihre Aufmerksamkeit
@@ -10,7 +10,8 @@ Auf dem Berg 3
 88690 Uhldingen-M\"uhlhofen
 \end{block}
     \column[c]{.50\textwidth}
-\includegraphics[height=0.8\textheight]{/usr/share/lx/logo/frau_auf_logo}
+\vskip5cm
+\includegraphics[height=0.3\textwidth]{/usr/share/lx/logo/frau_auf_logo}
   \end{columns}
 \end{frame}