X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=index.html;h=6c5fe7be8cb93dede2c2b27644fa83263e47e8c8;hb=refs%2Ftags%2Fdebconf11;hp=c5f243ea59ab84a3c12fcef4ad37c173ac08a2bd;hpb=b51dd7b9ac7376b4d3c5a279eefd7429c21878b9;p=debian-kernel-talk.git

diff --git a/index.html b/index.html
index c5f243e..6c5fe7b 100644
--- a/index.html
+++ b/index.html
@@ -22,6 +22,8 @@
   table { border-collapse: collapse }
   th { border-bottom: 2pt solid black }
   th, td { padding: 0 6pt }
+  .package { font-family: monospace }
+  var { font-family: sans }
 </style>
 <style type="text/css" media="print">
   .slide { page-break-after: always }
@@ -229,31 +231,32 @@
 <div class="slide">
   <h1>Official Linux kernel packages (1)</h1>
   <p>
-    Main source package is linux-2.6 (still!).  Most binary package
-    names change regularly.
+    Main source package is <span class="package">linux-2.6</span>
+    (still!).  Most binary package names change regularly.
   </p>
   <ul class="incremental">
     <li>
-      linux-image-<var>upstream</var>-<var>abi</var>-<var>flavour</var>
+      <span class="package">linux-image-<var>upstream</var>-<var>abi</var>-<var>flavour</var></span>
       - compiled kernel and modules
     </li>
     <li>
-      linux-headers-<var>upstream</var>-<var>abi</var>-<var>flavour</var>
+      <span class="package">linux-headers-<var>upstream</var>-<var>abi</var>-<var>flavour</var></span>
       (and others) - development package for OOT modules
     </li>
     <li>
-      linux-libc-dev - headers for userland
+      <span class="package">linux-libc-dev</span> - headers for userland
     </li>
     <li>
-      linux-source-<var>upstream</var> - for custom kernels
+      <span class="package">linux-source-<var>upstream</var></span> -
+      for custom kernels
     </li>
     <li>
-      linux-doc-<var>upstream</var>, linux-tools-<var>upstream</var>,
-      etc.
+      <span class="package">linux-doc-<var>upstream</var></span>,
+      <span class="package">linux-tools-<var>upstream</var></span>, etc.
     </li>
     <li>
-      linux-support-<var>upstream</var>-<var>abi</var> - scripts and
-      metadata to support linux-latest-2.6
+      <span class="package">linux-support-<var>upstream</var>-<var>abi</var></span> -
+      scripts and metadata to support linux-latest-2.6
     </li>
   </ul>
 </div>
@@ -261,23 +264,27 @@
 <div class="slide">
   <h1>Official Linux kernel packages (2)</h1>
   <p>
-    The linux-latest-2.6 source package builds meta-packages to
-    support automatic upgrades between binaries built from linux-2.6.
+    The <span class="package">linux-latest-2.6</span> source package builds meta-packages
+    to support automatic upgrades between binaries built
+    from <span class="package">linux-2.6</span>.
   </p>
   <ul class="incremental">
     <li>
-      linux-image-<var>flavour</var>
+      <span class="package">linux-image-<var>flavour</var></span>
     </li>
     <li>
-      linux-headers-<var>flavour</var>
+      <span class="package">linux-headers-<var>flavour</var></span>
     </li>
     <li>
-      linux-source, linux-doc, linux-tools, etc.
+      <span class="package">linux-source</span>,
+      <span class="package">linux-doc</span>,
+      <span class="package">linux-tools</span>, etc.
     </li>
   </ul>
   <p class="incremental">
-    The installer will normally install linux-image-<var>flavour</var>
-    (for some appropriate <var>flavour</var>).
+    The installer will normally install
+    <span class="package">linux-image-<var>flavour</var></span> (for
+    some appropriate <var>flavour</var>).
   </p>
 </div>
 
@@ -285,14 +292,17 @@
   <h1>Official Linux kernel packages (3)</h1>
   <ul class="incremental">
     <li>
-      firmware-free - separate 'firmware' compliant with DFSG
+      <span class="package">firmware-free</span> - separate 'firmware'
+      compliant with DFSG
     </li>
     <li>
-      linux-base - base package for images and tools
+      <span class="package">linux-base</span> - base package for
+      images and tools
     </li>
     <li>
-      linux-kbuild-2.6 builds linux-kbuild-<var>upstream</var> -
-      code used for building OOT modules
+      <span class="package">linux-kbuild-2.6</span> builds
+      <span class="package">linux-kbuild-<var>upstream</var></span> -
+      kernel build system and tools for building OOT modules
     </li>
   </ul>
 </div>
@@ -317,14 +327,44 @@
   </p>
   <ul class="incremental">
     <li>
-      <tt>make && make install</tt>
+      <span class="package">make && make install</span>
     </li>
     <li>
-      <tt>make deb-pkg</tt> - build packages
+      <span class="package">make deb-pkg</span> - build packages
     </li>
     <li>
-      <tt>make-kpkg</tt> - build packages with more customisation;
-      requires kernel-package
+      <span class="package">make-kpkg</span> - build packages with
+      more customisation; requires
+      <span class="package">kernel-package</span>
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <h1>Extra features</h1>
+  <p>
+    Always aim to get patches merged upstream.  But many big features
+    that users want added are <em>not</em> merged upstream for a long
+    time.  Kernel team expects features to be upstream first, then
+    backported.
+  </p>
+  <p class="incremental">
+    But there have been exceptions:
+  </p>
+  <ul class="incremental">
+    <li>
+      OpenVZ and VServer - mostly reimplemented with cgroups and
+      namespaces
+    </li>
+    <li>
+      Xen - now upstream; Linux 3.0 is a useful dom0 kernel!
+    </li>
+    <li>
+      aufs - needed for Debian Live
+    </li>
+    <li>
+      PREEMPT_RT - gradually being merged upstream; new option in
+      amd64 packages
     </li>
   </ul>
 </div>
@@ -341,13 +381,13 @@
   </p>
   <ul class="incremental">
     <li>
-      <tt>dkms</tt> - builds and installs modules automatically.  Can
-      build packages for installation on other systems.  Also
-      supported by Ubuntu and SUSE.
+      <span class="package">dkms</span> - builds and installs modules
+      automatically.  Can build packages for installation on other
+      systems.  Also supported by Ubuntu and SUSE.
     </li>
     <li>
-      <tt>module-assistant</tt> - builds packages as directed.
-      Uses a separate package name for each kernel ABI.
+      <span class="package">module-assistant</span> - builds packages
+      as directed.  Uses a separate package name for each kernel ABI.
     </li>
   </ul>
 </div>
@@ -369,7 +409,8 @@
       files installed
     </li>
     <li>
-      Kernel team maintains <tt>firmware-nonfree</tt> source package
+      Kernel team maintains
+      <span class="package">firmware-nonfree</span> source package
       covering most firmware files that are clearly redistributable
     </li>
     <li>
@@ -383,19 +424,20 @@
   <h1>Documentation</h1>
   <ul class="incremental">
     <li>
-      <tt>manpages-dev</tt> - the system call API
+      <span class="package">manpages-dev</span> - the system call API
     </li>
     <li>
-      <tt>linux-doc-</tt><var>upstream</var> - miscellaneous upstream
-      documentation
+      <span class="package">linux-doc-</span><var>upstream</var> -
+      miscellaneous upstream documentation
     </li>
     <li>
-      <tt>linux-manual-</tt><var>upstream</var> - the internal API,
-      based on structured comments
+      <span class="package">linux-manual-</span><var>upstream</var> -
+      the internal API, based on structured comments
     </li>
     <li>
-      <tt>debian-kernel-handbook</tt> - Debian-specific information;
-      currently also Linux-specific but could cover other kernels
+      <span class="package">debian-kernel-handbook</span> -
+      Debian-specific information; currently also Linux-specific but
+      could cover other kernels
     </li>
     <li>
       <a href="http://wiki.debian.org/DebianKernel">http://wiki.debian.org/DebianKernel</a>