git: 0e7cd233ef - main - Remove defunct 11 RELEASE
Muhammad Moinur Rahman <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/doc/commit/?id=0e7cd233ef49952e967f3ed719921004ac4e777d commit 0e7cd233ef49952e967f3ed719921004ac4e777d Author: Muhammad Moinur Rahman <[email protected]> AuthorDate: 2022-10-08 20:01:04 +0000 Commit: Muhammad Moinur Rahman <[email protected]> CommitDate: 2022-10-08 20:01:04 +0000 Remove defunct 11 RELEASE Some of the documentation still refers 11.X RELEASE. Update those to match latest 13.X or 12.X releases. - Remove trailing whitespaces - Remove trailing blank lines PR: 264766 Approved by: carlavilla (mentor) --- .../content/en/books/handbook/ports/_index.adoc | 44 ++++++------- .../en/books/porters-handbook/testing/_index.adoc | 76 +++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/documentation/content/en/books/handbook/ports/_index.adoc b/documentation/content/en/books/handbook/ports/_index.adoc index c8570a14b1..9ef5fc049d 100644 --- a/documentation/content/en/books/handbook/ports/_index.adoc +++ b/documentation/content/en/books/handbook/ports/_index.adoc @@ -1183,25 +1183,25 @@ The default is the architecture shown by `uname`. [source,shell] .... -# poudriere jail -c -j 11amd64 -v 11.4-RELEASE -[00:00:00] Creating 11amd64 fs at /poudriere/jails/11amd64... done -[00:00:00] Using pre-distributed MANIFEST for FreeBSD 11.4-RELEASE amd64 -[00:00:00] Fetching base for FreeBSD 11.4-RELEASE amd64 -/poudriere/jails/11amd64/fromftp/base.txz 125 MB 4110 kBps 31s +# poudriere jail -c -j 13amd64 -v 13.1-RELEASE +[00:00:00] Creating 13amd64 fs at /poudriere/jails/13amd64... done +[00:00:00] Using pre-distributed MANIFEST for FreeBSD 13.1-RELEASE amd64 +[00:00:00] Fetching base for FreeBSD 13.1-RELEASE amd64 +/poudriere/jails/13amd64/fromftp/base.txz 125 MB 4110 kBps 31s [00:00:33] Extracting base... done -[00:00:54] Fetching src for FreeBSD 11.4-RELEASE amd64 -/poudriere/jails/11amd64/fromftp/src.txz 154 MB 4178 kBps 38s +[00:00:54] Fetching src for FreeBSD 13.1-RELEASE amd64 +/poudriere/jails/13amd64/fromftp/src.txz 154 MB 4178 kBps 38s [00:01:33] Extracting src... done -[00:02:31] Fetching lib32 for FreeBSD 11.4-RELEASE amd64 -/poudriere/jails/11amd64/fromftp/lib32.txz 24 MB 3969 kBps 06s +[00:02:31] Fetching lib32 for FreeBSD 13.1-RELEASE amd64 +/poudriere/jails/13amd64/fromftp/lib32.txz 24 MB 3969 kBps 06s [00:02:38] Extracting lib32... done [00:02:42] Cleaning up... done [00:02:42] Recording filesystem state for clean... done [00:02:42] Upgrading using ftp -/etc/resolv.conf -> /poudriere/jails/11amd64/etc/resolv.conf +/etc/resolv.conf -> /poudriere/jails/13amd64/etc/resolv.conf Looking up update.FreeBSD.org mirrors... 3 mirrors found. Fetching public key from update4.freebsd.org... done. -Fetching metadata signature for 11.4-RELEASE from update4.freebsd.org... done. +Fetching metadata signature for 13.1-RELEASE from update4.freebsd.org... done. Fetching metadata index... done. Fetching 2 metadata files... done. Inspecting system... done. @@ -1210,7 +1210,7 @@ Fetching 124 patches.....10....20....30....40....50....60....70....80....90....1 Applying patches... done. Fetching 6 files... done. The following files will be added as part of updating to -11.4-RELEASE-p1: +13.1-RELEASE-p1: /usr/src/contrib/unbound/.github /usr/src/contrib/unbound/.github/FUNDING.yml /usr/src/contrib/unbound/contrib/drop2rpz @@ -1219,14 +1219,14 @@ The following files will be added as part of updating to /usr/src/contrib/unbound/services/rpz.h /usr/src/lib/libc/tests/gen/spawnp_enoexec.sh The following files will be updated as part of updating to -11.4-RELEASE-p1: +13.1-RELEASE-p1: […] Installing updates...Scanning //usr/share/certs/blacklisted for certificates... Scanning //usr/share/certs/trusted for certificates... done. -11.4-RELEASE-p1 +13.1-RELEASE-p1 [00:04:06] Recording filesystem state for clean... done -[00:04:07] Jail 11amd64 11.4-RELEASE-p1 amd64 is ready to be used +[00:04:07] Jail 13amd64 13.1-RELEASE-p1 amd64 is ready to be used .... [source,shell] @@ -1241,10 +1241,10 @@ Custom configurations for these combinations are called _sets_. See the CUSTOMIZATION section of man:poudriere[8] for details after package:ports-mgmt/poudriere[] or package:ports-mgmt/poudriere-devel[] is installed. The basic configuration shown here puts a single jail-, port-, and set-specific [.filename]#make.conf# in [.filename]#/usr/local/etc/poudriere.d#. -The filename in this example is created by combining the jail name, port name, and set name: [.filename]#11amd64-local-workstation-make.conf#. +The filename in this example is created by combining the jail name, port name, and set name: [.filename]#13amd64-local-workstation-make.conf#. The system [.filename]#make.conf# and this new file are combined at build time to create the [.filename]#make.conf# used by the build jail. -Packages to be built are entered in [.filename]#11amd64-local-workstation-pkglist#: +Packages to be built are entered in [.filename]#13amd64-local-workstation-pkglist#: [.programlisting] .... @@ -1258,14 +1258,14 @@ Options and dependencies for the specified ports are configured: [source,shell] .... -# poudriere options -j 11amd64 -p local -z workstation -f 11amd64-local-workstation-pkglist +# poudriere options -j 13amd64 -p local -z workstation -f 13amd64-local-workstation-pkglist .... Finally, packages are built and a package repository is created: [source,shell] .... -# poudriere bulk -j 11amd64 -p local -z workstation -f 11amd64-local-workstation-pkglist +# poudriere bulk -j 13amd64 -p local -z workstation -f 13amd64-local-workstation-pkglist .... While running, pressing kbd:[Ctrl+t] displays the current state of the build. @@ -1289,15 +1289,15 @@ FreeBSD: { .... Usually it is easiest to serve a poudriere repository to the client machines via HTTP. -Set up a webserver to serve up the package directory, for instance: [.filename]#/usr/local/poudriere/data/packages/11amd64#, where [.filename]#11amd64# is the name of the build. +Set up a webserver to serve up the package directory, for instance: [.filename]#/usr/local/poudriere/data/packages/13amd64#, where [.filename]#13amd64# is the name of the build. -If the URL to the package repository is: `http://pkg.example.com/11amd64`, +If the URL to the package repository is: `http://pkg.example.com/13amd64`, then the repository configuration file in [.filename]#/usr/local/etc/pkg/repos/custom.conf# would look like: [.programlisting] .... custom: { - url: "http://pkg.example.com/11amd64", + url: "http://pkg.example.com/13amd64", enabled: yes, } .... diff --git a/documentation/content/en/books/porters-handbook/testing/_index.adoc b/documentation/content/en/books/porters-handbook/testing/_index.adoc index c32e4205ac..9491c07530 100644 --- a/documentation/content/en/books/porters-handbook/testing/_index.adoc +++ b/documentation/content/en/books/porters-handbook/testing/_index.adoc @@ -277,21 +277,21 @@ Create the base jails which Poudriere will use for building: [source,shell] .... -# poudriere jail -c -j 114Ramd64 -v 11.4-RELEASE -a amd64 +# poudriere jail -c -j 131Ramd64 -v 13.1-RELEASE -a amd64 .... -Fetch a `11.4-RELEASE` for `amd64` from the FTP server given by `FREEBSD_HOST` in [.filename]#poudriere.conf#, -create the zfs file system `tank/poudriere/jails/114Ramd64`, -mount it on [.filename]#/poudriere/jails/114Ramd64# and extract the `11.4-RELEASE` tarballs into this file system. +Fetch a `13.1-RELEASE` for `amd64` from the FTP server given by `FREEBSD_HOST` in [.filename]#poudriere.conf#, +create the zfs file system `tank/poudriere/jails/131Ramd64`, +mount it on [.filename]#/poudriere/jails/131Ramd64# and extract the `13.1-RELEASE` tarballs into this file system. [source,shell] .... -# poudriere jail -c -j 11i386 -v stable/11 -a i386 -m git+https +# poudriere jail -c -j 12i386 -v stable/12 -a i386 -m git+https .... -Create `tank/poudriere/jails/11i386`, mount it on [.filename]#/poudriere/jails/11i386#, -then check out the tip of the Subversion branch of `FreeBSD-11-STABLE` from `SVN_HOST` in [.filename]#poudriere.conf# into [.filename]#/poudriere/jails/11i386/usr/src#, -then complete a `buildworld` and install it into [.filename]#/poudriere/jails/11i386#. +Create `tank/poudriere/jails/12i386`, mount it on [.filename]#/poudriere/jails/12i386#, +then check out the tip of the Subversion branch of `FreeBSD-12-STABLE` from `SVN_HOST` in [.filename]#poudriere.conf# into [.filename]#/poudriere/jails/12i386/usr/src#, +then complete a `buildworld` and install it into [.filename]#/poudriere/jails/12i386#. [TIP] ==== @@ -300,7 +300,7 @@ For example: [source,shell] .... -# poudriere jail -c -j 11i386 -v stable/11@123456 -a i386 -m git+https +# poudriere jail -c -j 12i386 -v stable/12@123456 -a i386 -m git+https .... ==== @@ -308,8 +308,8 @@ For example: [NOTE] ==== While it is possible to build a newer version of FreeBSD on an older version, most of the time it will not run. -For example, if a `stable/11` jail is needed, the host will have to run `stable/11` too. -Running `11.4-RELEASE` is not enough. +For example, if a `stable/13` jail is needed, the host will have to run `stable/13` too. +Running `13.1-RELEASE` is not enough. ==== [NOTE] @@ -323,8 +323,8 @@ To create a Poudriere jail for `14.0-CURRENT`: In order to run a `14.0-CURRENT` Poudriere jail you must be running `14.0-CURRENT`. In general, newer kernels can build and run older jails. -For instance, a `14.0-CURRENT` kernel can build and run a `11.4-STABLE`. -Poudriere jail if the `COMPAT_FREEBSD11` kernel option was compiled in (on by default in `14.0-CURRENT`[.filename]#GENERIC# kernel config). +For instance, a `14.0-CURRENT` kernel can build and run a `12.3-STABLE`. +Poudriere jail if the `COMPAT_FREEBSD12` kernel option was compiled in (on by default in `14.0-CURRENT`[.filename]#GENERIC# kernel config). ==== [CAUTION] @@ -340,8 +340,8 @@ A list of jails currently known to Poudriere can be shown with `poudriere jail - .... # poudriere jail -l JAILNAME VERSION ARCH METHOD -114Ramd64 11.4-RELEASE amd64 ftp -11i386 11.4-STABLE i386 svn+https +131Ramd64 13.1-RELEASE amd64 ftp +12i386 12.3-STABLE i386 git+https .... [[testing-poudriere-maintaining-jails]] @@ -482,11 +482,11 @@ They must be updated manually by the porter. After jails and ports trees have been set up, the result of a contributor's modifications to the ports tree can be tested. -For example, local modifications to the package:www/firefox[] port located in [.filename]#/work/ports/www/firefox# can be tested in the previously created 11.4-RELEASE jail: +For example, local modifications to the package:www/firefox[] port located in [.filename]#/work/ports/www/firefox# can be tested in the previously created 13.1-RELEASE jail: [source,shell] .... -# poudriere testport -j 114Ramd64 -p development -o www/firefox +# poudriere testport -j 131Ramd64 -p development -o www/firefox .... This will build all dependencies of Firefox. @@ -494,10 +494,10 @@ If a dependency has been built previously and is still up-to-date, the pre-built If a dependency has no up-to-date package, one will be built with default options in a jail. Then Firefox itself is built. -The complete build of every port is logged to [.filename]#/poudriere/data/logs/bulk/114Ri386-development/build-time/logs#. +The complete build of every port is logged to [.filename]#/poudriere/data/logs/bulk/131Ri386-development/build-time/logs#. -The directory name `114Ri386-development` is derived from the arguments to `-j` and `-p`, respectively. -For convenience, a symbolic link [.filename]#/poudriere/data/logs/bulk/114Ri386-development/latest# is also maintained. +The directory name `131Ri386-development` is derived from the arguments to `-j` and `-p`, respectively. +For convenience, a symbolic link [.filename]#/poudriere/data/logs/bulk/131Ri386-development/latest# is also maintained. The link points to the latest _build-time_ directory. Also in this directory is an [.filename]#index.html# for observing the build process with a web browser. @@ -506,7 +506,7 @@ To ease investigation, jails can be kept running after the build by adding `-i` [source,shell] .... -# poudriere testport -j 114Ramd64 -p development -i -o www/firefox +# poudriere testport -j 131Ramd64 -p development -i -o www/firefox .... After the build completes, and regardless of whether it was successful, a shell is provided within the jail. @@ -517,16 +517,16 @@ It is then possible to man:jexec[8] into it: [source,shell] .... -# poudriere testport -j 114Ramd64 -p development -I -o www/firefox +# poudriere testport -j 131Ramd64 -p development -I -o www/firefox [...] ====>> Installing local Pkg repository to /usr/local/etc/pkg/repos -====>> Leaving jail 114Ramd64-development-n running, mounted at /poudriere/data/.m/114Ramd64-development/ref for interactive run testing -====>> To enter jail: jexec 114Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root -====>> To stop jail: poudriere jail -k -j 114Ramd64 -p development -# jexec 114Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root +====>> Leaving jail 131Ramd64-development-n running, mounted at /poudriere/data/.m/131Ramd64-development/ref for interactive run testing +====>> To enter jail: jexec 131Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root +====>> To stop jail: poudriere jail -k -j 131Ramd64 -p development +# jexec 131Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root # [do some stuff in the jail] # exit -# poudriere jail -k -j 114Ramd64 -p development +# poudriere jail -k -j 131Ramd64 -p development ====>> Umounting file systems .... @@ -563,17 +563,17 @@ For instance, testing package:www/firefox[] in a specific set named `devset`, ad [source,shell] .... -# poudriere testport -j 114Ramd64 -p development -z devset -o www/firefox +# poudriere testport -j 131Ramd64 -p development -z devset -o www/firefox .... This will look for the existence of these directories in this order: -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-devset-options# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-devset-options# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-options# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-development-devset-options# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-devset-options# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-development-options# * [.filename]#/usr/local/etc/poudriere.d/devset-options# * [.filename]#/usr/local/etc/poudriere.d/development-options# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-options# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-options# * [.filename]#/usr/local/etc/poudriere.d/options# From this list, Poudriere man:nullfs[5]-mounts the _first existing_ directory tree into the [.filename]#/var/db/ports# directory of the build jails. @@ -606,7 +606,7 @@ Instead, Poudriere looks for existing files matching a name scheme derived from [source,shell] .... -# poudriere testport -j 114Ramd64 -p development -z devset -o www/firefox +# poudriere testport -j 131Ramd64 -p development -z devset -o www/firefox .... causes Poudriere to check for the existence of these files in this order: @@ -614,14 +614,14 @@ causes Poudriere to check for the existence of these files in this order: * [.filename]#/usr/local/etc/poudriere.d/make.conf# * [.filename]#/usr/local/etc/poudriere.d/devset-make.conf# * [.filename]#/usr/local/etc/poudriere.d/development-make.conf# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-make.conf# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-make.conf# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-devset-make.conf# -* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-devset-make.conf# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-make.conf# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-development-make.conf# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-devset-make.conf# +* [.filename]#/usr/local/etc/poudriere.d/131Ramd64-development-devset-make.conf# Unlike with sets, all of the found files will be appended, _in that order_, into one [.filename]#make.conf# inside the build jails. It is hence possible to have general make variables, intended to affect all builds in [.filename]#/usr/local/etc/poudriere.d/make.conf#. -Special variables, intended to affect only certain jails or sets can be set in specialised [.filename]#make.conf# files, such as [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-devset-make.conf#. +Special variables, intended to affect only certain jails or sets can be set in specialised [.filename]#make.conf# files, such as [.filename]#/usr/local/etc/poudriere.d/131Ramd64-development-devset-make.conf#. [[testing-poudriere-sets-perl]] .Using [.filename]#make.conf# to Change Default Perl