Update installation instructions.

2 files changed, 19 insertions, 15 deletions

diff --git a/download/2010.2/liblitmus-2010-config b/download/2010.2/liblitmus-2010-config
new file mode 100644
index 0000000..22bc513
--- /dev/null
+++ b/download/2010.2/liblitmus-2010-config
@@ -0,0 +1,5 @@
+# Set ARCH to 64 bit
+ARCH = 'x86_64'
+# Set path for LITMUS_KERNEL
+LITMUS_KERNEL = '../litmus2010'
+ 
diff --git a/index.html b/index.html
index d5cc74e..5efb2aa 100644
--- a/index.html
+++ b/index.html
@@ -433,9 +433,9 @@ Technology and Applications Symposium</cite>, pp. 342-353, April 2008.
     <h3>Patching the Kernel</h3> 

     <p class="notopmargin"> 

     The extension to the Linux kernel is released as a patch against Linux

-    2.6.32. To install the LITMUS<sup>RT</sup> kernel, first <a 

-    href="http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.tar.bz2">download the Linux

-    kernel 2.6.32</a> and untar it in a directory of your choice (hereafter

+    2.6.34. To install the LITMUS<sup>RT</sup> kernel, first <a 

+    href="http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.34.tar.bz2">download the Linux

+    kernel 2.6.34</a> and untar it in a directory of your choice (hereafter

     referred to as <span class="src">$DIR</span>). Second, apply the

     LITMUS<sup>RT</sup> patch (see <a href="#download">Section Download</a>)

     and configure, compile, and install the kernel as usual. The patch is <span 

@@ -443,16 +443,15 @@ Technology and Applications Symposium</cite>, pp. 342-353, April 2008.
     To summarize, the  LITMUS<sup>RT</sup> kernel can be obtained, patched, and

     compiled with the following commands:

     </p> 

-<pre class="shell"> 

-cd $DIR

-# get Linux 2.6.32

-wget http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.tar.bz2

-tar xjf linux-2.6.32.tar.bz2

-wget http://www.cs.unc.edu/~anderson/litmus-rt/download/2010.1/litmus-rt-2010.1.patch

-mv linux-2.6.32 litmus2010

+<pre class="shell">cd $DIR

+# get Linux 2.6.34

+wget http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.34.tar.bz2

+tar xjf linux-2.6.34.tar.bz2

+wget http://www.cs.unc.edu/~anderson/litmus-rt/download/2010.2/litmus-rt-2010.2.patch

+mv linux-2.6.34 litmus2010

 # apply the LITMUS RT patch

 cd litmus2010

-patch -p1 &lt; ../litmus-rt-2010.1.patch

+patch -p1 &lt; ../litmus-rt-2010.2.patch

 # create a working kernel configuration

 #  - select HZ=1000

 #  - enable in-kernel preemptions

@@ -469,7 +468,7 @@ make modules
 </pre> 

     <p> 

       When configuring the kernel, note that there is a menu (at the very end of the list) 

-      with LITMUS<sup>RT</sup>-specific configuration options. For reference, we provide sample <a href="download/2010.1/32bit-config">32-bit </a> and <a href="download/2010.1/64bit-config">64-bit configurations</a>  that are known to work under QEMU.

+      with LITMUS<sup>RT</sup>-specific configuration options. For reference, we provide sample <a href="download/2010.2/32bit-config">32-bit </a> and <a href="download/2010.2/64bit-config">64-bit configurations</a>  that are known to work under KVM.

     </p> 

  

     <h3>Libraries</h3> 

@@ -478,7 +477,7 @@ make modules
     depends on the LITMUS<sup>RT</sup> kernel kernel and provides its own build system (based on <a href="http://www.scons.org/">scons</a>). 

     In order to compile <span class="src">liblitmus</span>, you need to adjust the
     variable <span class="src">LITMUS_KERNEL</span> in the <span class="src">.config</span> file to point to your 

-    copy of the kernel. The variables required for building <span class="src">liblitmus </span> can be listed using <span class="src"> scons -h </span> command. For reference, we provide a sample <a href="download/2010.1/liblitmus-2010-config"> config </a> file.

+    copy of the kernel. The variables required for building <span class="src">liblitmus </span> can be listed using <span class="src"> scons -h </span> command. For reference, we provide a sample <a href="download/2010.2/liblitmus-2010-config"> config </a> file.

    Sample output of <span class="src"> scons -h </span> is as shown below.

     </p> 

    <pre class="shell"> 

@@ -517,8 +516,8 @@ Use scons -H for help about command-line options.
 </p>

 <pre class="shell"> 

 cd $DIR

-wget http://www.cs.unc.edu/~anderson/litmus-rt/download/2010.1/liblitmus-2010.1.tgz

-tar xzf liblitmus-2010.1.tgz

+wget http://www.cs.unc.edu/~anderson/litmus-rt/download/2010.1/liblitmus-2010.2.tgz

+tar xzf liblitmus-2010.2.tgz

 cd liblitmus 

 # change LITMUS_KERNEL in .config to point to the kernel source

 scons