version 1.22, 2007/01/02 01:00:02 |
version 1.23, 2007/01/02 15:14:06 |
|
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
<html> |
<html> |
<head> |
<head> |
<title>OpenBSD Patch Branches</title> |
<title>Following -stable</title> |
<link rev=made href="mailto:www@openbsd.org"> |
<link rev=made href="mailto:www@openbsd.org"> |
<meta name="resource-type" content="document"> |
<meta name="resource-type" content="document"> |
<meta name="description" content="stable"> |
<meta name="description" content="stable"> |
<meta name="keywords" content="openbsd,anoncvs,updates,stable"> |
<meta name="keywords" content="openbsd,anoncvs,updates,stable"> |
<meta name="distribution" content="global"> |
<meta name="distribution" content="global"> |
<meta name="copyright" content="This document copyright 1996-2006 by OpenBSD."> |
<meta name="copyright" content="This document copyright 1996-2007 by OpenBSD."> |
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> |
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> |
</head> |
</head> |
|
|
|
|
<!-- Passes validator.w3.org, please keep it this way; |
<!-- Passes validator.w3.org, please keep it this way; |
please, use a max of 72 chars per line --> |
please, use a max of 72 chars per line --> |
|
|
<a href="index.html"><img alt="[OpenBSD]" height="30" width="141" src="images/smalltitle.gif" border="0"></a> |
<a href="index.html"> |
|
<img alt="[OpenBSD]" height=30 width=141 src="images/smalltitle.gif" border="0"> |
|
</a> |
|
|
<p> |
<p> |
<h2><font color="#e00000">Patch Branches</font></h2> |
<h1><font color="#e00000">Following <i>-stable</i> (the "Patch |
|
branch")</font></h1> |
<hr> |
<hr> |
|
|
<p> |
|
<h3>Table Of Contents</h3> |
<h3>Table Of Contents</h3> |
|
<p> |
<ul> |
<ul> |
<li><a href="#whatis">What is the patch branch?</a> |
<li><a href="#whatis">What is the <i>-stable</i> (patch) branch?</a> |
<li><a href="#getting">Getting the patch branch</a> |
<li><a href="#getting">Getting <i>-stable</i> source code</a> |
<li><a href="#building">Building from the patch branch</a> |
<li><a href="#building">Building OpenBSD <i>-stable</i></a> |
</ul> |
</ul> |
<hr> |
<hr> |
|
|
|
|
important patches and fixes (i.e. those from the |
important patches and fixes (i.e. those from the |
<a href="errata.html">errata</a> plus others which are obvious and simple, |
<a href="errata.html">errata</a> plus others which are obvious and simple, |
but do not deserve an errata entry) |
but do not deserve an errata entry) |
and makes it available via <a href="anoncvs.html">CVS</a> in addition to the |
and makes it available via <a href="anoncvs.html">CVS</a>, in addition to the |
current source. Thus, users can choose three options :<p> |
<i>-current</i> source. Thus, users can choose three options :<p> |
<ul> |
<ul> |
<li>Stick with our latest release and apply the patches by hand. |
<li>Stick with our latest release and apply the patches by hand. |
<li>Use the <b>patch branch</b> which has the most important patches applied. |
<li>Use the <b>patch branch</b> which has those patches and some others |
|
applied. |
<li>Use <b>current source</b> for all of the latest features. |
<li>Use <b>current source</b> for all of the latest features. |
</ul> |
</ul> |
<p> |
<p> |
<!-- The <a href="plus.html">Daily Changelog</a> details (amoung other things) |
<!-- The <a href="plus.html">Daily Changelog</a> details (amoung other things) |
which post-release changes have made it into the patch branch. --> |
which post-release changes have made it into the patch branch. --> |
As a general principle, all |
As a general principle, all |
<a href="errata.html">Errata</a> entries will be merged into the patch |
<a href="errata.html">errata</a> entries will be merged into the patch |
branch within 48 hours of when an errata is published. Other post release |
branch within 48 hours of when an errata is published. Other post release |
patches may be merged in as well, subject to a number of conditions: |
patches may be merged in as well, subject to a number of conditions: |
<ul> |
<ul> |
|
|
<li>Please do not ask for large subsystems or patches to be merged. |
<li>Please do not ask for large subsystems or patches to be merged. |
Maintaining the patch tree takes a lot of effort which could be |
Maintaining the patch tree takes a lot of effort which could be |
better spent on making our next release better. |
better spent on making our next release better. |
|
<li>New or changed functionality, hardware support or APIs will |
|
<i>not</i> be merged. |
|
In general, if it requires a man page change, it will NOT be a |
|
candidate for the patch branch. |
<li>As an exception to the above rules, OpenSSH release versions will be |
<li>As an exception to the above rules, OpenSSH release versions will be |
merged into the patch branch. |
merged into the patch branch. |
</ul> |
</ul> |
<p> |
<p> |
|
|
|
It is worth pointing out the name <i>-stable</i> refers ONLY to the API |
|
and operations of OpenBSD not changing, not the overall reliability of |
|
the system. |
|
In fact, if things go as desired, the <i>-current</i> |
|
<a href="faq/faq5.html#Flavors">flavor</a> of OpenBSD, on its way to |
|
becoming the next <i>-release</i>, will be an improvement in |
|
reliability, security and overall quality over the previous |
|
<i>-release</i> and <i>-stable</i>. |
|
|
<a name="getting"></a> |
<a name="getting"></a> |
<h3><font color="#0000e0">Getting a stable branch</font></h3> |
<h3><font color="#0000e0">Getting <i>-stable</i> source code</font></h3> |
|
|
<p> |
<p> |
To obtain the patch branch for a particular release of OpenBSD, you |
To obtain the patch branch for a particular release of OpenBSD, you |
|
|
Note that patch branches do not help to upgrade from one release of |
Note that patch branches do not help to upgrade from one release of |
OpenBSD to another, e.g. to go from 3.9 to 4.0. They only provide |
OpenBSD to another, e.g. to go from 3.9 to 4.0. They only provide |
a means for staying up to date with the patches within a given release. |
a means for staying up to date with the patches within a given release. |
If you are trying to go from one release to another via source, please visit |
|
the <a href="faq/upgrade40.html">upgrade guide</a>. |
<p> |
|
Do not attempt to go from one release to another via source. |
|
Instead, please visit the <a href="faq/upgrade40.html">upgrade guide</a>. |
Also, you cannot go backwards, from -current back to -stable, because of |
Also, you cannot go backwards, from -current back to -stable, because of |
library versioning problems. |
library versioning problems and other changes. |
|
|
<a name="building"></a> |
<a name="building"></a> |
<h3><font color="#0000e0">Building from an OpenBSD patch branch</font></h3> |
<h3><font color="#0000e0">Building OpenBSD <i>-stable</i></font></h3> |
|
Full details on building from source are provided in |
|
<a href="faq/faq5.html">FAQ 5 - Building the System from Source</a>. |
|
This is a simplified summary. |
|
|
|
<p> |
Once you have obtained a source tree via <a href="anoncvs.html">anoncvs</a>, |
Once you have obtained a source tree via <a href="anoncvs.html">anoncvs</a>, |
you must rebuild the system. The stages for doing so are: |
you must rebuild the system. The stages for doing so are: |
|
|
|
|
To reboot with the newly compiled kernel: |
To reboot with the newly compiled kernel: |
<blockquote><pre> |
<blockquote><pre> |
# <strong>cd /usr/src/sys/arch/i386/compile/GENERIC</strong> |
# <strong>cd /usr/src/sys/arch/i386/compile/GENERIC</strong> |
# <strong>cp /bsd /bsd.old</strong> <i>(Save an old copy of your kernel)</i> |
# <strong>make install</strong> <i>(Safely install new kernel)</i> |
# <strong>cp bsd /bsd</strong> <i>(Copy the new kernel into place)</i> |
|
# <strong>reboot</strong> |
# <strong>reboot</strong> |
</pre></blockquote> |
</pre></blockquote> |
|
|
<p> |
<p> |
As above, substitute your architecture for <i>i386</i>. If your system has |
As above, substitute your architecture for <i>i386</i>. If your system has |
trouble booting the new kernel, you can easily go back and reboot from the |
trouble booting the new kernel, you can easily go back and reboot from the |
old kernel, now called <i>bsd.old</i>. |
old kernel, now called <i>obsd</i>. |
|
|
<h4><font color="#0000e0">Rebuilding the binaries</font></h4> |
<h4><font color="#0000e0">Rebuilding the binaries</font></h4> |
|
|
|
|
</pre></blockquote> |
</pre></blockquote> |
|
|
<p>This will take awhile... |
<p>This will take awhile... |
|
|
|
<p> |
|
If you have a number of machines to keep at <i>-stable</i>, you may wish to |
|
make a <a href="faq/faq5.html#Release">release</a>, creating the |
|
standard install <a href="faq/faq4.html#FilesNeeded">file sets</a>, |
|
which can then be quickly and easily installed on any machine of the |
|
same <a href="plat.html">platform</a>. |
|
|
<hr> |
<hr> |
<a href=index.html><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a> |
<a href=index.html><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a> |
<a href="mailto:www@openbsd.org">www@openbsd.org</a> |
<a href="mailto:www@openbsd.org">www@openbsd.org</a> |