Annotation of www/stable.html, Revision 1.6
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">
10: <meta name="copyright" content="This document copyright 1996-1998 by OpenBSD.">
11: </head>
12:
13: <BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#23238E">
14:
15: <img alt="[OpenBSD]" height=30 width=141 SRC="images/smalltitle.gif">
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.4 deraadt 32: Starting with 2.7, OpenBSD is providing a source tree that contains
33: important patches and fixes (ie. those from the
34: <a href="errata.html">errata</a> plus others which are obvious and simple,
35: but do not deserve a errata entry)
36: and making it available via <a href="anoncvs.html">CVS</a> in addition to the
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.
40: <li>Use the <b>patch branch</b> which the most important patches applied.
41: <li>Use <b>current source</b> for all of the latest features.
42: </ul>
43: <p>
44: The <a href="plus.html">Daily Changelog</a> details which post-release
45: patches have made it into the patch branch. As a general principle, all
46: <a href="errata.html">Errata</a> entries will be merged into the patch
47: branch within 48 hours of when an errata is published. Other post release
48: patches may be merged in as well, subject to a number of conditions:
49: <ul>
50: <li>The patches must be simple, short, and obviously 100% correct.
51: <li>Errata entries are made for bugs which affect many people. Other
52: patches may be merged into the patch branch if they affect a few
53: people in drastic ways.
54: <li>Please do not ask for large subsystems or patches to be merged.
55: Maintaining the patch tree takes a lot of effort which could be
56: better spent on making our next release better.
57: <li>As an exception to the above rules, OpenSSH release versions will be
58: merged into the patch branch.
59: </ul>
60: <p>
1.1 jason 61:
62: <a name="getting"></a>
1.4 deraadt 63: <h3><font color=#0000e0>Getting a stable branch</font></h3>
1.1 jason 64:
65: <p>
1.4 deraadt 66: To obtain the patch branch for a particular release of OpenBSD, you
67: can update on top of a pre-existing source tree
1.5 wvdputte 68: (from <a href="ftp.html">FTP</a> or the <a href="orders.html">CD</a>)
1.4 deraadt 69: or you can grab the source tree freshly from
70: an <a href="anoncvs.html">AnonCVS</a> server.
71: Instructions for getting the patch branch and staying up to date are
72: described in the <b>Getting Started</b> section of the
1.1 jason 73: <a href="anoncvs.html#starting">AnonCVS documentation</a>.
1.4 deraadt 74: Note that patch branches do not help to upgrade from one release of
75: OpenBSD to another, eg. to go from 2.5 to 2.6. They only provide
76: a means for staying up to date with the patches within a given release.
77: If you are trying to go from one release to another via source, please visit
1.1 jason 78: the <a href="faq/upgrade-minifaq.html">upgrade-minifaq</a>.
1.6 ! jason 79: Also, you cannot go backwards, from -current back to -stable, because of
! 80: library versioning problems.
1.1 jason 81:
82: <a name="building"></a>
83: <h3><font color=#0000e0>Building from an OpenBSD patch branch</font></h3>
84: Once you have obtained a source tree via <a href="anoncvs.html">anoncvs</a>,
85: you must rebuild the system. The stages for doing so are:
86:
87: <ul>
88: <li>Rebuild the kernel
89: <li>Reboot with the new kernel
90: <li>Rebuild the binaries
91: </ul>
92:
93: <h4><font color=#0000e0>Rebuilding the kernel</font></h4>
94:
95: <p>
96: To rebuild the default kernel from stable:
1.3 ericj 97: <ul><pre>
98: # <strong>cd /usr/src/sys/arch/i386/conf</strong>
99: # <strong>/usr/sbin/config GENERIC</strong>
100: # <strong>cd /usr/src/sys/arch/i386/compile/GENERIC</strong>
101: # <strong>make clean && make depend && make</strong>
102: </pre></ul>
1.1 jason 103:
104: <p>
105: Replace <i>i386</i> with your architecture, eg.
106: <i>sparc</i>, <i>alpha</i>, etc.
107:
108: <h4><font color=#0000e0>Rebooting with the new kernel</font></h4>
109:
110: <p>
111: To reboot with the newly compiled kernel:
1.3 ericj 112: <ul><pre>
113: # <strong>cd /usr/src/sys/arch/i386/compile/GENERIC</strong>
114: # <strong>cp /bsd /bsd.old</strong> <i>(Save an old copy of your kernel)</i>
115: # <strong>cp bsd /bsd</strong> <i>(Copy the new kernel into place)</i>
116: # <strong>reboot</strong>
117: </pre></ul>
1.1 jason 118:
119: <p>
120: As above, substitute your architecture for <i>i386</i>. If your system has
121: trouble booting the new kernel, you can easily go back and reboot from the
122: old kernel, now called <i>bsd.old</i>.
123:
124: <h4><font color=#0000e0>Rebuilding the binaries</font></h4>
125:
126: <p> To rebuild the system binaries:
1.3 ericj 127: <ul><pre>
128: # <strong>cd /usr/src</strong>
129: # <strong>rm -r /usr/obj/*</strong>
130: # <strong>make obj && make build</strong>
131: </pre></ul>
1.1 jason 132:
133: <p>This will take awhile...
134: <hr>
135: <a href=index.html><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a>
136: <a href=mailto:www@openbsd.org>www@openbsd.org</a>
1.6 ! jason 137: <br><small>$OpenBSD: stable.html,v 1.5 2000/06/12 12:33:09 wvdputte Exp $</small>
1.1 jason 138: </body>
139: </html>
140:
![[BACK]](/icons/back.gif){kind=icon}
Return to stable.html CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / www