[gentoo-commits] proj/catalyst:master commit in: doc/

[gentoo-commits] proj/catalyst:master commit in: doc/

[Sebastian Pipping]

commit:     bd57e84dedbd0b696dfd94ed759b3691e5de4fc3
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 17:43:58 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 17:55:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bd57e84d

Man page: Add Matt to authors

---
 doc/catalyst.1.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt
index ca706d1..b7807a5 100644
--- a/doc/catalyst.1.txt
+++ b/doc/catalyst.1.txt
@@ -137,3 +137,4 @@ AUTHORS
 - Chris Gianelloni <wolf31o2@gentoo.org>
 - Raul Porcel <armin76@gentoo.org>
 - Sebastian Pipping <sping@gentoo.org>
+- Matt Turner <mattst88@gentoo.org>

[gentoo-commits] proj/catalyst:master commit in: doc/

[Sebastian Pipping]

commit:     9f6bfa783a4077b934ec46ca4f6a7ab167618a89
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 15:44:54 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 17:54:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9f6bfa78

Man page: Fix synopsis

---
 doc/catalyst.1.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt
index 67f4df6..ea65264 100644
--- a/doc/catalyst.1.txt
+++ b/doc/catalyst.1.txt
@@ -11,7 +11,7 @@ catalyst - The Gentoo Linux Release Engineering meta-tool
 
 SYNOPSIS
 --------
-*catalyst* ['OPTIONS'] [*-f* 'FILE' | *-C* 'KEYS' | *-s* 'DATE'] ...
+*catalyst* ['OPTIONS'] [*-f* 'FILE' | *-C* 'KEY'='VALUE' ... | *-s* 'DATE']
 
 
 DESCRIPTION
@@ -33,7 +33,7 @@ OPTIONS
 This option is to be used to clear any autoresume points that have been saved
 for this target. It is used in conjunction with *-f*, *-C*, or both.
 
-*--cli*|*-C* 'KEY'='VALUE' ..::
+*--cli*|*-C* 'KEY'='VALUE' ...::
 This option is to be used in place of a specfile. All options are passed
 to *catalyst* on the commandline. Please note that this option must
 be the last option passed to *catalyst* for everything to work correctly.

[gentoo-commits] proj/catalyst:master commit in: doc/

[Sebastian Pipping]

commit:     6d4fa9721b614d9471867fb3a753db65c250e982
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 15:59:11 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 17:55:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6d4fa972

Man page: Remove acute as man does not seem to render acutes properly

---
 doc/catalyst.1.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt
index ea65264..ca706d1 100644
--- a/doc/catalyst.1.txt
+++ b/doc/catalyst.1.txt
@@ -135,5 +135,5 @@ AUTHORS
 -------
 - John Davis <zhen@gentoo.org>
 - Chris Gianelloni <wolf31o2@gentoo.org>
-- Raúl Porcel <armin76@gentoo.org>
+- Raul Porcel <armin76@gentoo.org>
 - Sebastian Pipping <sping@gentoo.org>

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     9eb3f25aa9f1e05d9cd36532e4fe07b22bd1f63c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 17:08:32 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Jul 19 17:08:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9eb3f25a

Fix man page to put mips64 and mips64el in the same section

Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

---
 doc/make_subarch_table_guidexml.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py
index 94c4af0..8652599 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -16,6 +16,7 @@ _pattern_arch_genericliases = {
 	'armeb':'arm',
 	'sheb':'sh',
 	'mipsel':'mips',
+	'mips64el':'mips64',
 }
 
 

[gentoo-commits] proj/catalyst:master commit in: doc/

[Richard Farina]

commit:     0342a3f3f21f23a57f3c2483ecc11607bf973a14
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 22:12:52 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 22:12:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0342a3f3

fix make dist for python2

---
 doc/make_subarch_table_guidexml.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py
index 8754c8a..16c8776 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 # Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org>
 # Licensed under GPL v2 or later
 

[gentoo-commits] proj/catalyst:master commit in: doc/

[Richard Farina]

commit:     2b29951a19e6c5fcf485e2ec5485da995a72754f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:28:18 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:28:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2b29951a

more forcing of python2 for make dist

---
 doc/make_target_table.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/make_target_table.py b/doc/make_target_table.py
index e5e25f0..ad4d292 100755
--- a/doc/make_target_table.py
+++ b/doc/make_target_table.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Copyright (C) 2012 W. Trevor King <wking@drexel.edu>
 # Copyright (C) 2012 Sebastian Pipping <sebastian@pipping.org>
 # Licensed under GPL v2 or later

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     bc6104b2637f3d30c717ec5ed5ecf8f220ff6c96
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Nov 11 00:15:20 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Nov 21 05:20:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bc6104b2

Document the update_seed option

---
 doc/catalyst-spec.5.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 3be96fe..9a44558 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -131,6 +131,11 @@ Since GRP is capable of building packages/source sets for more than
 one CD, this defines the layout for the directories under
 `$storedir/builds` (example: `src cd2`).
 
+*update_seed*::
+This is an optional setting supported by stage1 that runs an emerge
+command on the seed stage before starting the stage1 build. (example:
+`--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`)
+
 Compilation
 ~~~~~~~~~~~
 

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     9e777a5f339d6daeaaad6af032baae509f940346
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Feb  9 20:40:33 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 02:39:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9e777a5f

doc/HOWTO.txt: Explain how to run catalyst without installing

Thanks to Chris White for explaining this to me.

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 doc/HOWTO.txt |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index ea9c8f4..5717f80 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -202,3 +202,18 @@ and `dd`:
 replacing `X` with the appropriate drive letter for your USB disk.
 See https://bugs.gentoo.org/show_bug.cgi?id=251719[bug 251719] for
 details.
+
+Running catalyst from a Git checkout
+------------------------------------
+
+If you're developing catalyst, you'll want to test your altered
+version.  An easy way to run it without reinstalling is to setup a
+local configuration file and run:
+
+    # ./catalyst -c catalyst.conf -f path/to/your.spec
+
+The local configuration file can use all the defaults except for
+`sharedir`, which you should change to point to your development
+directory:
+
+    sharedir="/home/wking/src/catalyst"

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     b7f2cf0f4c34af8d2dd9dcfa186930c17323e298
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Feb  9 20:40:30 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 02:39:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b7f2cf0f

doc/HOWTO: First pass at a gentle Catalyst introduction

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 doc/HOWTO.txt |  204 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 204 insertions(+), 0 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
new file mode 100644
index 0000000..ea9c8f4
--- /dev/null
+++ b/doc/HOWTO.txt
@@ -0,0 +1,204 @@
+Catalyst is a release-buildcing tool for Gentoo.  If you use Gentoo
+and want to roll your own live CD or bootable USB stick, this is the
+way to go.  First, get a Gentoo development box and install the
+necessary tools:
+
+    # emerge -av dev-util/catalyst
+
+Configure catalyst by editing `/etc/catalyst/catalyst.conf`, which is
+well commented.  This sets up defaults such as hashing algorithms and
+storage directories.  The defaults will probably be fine unless disk
+space is an issue.
+
+Assembling a starting point
+---------------------------
+
+Portage snapshot
+~~~~~~~~~~~~~~~~
+
+Create a snapshot of your current Portage tree (you may want to
+`emerge --sync` first):
+
+    # catalyst --snapshot 20130131
+    # ls /var/tmp/catalyst/snapshots/
+    portage-20130131.tar.bz2
+    portage-20130131.tar.bz2.CONTENTS
+    portage-20130131.tar.bz2.DIGESTS
+
+where the storage location is relative to the default
+`$storedir=/var/tmp/catalyst`.
+
+Stage3 tarball
+~~~~~~~~~~~~~~
+
+Get a stage3 tarball (containing the build tools you'll need to
+construct your stage1) from your local
+http://www.gentoo.org/main/en/mirrors.xml[Gentoo mirror].
+
+    $GENTOO_MIRROR/releases/$ARCH/current-stage3/
+
+For example,
+
+    http://distfiles.gentoo.org/releases/amd64/current-stage3/stage3-amd64-20121213.tar.bz2
+
+Grab the tarball and put it where catalyst will find it:
+
+    # wget http://…/stage3-amd64-20121213.tar.bz2
+    # wget http://…/stage3-amd64-20121213.tar.bz2.CONTENTS
+    # wget http://…/stage3-amd64-20121213.tar.bz2.DIGESTS.asc
+    # sha512sum -c stage3-amd64-20121213.tar.bz2.DIGESTS.asc
+    # gpg --verify stage3-amd64-20121213.tar.bz2.DIGESTS.asc
+    # mv stage3-amd64-20121213.tar.bz2* /var/tmp/catalyst/builds/default/
+
+where the storage dir is `$storedir/builds/$source_subpath`
+(`$storedir` from `catalyst.conf`, `$source_subpath` from your
+`*.spec` file).
+
+`.*spec` files
+~~~~~~~~~~~~~~
+
+`.*spec` files tell catalyst about the system you're trying to build.
+There are a number of examples distributed with catalyst.  Look in
+`/usr/share/doc/catalyst-*/examples/`.  A minimal `*.spec` file for
+this example is:
+
+    # cat default-stage1-amd64-2013.1.spec
+    subarch: amd64
+    version_stamp: 2013.1
+    target: stage1
+    rel_type: default
+    profile: default/linux/amd64/10.0/no-multilib
+    snapshot: 20130131
+    source_subpath: default/stage3-amd64-20121213
+
+You may need to adjust the `subarch`, `snapshot`, and `source_subpath`
+fields of the `*.spec` to match your target host, Portage snapshot,
+and stage3 tarball name respectively.
+
+For more details on what can go into a `*.spec` file, see
+`catalyst-spec(5)`.
+
+Building stage1
+---------------
+
+Now that everything's setup, run catalyst:
+
+    # catalyst -f default-stage1-amd64-2013.1.spec
+
+which will build the target and install something like:
+
+    # ls /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.*
+    /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2
+    /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2.CONTENTS
+    /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2.DIGESTS
+
+The name is an expansion of
+`$storedir/builds/$rel_type/$target-$subarch-$version_stamp…`.
+
+Building stage2 and stage3
+--------------------------
+
+Once you've built the stage1 from your seed stage3, you can use that
+stage1 to build a stage2 and stage3.  The `*.spec` files are similar:
+
+    $ diff -u default-stage{1,2}-amd64-2013.1.spec
+    --- default-stage1-amd64-2013.1.spec
+    +++ default-stage2-amd64-2013.1.spec
+    @@ -1,7 +1,7 @@
+     subarch: amd64
+     version_stamp: 2013.1
+    -target: stage1
+    +target: stage2
+     rel_type: default
+     profile: default/linux/amd64/10.0/no-multilib
+     snapshot: 20130131
+    -source_subpath: default/stage3-amd64-20121213
+    +source_subpath: default/stage1-amd64-2013.1
+    $ diff default-stage{2,3}-amd64-2013.1.spec
+    --- default-stage2-amd64-2013.1.spec
+    +++ default-stage3-amd64-2013.1.spec
+    @@ -1,7 +1,7 @@
+     subarch: amd64
+     version_stamp: 2013.1
+    -target: stage2
+    +target: stage3
+     rel_type: default
+     profile: default/linux/amd64/10.0/no-multilib
+     snapshot: 20130131
+    -source_subpath: default/stage1-amd64-2013.1
+    +source_subpath: default/stage2-amd64-2013.1
+
+Gentoo stages
+-------------
+
+You can't compile a big pile of source code without an already
+compiled toolchain, which is where Gentoo's stages come in.  The “base
+system” contains the necessary build tools and supporting
+infrastructure to get things going.  The stages are:
+
+1. System must be bootstrapped and the base system must be compiled
+   (a new toolchain built with external seed tools).
+2. Stage1 + bootstrapped (a new toolchain build with stage1 tools).
+3. Stage2 + base system compiled (the base system built with stage2 tools).
+4. Stage3 + non-base packages.
+
+For more details on the differences between the stages, look at the
+target helper scripts (e.g. `targets/stage1/*.sh`).
+
+Building with a kernel
+----------------------
+
+If you're shooting for a live CD or bootable USB stick, you'll need to
+compile your own kernel.  Here's how that works.
+
+Genkernel
+~~~~~~~~~
+
+When you don't know exactly which kernel options you need, add
+something like the following to your `*.spec`:
+
+    boot/kernel: gentoo
+    boot/kernel/gentoo/sources: gentoo-sources
+
+You can still set `boot/kernel/<label>/config` when you're using
+genkernel if you want to give genkernel some hints.
+
+Genkernel alternatives
+~~~~~~~~~~~~~~~~~~~~~~
+
+If you don't want to use a genkernel, your options are fairly limited.
+The currently suggested route is to create your own binary kernel
+package.
+
+Stage4
+------
+
+`examples/stage4_template.spec` is a good template for building a
+stage4 tarball.  Besides setting `target: stage4` and adjusting
+`source_subpath`, I usually use `stage4/packages`, `stage4/rcadd`, and
+the `boot/kernel` stuff described above.  This gives an almost
+bootable stage that you can dump on a USB flash drive.
+
+Live CDs
+--------
+
+Live CDs should be built in two stages: `livecd-stage1` (based on a
+stage3 source) for building extra packages (along the same lines as a
+stage4) and `livecd-stage2` (based on `livecd-stage1`) for setting up
+the kernel, bootloader, filesystem, and other details.  See
+`examples/livecd-stage*_template.spec` for some ideas.
+
+Live USBs
+---------
+
+The easiest way to create a live USB is currently to install a live CD
+ISO using
+http://www.syslinux.org/wiki/index.php/Doc/isolinux#HYBRID_CD-ROM.2FHARD_DISK_MODE[isohybrid]
+and `dd`:
+
+    # isohybrid filename.iso
+    # dd if=filename.iso of=/dev/sdX
+
+replacing `X` with the appropriate drive letter for your USB disk.
+See https://bugs.gentoo.org/show_bug.cgi?id=251719[bug 251719] for
+details.

[gentoo-commits] proj/catalyst:master commit in: doc/

[Brian Dolbec]

commit:     ee0825606bc7f2e2eb79ecd70aea4ec31a4c23cc
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Dec 19 23:38:48 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 04:39:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ee082560

doc/HOWTO.txt: Fix stage descriptions, and add extra context

Thanks to Zero_Chaos, dwfreed, and jmbsvicetto for clarification and
review on #gentoo-releng.

---
 doc/HOWTO.txt | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index 5717f80..8fe63c1 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -136,11 +136,36 @@ compiled toolchain, which is where Gentoo's stages come in.  The “base
 system” contains the necessary build tools and supporting
 infrastructure to get things going.  The stages are:
 
-1. System must be bootstrapped and the base system must be compiled
-   (a new toolchain built with external seed tools).
-2. Stage1 + bootstrapped (a new toolchain build with stage1 tools).
-3. Stage2 + base system compiled (the base system built with stage2 tools).
-4. Stage3 + non-base packages.
+[options="header",frame="topbot",grid="none"]
+|=======================================================================================
+| Source         | Action                                                       | Result
+| seed stage3    | Build packages listed in your profile's `packages.build`     | stage1
+| stage1         | Rebuild the toolchain with the package tree's `bootstrap.sh` | stage2
+| stage2         | Compile the base `@system` packages                          | stage3
+| stage3         | Compile additional `@world` packages                         | stage4
+|=======================================================================================
+
+For stage1, Catalyst builds the stuff your profile says you need to
+get started, using the tools in the seed stage3.  It uses Portage's
+ability to merge packages into an alternatively-rooted filesystem
+(`/tmp/stage1root`, using `ROOT` in `make.conf`).  This ensures that
+only freshly-built packages end up in stage1.
+
+A fresh stage1 has newly-compiled versions of everything you need to
+build a full system, but all of the stage1 binaries were built with
+tools from the seed stage3.  For stage2, Catalyst rebuilds a number of
+critial packages (GCC, glibc, binutils, ...) using the `bootstrap.sh`
+script distributed with the package tree.  Rebuilding the packages
+using the packages themselves (instead of the seed stage3 tools) gives
+an extra layer of separation from any crazy output that the seed
+tooling may have generated.
+
+Once we have a stage2, Catalyst builds all of the base system packages
+for stage3, rebuilding any that were already built in stage2 (`emerge
+-e @system`).  The `@system` set of packages is defined by `packages`
+files in your cascading profile.  See
+http://dev.gentoo.org/~ulm/pms/5/pms.html#x1-520005.2.6[the Package
+Manager Specification] for details.
 
 For more details on the differences between the stages, look at the
 target helper scripts (e.g. `targets/stage1/*.sh`).

[gentoo-commits] proj/catalyst:master commit in: doc/

[Brian Dolbec]

commit:     de8d4332d2ffbe1f627a2e97d582650c80c87cd1
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Apr 12 18:13:57 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=de8d4332

doc/catalyst-config.5.txt: Document linking issues with binary packages

This gives users a heads up explaining why they might see linking
errors when pkgcache is enabled.  I first saw this when I build a
stage1 without update_seed.  Because my seed stage3 linked against
libmpc.so.2, some of my stage1 files linked against the older mpc.
However, the mpc-1.0.1 built for the stage1 installed libmpc.so.3.
When I tried to use this stage1 to build a stage2, it died with:

  /usr/libexec/gcc/i686-pc-linux-gnu/4.6.3/cc1:
    error while loading shared libraries: libmpc.so.2:
    cannot open shared object file: No such file or directory

To fix this, I enabled update_seed, but binary packages built during
my first pass were used to populate the stage1, so even though I'd
updated the seed stage3 toolchain, I still had a stage1 with cc1
linked against libmpc.so.2.

After clearing the binary package cache, I got a stage1 *built* with
the updated seed stage3, which gave a cc1 linked against libmpc.so.3
(hurray!).

This commit adds a warning in the pkgcache documentation that should
help people understand what might be going wrong if they see similar
linking errors.  For more details, see the thread following
http://thread.gmane.org/gmane.linux.gentoo.catalyst/2137/focus=2193

---
 doc/catalyst-config.5.txt | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 27bc0bb..63a015f 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -126,7 +126,8 @@ build dies during `livecd-stage2`.
 pkgcache::
 Enable `--usepkg` and `--buildpkg` for most *emerge(1)* runs.  This is
 useful if your build dies prematurely.  However, you may experience
-linking problems.
+linking problems.  See the *BINARY PACKAGE DEPENDENCIES* section for
+details.
 
 seedcache::
 Use the build output of a previous target if it exists to speed up the
@@ -174,6 +175,47 @@ ripemd256, ripemd320, sha1, sha224, sha256, sha384, sha512, snefru128,
 snefru256, tiger, tiger128, tiger160, whirlpool.
 
 
+BINARY PACKAGE DEPENDENCIES
+---------------------------
+This section is only important if you are using binary packages to
+build your stages (by enabling the `pkgcache` option and restarting
+incomplete builds).
+
+Before EAPI-5 introduced ABI sub-slots, the build-time compatibility
+of packages was not recorded.  This leads to problems such as binary
+GCC packages built against mpc-0.8.2 (which installs libmpc.so.2)
+being installed on systems that only have mpc-1.0.1 (which installs
+libmpc.so.3), resulting in:
+
+---------------------------------
+/usr/libexec/gcc/i686-pc-linux-gnu/4.6.3/cc1:
+  error while loading shared libraries: libmpc.so.2:
+  cannot open shared object file: No such file or directory
+---------------------------------
+
+As long as there are packages in your stage that don't use ABI
+sub-slots, you may experience errors like this due to untracked ABI
+missmatches in binary packages.  Packages generated by catalyst builds
+are currently namespaced:
+
+---------------------------------
+.../packages/<rel_type>/<target>-<subarch>-<version_stamp>/Packages
+---------------------------------
+
+so running into these out-of-date packages is unlikely.  You may run
+into problems if:
+
+* you enable `update_seed` in your stage1 spec after a previous run
+  which generated packages linking against out-of-date seed libraries
+  or
+* you update your snapshot and an untracked ABI dependency is bumped
+  without a similar bump in the dependent package.
+
+without also bumping any of the package namespace variables in your
+spec.  If you do make such a change, it's a good idea to clear the
+package cache in question and rebuild the packages from scratch.
+
+
 FILES
 -----
 An example configuration file can be found at

[gentoo-commits] proj/catalyst:master commit in: doc/

[Mike Frysinger]

commit:     6a38e62e143df9bda84da1ce8a54948c57e833fa
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 00:55:05 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 16:49:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6a38e62e

make_target_table: rewrite for py3/stability

 doc/make_target_table.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/doc/make_target_table.py b/doc/make_target_table.py
index f127c37..9eb072b 100755
--- a/doc/make_target_table.py
+++ b/doc/make_target_table.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 # Copyright (C) 2012 W. Trevor King <wking@drexel.edu>
 # Copyright (C) 2012 Sebastian Pipping <sebastian@pipping.org>
 # Copyright (C) 2013 Brian dolbec <dolsen@gentoo.org>
@@ -10,34 +10,38 @@
 
 from __future__ import print_function
 
-import sys as _sys
-
 import glob
-import re
+import locale
+import os
+import sys
 
 
-def key_netboot_before_netboot2((target_name, _module)):
-	return target_name + '1'
+def main(_argv):
+	source_root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
+	# Force consistent sorting order.
+	locale.setlocale(locale.LC_COLLATE, 'C')
 
-if __name__ == '__main__':
-	extractor = re.compile('^catalyst/targets/(([^ ]+)).py$')
 	targets = list()
-	for filename in sorted(glob.glob('catalyst/targets/*.py')):
+	for filename in glob.glob(os.path.join(source_root, 'catalyst/targets/*.py')):
 		if '__init__' in filename:
 			continue
 
-		match = extractor.match(filename)
-		target_name = match.group(2).replace('_', '-')
-		module_name = 'catalyst.targets.' + match.group(1)
+		name = os.path.basename(filename)[0:-3]
+		target_name = name.replace('_', '-')
+		module_name = 'catalyst.targets.' + name
 
 		__import__(module_name)
-		module = _sys.modules[module_name]
+		module = sys.modules[module_name]
 
 		targets.append((target_name, module))
 
-	for target_name, module in sorted(targets, key=key_netboot_before_netboot2):
+	for target_name, module in sorted(targets, key=lambda x: x[0]):
 		print('`%s`;;' % target_name)
 		# Replace blank lines with `+` (asciidoc list item continuation)
 		print(module.__doc__.strip().replace('\n\n', '\n+\n'))
 		print('')
+
+
+if __name__ == '__main__':
+	main(sys.argv[1:])

[gentoo-commits] proj/catalyst:master commit in: doc/

[Richard Farina]

commit:     d7dbe6e1b2fd3148a652843ef43ab80415959842
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 02:35:39 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 02:35:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d7dbe6e1

would be nice if the ebuild worked again

 doc/make_subarch_table_guidexml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py
index 0699d2a..f571e00 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#!/usr/bin/python
 # Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org>
 # Copyright (C) 2013 Brian dolbec <dolsen@gentoo.org>
 # Licensed under GPL v2 or later

[gentoo-commits] proj/catalyst:master commit in: doc/

[Brian Dolbec]

commit:     f997e53273fd214aa16536024c4e2be0dd60db72
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 07:55:50 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f997e532

doc/cataylst-config.5.txt: Update for the new variables

 doc/catalyst-config.5.txt | 56 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index f778a804..5c5ad293 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -24,12 +24,23 @@ and empty lines are interpreted as comments.  For example:
 
 ---------------------------------
 # /etc/catalyst/catalyst.conf
+
 digests="auto"
 contents="auto"
-distdir="/usr/portage/distfiles"
 envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache snapcache"
+
+# source repo settings
+distdir="/usr/portage/distfiles"
 portdir="/usr/portage"
+
+# target repo info
+repo_basedir="/usr"
+repo_name="portage"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
+
+# other catalyst settings
 sharedir="/usr/share/catalyst"
 snapshot_cache="/var/tmp/catalyst/snapshot_cache"
 storedir="/var/tmp/catalyst"
@@ -72,10 +83,6 @@ Do `isoinfo -f -i FILE`.  'isoinfo-f' is the only option not chosen
 by the automatic algorithm.
 --
 
-*distdir*::
-Distfiles location.  `/usr/portage/distfiles` should work for most
-default installations.
-
 *envscript*::
 Environment script location, which allows users to set options such as
 HTTP proxies, `MAKEOPTS`, `GENTOO_MIRRORS`, or any other environment
@@ -140,9 +147,44 @@ break your cache.  The cache is unlinked before any empty or rm
 processing.
 --
 
+Repository settings
+~~~~~~~~~~~~~~~~~~~
+
+*distdir*::
+Source distfiles location used in generation of the stages.  This is usually the
+hosts distfiles location.  `/usr/portage/distfiles` should work for most
+default installations, but it should be set to match your hosts configuration.
+
 *portdir*::
-Portage tree location.  `/usr/portage/` should work for most default
-installations.
+Source Gentoo tree location (primary repo). `/usr/portage/` should work for most
+default installations.
+
+*repo_basedir*::
+The target repository directory to contain the rimary repo (gentoo repo) and
+any overlays.  `/usr` is the historical location. But that is in the process of
+changing.  `/var/gentoo/repos` is an option.
+
+*repo_name*::
+The name of the main repository (ie: gentoo).  This has had a directory name
+of `portage` in the past.  But it has an internal name of `gentoo`, which is
+what its directory name should be.  This name is used in the snapshot name
+generated and also the directory name of the repository created with the
+snapshot target.  The new general rule is that the directory name and its
+internal repo_name value should be the same.
+
+*target_distdir*::
+This is the target distfiles directory location for the stage being created.
+This is important because this value will be stored in the stage's make.conf
+and will become the default location used if it is not edited by users.
+The default location is `/usr/portage/distfiles`.
+
+*target_pkgdir*::
+This is the target packages directory for storing binpkgs in the stage being
+built.  This location is stored in the make.conf of the stage being built.
+The default location for this has typically been `/usr/portage/packages`
+
+Other settings
+~~~~~~~~~~~~~~
 
 *sharedir*::
 Catalyst runtime script location.  `/usr/share/catalyst` should work for

[gentoo-commits] proj/catalyst:master commit in: doc/

[Richard Farina]

commit:     0f3b5d033719787f8ef8764b640c2b148e5b7db4
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 15:56:10 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 15:56:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0f3b5d03

fix shebang in doc creation

per report by hanetzer on irc, this shebang work for prefix installs and
per floppym it is valid and correct

 doc/make_subarch_table_guidexml.py | 2 +-
 doc/make_target_table.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py
index f571e001..84624dc1 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org>
 # Copyright (C) 2013 Brian dolbec <dolsen@gentoo.org>
 # Licensed under GPL v2 or later

diff --git a/doc/make_target_table.py b/doc/make_target_table.py
index 9eb072b1..c4b49ad9 100755
--- a/doc/make_target_table.py
+++ b/doc/make_target_table.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (C) 2012 W. Trevor King <wking@drexel.edu>
 # Copyright (C) 2012 Sebastian Pipping <sebastian@pipping.org>
 # Copyright (C) 2013 Brian dolbec <dolsen@gentoo.org>

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     724b49a0407303f5f9459238d1cb2f0ab290844f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 16:53:49 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 23:47:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=724b49a0

doc: Fix some typos

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/HOWTO.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index b1d315e6..960b5761 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -1,4 +1,4 @@
-Catalyst is a release-buildcing tool for Gentoo.  If you use Gentoo
+Catalyst is a release-building tool for Gentoo.  If you use Gentoo
 and want to roll your own live CD or bootable USB stick, this is the
 way to go.  First, get a Gentoo development box and install the
 necessary tools:
@@ -54,7 +54,7 @@ where the storage dir is `$storedir/builds/$source_subpath`
 (`$storedir` from `catalyst.conf`, `$source_subpath` from your
 `*.spec` file).
 
-`.*spec` files
+`*.spec` files
 ~~~~~~~~~~~~~~
 
 `.*spec` files tell catalyst about the system you're trying to build.

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     f07e9148213a499251e0c81db083eccee4eb8546
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 00:28:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f07e9148

doc: Update catalyst-spec.5 for netboot2 rename

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-spec.5.txt | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 03fdeecc..2b8413ec 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -115,10 +115,6 @@ explained below.
 
 This setting is supported by the livecd targets.
 
-*<target>/builddate*::
-Set the build date of the `<target>` (example: `20060107`).  This
-setting is supported by the `netboot2` target.
-
 *<target>/readme*::
 This is for the README.txt on the root of the CD.  For Gentoo
 releases, we use a default README.txt, and this will be used on your
@@ -223,14 +219,12 @@ the labels that will be used by the CD bootloader to refer to each
 kernel image (example: `gentoo`).
 
 *boot/kernel/<label>/sources*::
-*netboot/kernel/sources*::
 This option tells catalyst which kernel sources to merge for this
 kernel label (example: `gentoo-sources`).  This can use normal portage
 atoms to specify a specific version.  `<label>` should match one of
 the labels given to *boot/kernel*.
 
 *boot/kernel/<label>/config*::
-*netboot/kernel/config*::
 This option is the full path and filename to a kernel `.config` file
 that is used by genkernel to compile the kernel this label applies to.
 `<label>` should match one of the labels given to *boot/kernel*.
@@ -271,7 +265,6 @@ will keep it from being auto-loaded, even if it is detected by
 hotplug.  This setting is supported by the `stage4` and `livecd`
 targets.
 
-*netboot/kernel/use*::
 *boot/kernel/<label>/use*::
 This option sets the `USE` flags used to build the kernel and also any
 packages which are defined under this kernel label (example: `pcmcia
@@ -293,16 +286,13 @@ to enable keymap selection.
 Netboot
 ~~~~~~~
 
-*<target>/busybox_config*::
+*netboot/busybox_config*::
 The netboot target builds busybox for its root filesystem.  This
 option is where you specify the full path and filename to your busybox
-configuration (example: `/tmp/busybox.config`).  This setting is
-supported by the `netboot` and `netboot2` targets.
+configuration (example: `/tmp/busybox.config`).
 
-*netboot/base_tarball*::
-This is the full path and filename to the tarball to use as the base
-for the netboot image (example:
-`/usr/share/catalyst/netboot/netboot-base.tar.bz2`).
+*netboot/builddate*::
+Set the build date of the `<target>` (example: `20060107`).
 
 Runlevels
 ~~~~~~~~~
@@ -343,7 +333,7 @@ quite a few problems with these, so be careful with whatever `USE`
 flags you add here.  This is generally used for adding some
 functionality that we do not want on by default for all Gentoo users,
 but that we want on by default in our binaries.  This setting is
-supported by the `stage4` and `netboot2` targets.
+supported by the `stage4` and `netboot` targets.
 
 *<target>/packages*::
 This is the set of packages that we will merge into the stage4 tarball
@@ -352,22 +342,15 @@ fxload irssi wpa_supplicant`).  They will be built with the `USE`
 flags configured above.  These packages must not depend on a
 configured kernel.  If the package requires a configured kernel, then
 it will be defined elsewhere.  This setting is supported by the
-`stage4`, and `netboot2` targets.
-
-*netboot/packages*::
-These package names are also labels used later when determining what
-files to copy into your netboot image (example: `raidtools
-e2fsprogs`).
+`stage4`, and `netboot` targets.
 
-*<target>/packages/<label>/files*::
+*netboot/packages/<label>/files*::
 This is where you tell catalyst which files from each package to copy
 into the netboot image.  `<label>` should match one of the labels
 given to *netboot/packages*.  For example:
 
   netboot/packages/raidtools/files: /sbin/raidstart /sbin/mkraid
 
-This option is supported by the `netboot` and `netboot2` targets.
-
 *netboot/extra_files*::
 This is a list of any other files, not belonging to the above
 packages, that you would wish to have copied into your netboot image

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     aa656fef421a285809a06e184389052fbe063f48
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 04:58:39 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 06:12:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=aa656fef

doc: Update boot/kernel/<label>/console documentation

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-spec.5.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 2b8413ec..58f0a9f0 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -253,10 +253,10 @@ use this on the official media.  `<label>` should match one of the
 labels given to *boot/kernel*.
 
 *boot/kernel/<label>/console*::
-This is only supported on ppc64 currently.  This entry sets up the
-console boot parameters required for sending the output to the
-appropriate console (example: `tty0 ttyS0`).  `<label>` should match
-one of the labels given to *boot/kernel*.
+This is only supported on with grub currently (x86, amd64, ia64, ppc,
+sparc).  This entry sets up the console boot parameters required for
+sending the output to the appropriate console (example: `tty0 ttyS0`).
+`<label>` should match one of the labels given to *boot/kernel*.
 
 *<target>/modblacklist*::
 This is for blacklisting modules from being hotplugged that are known

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     1fa044467282982563c2cf42c9918b8f4d03d58b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 02:10:40 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 15 00:53:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1fa04446

doc: Drop pre-EAPI-5 text

There are very few EAPI < 5 ebuilds left.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-config.5.txt | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 4fe1af8c..f17944b2 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -168,22 +168,7 @@ This section is only important if you are using binary packages to
 build your stages (by enabling the `pkgcache` option and restarting
 incomplete builds).
 
-Before EAPI-5 introduced ABI sub-slots, the build-time compatibility
-of packages was not recorded.  This leads to problems such as binary
-GCC packages built against mpc-0.8.2 (which installs libmpc.so.2)
-being installed on systems that only have mpc-1.0.1 (which installs
-libmpc.so.3), resulting in:
-
----------------------------------
-/usr/libexec/gcc/i686-pc-linux-gnu/4.6.3/cc1:
-  error while loading shared libraries: libmpc.so.2:
-  cannot open shared object file: No such file or directory
----------------------------------
-
-As long as there are packages in your stage that don't use ABI
-sub-slots, you may experience errors like this due to untracked ABI
-missmatches in binary packages.  Packages generated by catalyst builds
-are currently namespaced:
+Packages generated by catalyst builds are namespaced:
 
 If versioned_cache is set:
 ---------------------------------
@@ -194,19 +179,6 @@ Otherwise:
 .../packages/<rel_type>/<target>-<subarch>/Packages
 ---------------------------------
 
-so running into these out-of-date packages is unlikely.  You may run
-into problems if:
-
-* you enable `update_seed` in your stage1 spec after a previous run
-  which generated packages linking against out-of-date seed libraries
-  or
-* you update your snapshot and an untracked ABI dependency is bumped
-  without a similar bump in the dependent package.
-
-without also bumping any of the package namespace variables in your
-spec.  If you do make such a change, it's a good idea to clear the
-package cache in question and rebuild the packages from scratch.
-
 
 FILES
 -----

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     b0d2777092252988a72f30dc915db93eb4d993d0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 02:16:07 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 15 00:57:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b0d27770

doc: Merge SUPPORTED HASHES section into digests section

It made sense to have this as a separate section when there were
multiple configuration options (digests and hash_function) but
hash_function is now gone.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-config.5.txt | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index f17944b2..7ac9a2a3 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -38,8 +38,13 @@ Basic configuration
 *digests*::
 Create a `.DIGESTS` file containing the hash output from any of the
 supported options below.  Adding them all may take a long time.
-(example: `md5 sha1 sha512 whirlpool`).  See the *SUPPORTED HASHES*
-section for a list of supported hashes.
+(example: `md5 sha1 sha512 whirlpool`).  The set of supported hashes
+is dependent on the version of Python. To see the set of hashes
+supported by the version of Python in use, run
++
+---------------------------------
+$ python3 -c 'import hashlib; print(hashlib.algorithms_available)'
+---------------------------------
 
 *envscript*::
 Environment script location, which allows users to set options such as
@@ -154,14 +159,6 @@ takes place in RAM.  This feature requires a pretty large tmpfs
 much RAM everything will fail horribly and it is not our fault.
 
 
-SUPPORTED HASHES
-----------------
-The list of supported hashes is dependent on the version of Python. To
-see the list of hashes supported by the version of Python in use, run
-
-    $ python3 -c 'import hashlib; print(hashlib.algorithms_available)'
-
-
 BINARY PACKAGE DEPENDENCIES
 ---------------------------
 This section is only important if you are using binary packages to

[gentoo-commits] proj/catalyst:master commit in: doc/

[Matt Turner]

commit:     9c4b7f79232b772404cab909b89b73bb8dc2d9c5
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 00:46:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 15 00:53:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9c4b7f79

doc: Remove extra asterisk

Fixes: c7688c666567 (doc/catalyst-config.5.txt: Add man page for catalyst.conf)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-config.5.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index d5444b38..4fe1af8c 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -51,7 +51,7 @@ variables using POSIX shell notation:
 export FOO="bar"
 ---------------------------------
 
-**options*::
+*options*::
 Set different build-time options (example: `autoresume bindist
 kerncache pkgcache seedcache`).  Supported values:
 +