[BACK]Return to stable.html CVS log [TXT][DIR] Up to [local] / www

Annotation of www/stable.html, Revision 1.17

1.1       jason       1: <!DOCTYPE HTML PUBLIC  "-//IETF//DTD HTML Strict//EN">
                      2: <html>
                      3: <head>
                      4: <title>OpenBSD Patch Branches</title>
                      5: <link rev=made href=mailto:www@openbsd.org>
                      6: <meta name="resource-type" content="document">
                      7: <meta name="description" content="stable">
                      8: <meta name="keywords" content="openbsd,anoncvs,updates,stable">
                      9: <meta name="distribution" content="global">
1.13      nick       10: <meta name="copyright" content="This document copyright 1996-2005 by OpenBSD.">
1.1       jason      11: </head>
                     12:
1.11      david      13: <body bgcolor="#ffffff" text="#000000" link="#23238E">
1.1       jason      14:
1.10      jsyn       15: <a href="index.html"><img alt="[OpenBSD]" height="30" width="141" src="images/smalltitle.gif" border="0"></a>
1.1       jason      16: <p>
1.2       deraadt    17: <h2><font color=#e00000>Patch Branches</font><hr></h2>
1.1       jason      18:
                     19: <p>
                     20: <ul><h3>Table Of Contents</h3>
1.4       deraadt    21: <li><a href="#whatis">What is the patch branch?</a>
                     22: <li><a href="#getting">Getting the patch branch</a>
                     23: <li><a href="#building">Building from the patch branch</a>
1.1       jason      24: </ul>
                     25: </p>
                     26: <hr>
                     27:
                     28: <a name="whatis"></a>
1.4       deraadt    29: <h3><font color=#0000e0>What is the patch branch?</font></h3>
1.1       jason      30:
                     31: <p>
1.7       jason      32: Starting with 2.7, OpenBSD provides a source tree that contains
1.8       jufi       33: important patches and fixes (i.e. those from the
1.4       deraadt    34: <a href="errata.html">errata</a> plus others which are obvious and simple,
1.12      david      35: but do not deserve an errata entry)
1.7       jason      36: and makes it available via <a href="anoncvs.html">CVS</a> in addition to the
1.4       deraadt    37: current source.  Thus, users can choose three options :<p>
                     38: <ul>
                     39: <li>Stick with our latest release and apply the patches by hand.
1.7       jason      40: <li>Use the <b>patch branch</b> which has the most important patches applied.
1.4       deraadt    41: <li>Use <b>current source</b> for all of the latest features.
                     42: </ul>
                     43: <p>
1.13      nick       44: <!-- The <a href="plus.html">Daily Changelog</a> details (amoung other things)
                     45: which post-release changes have made it into the patch branch. -->
                     46: As a general principle, all
1.4       deraadt    47: <a href="errata.html">Errata</a> entries will be merged into the patch
                     48: branch within 48 hours of when an errata is published.  Other post release
                     49: patches may be merged in as well, subject to a number of conditions:
                     50: <ul>
                     51: <li>The patches must be simple, short, and obviously 100% correct.
                     52: <li>Errata entries are made for bugs which affect many people.  Other
                     53:     patches may be merged into the patch branch if they affect a few
                     54:     people in drastic ways.
                     55: <li>Please do not ask for large subsystems or patches to be merged.
                     56:     Maintaining the patch tree takes a lot of effort which could be
                     57:     better spent on making our next release better.
                     58: <li>As an exception to the above rules, OpenSSH release versions will be
                     59:     merged into the patch branch.
                     60: </ul>
                     61: <p>
1.1       jason      62:
                     63: <a name="getting"></a>
1.4       deraadt    64: <h3><font color=#0000e0>Getting a stable branch</font></h3>
1.1       jason      65:
                     66: <p>
1.4       deraadt    67: To obtain the patch branch for a particular release of OpenBSD, you
                     68: can update on top of a pre-existing source tree
1.5       wvdputte   69: (from <a href="ftp.html">FTP</a> or the <a href="orders.html">CD</a>)
1.4       deraadt    70: or you can grab the source tree freshly from
                     71: an <a href="anoncvs.html">AnonCVS</a> server.
                     72: Instructions for getting the patch branch and staying up to date are
                     73: described in the <b>Getting Started</b> section of the
1.1       jason      74: <a href="anoncvs.html#starting">AnonCVS documentation</a>.
1.4       deraadt    75: Note that patch branches do not help to upgrade from one release of
1.17    ! steven     76: OpenBSD to another, e.g. to go from 3.8 to 3.9.  They only provide
1.4       deraadt    77: a means for staying up to date with the patches within a given release.
                     78: If you are trying to go from one release to another via source, please visit
1.15      steven     79: the <a href="faq/upgrade38.html">upgrade guide</a>.
1.6       jason      80: Also, you cannot go backwards, from -current back to -stable, because of
                     81: library versioning problems.
1.1       jason      82:
                     83: <a name="building"></a>
                     84: <h3><font color=#0000e0>Building from an OpenBSD patch branch</font></h3>
                     85: Once you have obtained a source tree via <a href="anoncvs.html">anoncvs</a>,
                     86: you must rebuild the system.  The stages for doing so are:
                     87:
                     88: <ul>
                     89:  <li>Rebuild the kernel
                     90:  <li>Reboot with the new kernel
                     91:  <li>Rebuild the binaries
                     92: </ul>
                     93:
                     94: <h4><font color=#0000e0>Rebuilding the kernel</font></h4>
                     95:
                     96: <p>
                     97: To rebuild the default kernel from stable:
1.3       ericj      98: <ul><pre>
                     99: # <strong>cd /usr/src/sys/arch/i386/conf</strong>
                    100: # <strong>/usr/sbin/config GENERIC</strong>
                    101: # <strong>cd /usr/src/sys/arch/i386/compile/GENERIC</strong>
                    102: # <strong>make clean &amp;&amp; make depend &amp;&amp; make</strong>
                    103: </pre></ul>
1.1       jason     104:
                    105: <p>
1.8       jufi      106: Replace <i>i386</i> with your architecture, e.g.
1.1       jason     107: <i>sparc</i>, <i>alpha</i>, etc.
                    108:
                    109: <h4><font color=#0000e0>Rebooting with the new kernel</font></h4>
                    110:
                    111: <p>
                    112: To reboot with the newly compiled kernel:
1.3       ericj     113: <ul><pre>
                    114: # <strong>cd /usr/src/sys/arch/i386/compile/GENERIC</strong>
                    115: # <strong>cp /bsd /bsd.old</strong>          <i>(Save an old copy of your kernel)</i>
                    116: # <strong>cp bsd /bsd</strong>               <i>(Copy the new kernel into place)</i>
                    117: # <strong>reboot</strong>
                    118: </pre></ul>
1.1       jason     119:
                    120: <p>
                    121: As above, substitute your architecture for <i>i386</i>.  If your system has
                    122: trouble booting the new kernel, you can easily go back and reboot from the
                    123: old kernel, now called <i>bsd.old</i>.
                    124:
                    125: <h4><font color=#0000e0>Rebuilding the binaries</font></h4>
                    126:
                    127: <p> To rebuild the system binaries:
1.3       ericj     128: <ul><pre>
1.16      steven    129: # <strong>rm -rf /usr/obj/*</strong>
1.3       ericj     130: # <strong>cd /usr/src</strong>
1.16      steven    131: # <strong>make obj</strong>
                    132: # <strong>cd /usr/src/etc &amp;&amp; env DESTDIR=/ make distrib-dirs</strong>
                    133: # <strong>cd /usr/src</strong>
                    134: # <strong>make build</strong>
1.3       ericj     135: </pre></ul>
1.1       jason     136:
                    137: <p>This will take awhile...
                    138: <hr>
                    139: <a href=index.html><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a>
                    140: <a href=mailto:www@openbsd.org>www@openbsd.org</a>
1.17    ! steven    141: <br><small>$OpenBSD: stable.html,v 1.16 2006/04/19 23:01:49 steven Exp $</small>
1.1       jason     142: </body>
                    143: </html>
                    144: