=================================================================== RCS file: /cvsrepo/anoncvs/cvs/www/stable.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- www/stable.html 2016/01/31 01:13:42 1.39 +++ www/stable.html 2016/02/04 00:22:20 1.40 @@ -3,7 +3,7 @@ Following -stable - + @@ -17,7 +17,7 @@

-

Following -stable (the "Patch +

Following -stable (the "patch branch")


@@ -25,58 +25,57 @@

What is the -stable (patch) branch?

-

-OpenBSD provides a source tree that contains -important patches and fixes (i.e. those from the -errata plus others which are obvious and simple, -but do not deserve an errata entry) +OpenBSD provides a source tree that contains important patches and fixes +(i.e. those from the errata, plus others which +are obvious and simple, but do not deserve an errata entry) and makes it available via CVS, in addition to the --current source. Thus, users can choose three options :

+-current source. +Thus, users can choose three options: + +

+

- -As a general principle, all -errata entries will be merged into the patch -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: +As a general principle, all errata entries will +be merged into the patch branch shortly before/after they are published. +Other post-release patches may be merged in as well, subject to a number +of conditions: +

-

+

It is worth pointing out the name -stable 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 -current flavor of OpenBSD, on its way to -becoming the next -release, will be an improvement in -reliability, security and overall quality over the previous --release and -stable. +becoming the next -release, will be an improvement in reliability, +security and overall quality over the previous -release and +-stable.

Getting -stable source code

-

-To obtain the patch branch for a particular release of OpenBSD, you -can update on top of a pre-existing source tree -(from a mirror or the CD) -or you can grab the source tree freshly from -an AnonCVS server. +To obtain the patch branch for a particular release of OpenBSD, you can +update on top of a pre-existing source tree (from +a mirror or the CD), or you can grab a +fresh source tree from an AnonCVS server. Instructions for getting the patch branch and staying up to date are described in the Getting Started section of the AnonCVS documentation. @@ -92,74 +91,72 @@

Building OpenBSD -stable

+ Full details on building from source are provided in FAQ 5 - Building the System from Source. This is a simplified summary.

-Once you have obtained a source tree via AnonCVS, -you must rebuild the system. The stages for doing so are: +Once you have obtained a source tree via CVS, +you must rebuild the system. +The steps for doing so are:

Rebuilding the kernel

-

To rebuild the default kernel from stable: +

-# cd /usr/src/sys/arch/i386/conf
-# /usr/sbin/config GENERIC
-# cd /usr/src/sys/arch/i386/compile/GENERIC
-# make clean && make
+# cd /usr/src/sys/arch/$(uname -m)/conf
+# config GENERIC
+# cd /usr/src/sys/arch/$(uname -m)/compile/GENERIC
+# make clean && make
 
-

-Replace i386 with your architecture, e.g. -sparc, alpha, etc. Replace GENERIC with -GENERIC.MP for multiprocessor systems. +Replace GENERIC with GENERIC.MP for multiprocessor systems.

Rebooting with the new kernel

-

To reboot with the newly compiled kernel: +

-# cd /usr/src/sys/arch/i386/compile/GENERIC
-# make install          (Safely install new kernel)
-# reboot
+# cd /usr/src/sys/arch/$(uname -m)/compile/GENERIC
+# make install
+# reboot
 
-

-As above, substitute your architecture for i386. If your system has -trouble booting the new kernel, you can easily go back and reboot from the -old kernel, now called obsd. +If your system has trouble booting the new kernel, you can easily go back +and reboot from the old kernel, now called obsd. -

Rebuilding the binaries

+

Rebuilding the userland

-

To rebuild the system binaries: +To rebuild the base system binaries: +

-# rm -rf /usr/obj/*
-# cd /usr/src
-# make obj
-# cd /usr/src/etc && env DESTDIR=/ make distrib-dirs
-# cd /usr/src
-# make build
+# rm -rf /usr/obj/*
+# cd /usr/src
+# make obj
+# cd /usr/src/etc && env DESTDIR=/ make distrib-dirs
+# cd /usr/src
+# make build
 
-

This will take some time. -Depending on the speed of the system, it may take less than an hour to -a week or more. +This may take some time, depending on the speed of your system. +Use of the root account can be limited to only the final step if you +follow the instructions in FAQ 5.

-If you have a number of machines to keep at -stable, you may wish to -make a release, creating the -standard install file sets, -which can then be quickly and easily installed on any machine of the -same platform. +If you have a number of machines to keep on the -stable branch, +you may wish to make a release by +creating file sets that can be +quickly and easily installed on any machine of the same platform. +The +release(8) man page contains all the relevant information. -