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

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

[Sebastian Pipping]

commit:     468fc27b0ee2168418e27ca89950217b69eae60f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 21:40:12 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 22:16:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=468fc27b

Examples: refer to "man catalyst" for supported arches, too

Conflicts:

	examples/netboot_template.spec

---
 examples/generic_stage_template.spec |    4 ++--
 examples/grp_template.spec           |    4 ++--
 examples/livecd-stage1_template.spec |    4 ++--
 examples/livecd-stage2_template.spec |    4 ++--
 examples/netboot_template.spec       |    3 +++
 examples/stage4_template.spec        |    4 ++--
 examples/tinderbox_template.spec     |    4 ++--
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
index 9c5a4ec..b386c7c 100644
--- a/examples/generic_stage_template.spec
+++ b/examples/generic_stage_template.spec
@@ -2,8 +2,8 @@
 # used to build a stage1, stage2, or stage3 installation tarball
 
 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
-# Refer to the catalyst reference manual for suppurted subarches.
-# http://www.gentoo.org/proj/en/releng/catalyst/
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 # example:
 # subarch: athlon-xp
 subarch:

diff --git a/examples/grp_template.spec b/examples/grp_template.spec
index f77f07f..97e49dc 100644
--- a/examples/grp_template.spec
+++ b/examples/grp_template.spec
@@ -2,8 +2,8 @@
 # used to build a GRP set
 
 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
-# Refer to the catalyst reference manual for suppurted subarches.
-# http://www.gentoo.org/proj/en/releng/catalyst/
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 # example:
 # subarch: athlon-xp
 subarch:

diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
index 57df6ac..322ebd3 100644
--- a/examples/livecd-stage1_template.spec
+++ b/examples/livecd-stage1_template.spec
@@ -2,8 +2,8 @@
 # used to build a livecd-stage1
 
 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
-# Refer to the catalyst reference manual for suppurted subarches.
-# http://www.gentoo.org/proj/en/releng/catalyst/
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 # example:
 # subarch: athlon-xp
 subarch:

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index d6e638e..b957688 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -2,8 +2,8 @@
 # used to build a livecd-stage2 iso image
 
 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
-# Refer to the catalyst reference manual for suppurted subarches.
-# http://www.gentoo.org/proj/en/releng/catalyst/
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 # example:
 # subarch: athlon-xp
 subarch:

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 4f76b8f..9477ed8 100644
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -1,3 +1,6 @@
+# The subarch can be any of the supported catalyst subarches (like athlon-xp).
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 subarch: mips3
 version_stamp: 2006.0
 target: netboot

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index e701042..c5cd65c 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -2,8 +2,8 @@
 # used to build a stage4
 
 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
-# Refer to the catalyst reference manual for suppurted subarches.
-# http://www.gentoo.org/proj/en/releng/catalyst/
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 # example:
 # subarch: athlon-xp
 subarch:

diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec
index 8548281..65ccbe3 100644
--- a/examples/tinderbox_template.spec
+++ b/examples/tinderbox_template.spec
@@ -1,8 +1,8 @@
 # generic tinderbox specfile
 
 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
-# Refer to the catalyst reference manual for suppurted subarches.
-# http://www.gentoo.org/proj/en/releng/catalyst/
+# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
+# for supported subarches
 # example:
 # subarch: athlon-xp
 subarch:

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

[Jorge Manuel B. S. Vicetto]

commit:     0bfc37900c70239cb8fc045750ec4e0ab3a6c981
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 11:23:50 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 11:23:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0bfc3790

Drop addpatches from the stage4 example spec.

---
 examples/stage4_template.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 33fc0e6..6684ffc 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -241,7 +241,7 @@ boot/kernel/gentoo/packages:
 # been built.  There are no checks on these packages, so be careful what you
 # add here.  They can potentially break your CD.
 # example:
-# stage4/unmerge: acl attr autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages sash bison flex gettext texinfo ccache distcc addpatches man groff lib-compat miscfiles rsync sysklogd bc lcms libmng genkernel diffutils libperl gnuconfig gcc-config gcc bin86 cpio cronbase ed expat grub lilo help2man libtool gentoo-sources
+# stage4/unmerge: acl attr autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages sash bison flex gettext texinfo ccache distcc man groff lib-compat miscfiles rsync sysklogd bc lcms libmng genkernel diffutils libperl gnuconfig gcc-config gcc bin86 cpio cronbase ed expat grub lilo help2man libtool gentoo-sources
 stage4/unmerge:
 
 # This option is used to empty the directories listed.  It is useful for getting

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

[Jorge Manuel B. S. Vicetto]

commit:     a6e55efae71adcbeae5a96c7ce717c0b2e34235f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 11:27:13 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 11:27:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a6e55efa

Drop addpatches from the livecd-stage2 example spec as well.

---
 examples/livecd-stage2_template.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 1e27918..1a26bc6 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -332,7 +332,7 @@ boot/kernel/gentoo/console:
 # been built.  There are no checks on these packages, so be careful what you
 # add here.  They can potentially break your CD.
 # example:
-# livecd/unmerge: acl attr autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages sash bison flex gettext texinfo ccache distcc addpatches man groff lib-compat miscfiles rsync sysklogd bc lcms libmng genkernel diffutils libperl gnuconfig gcc-config gcc bin86 cpio cronbase ed expat grub lilo help2man libtool gentoo-sources
+# livecd/unmerge: acl attr autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages sash bison flex gettext texinfo ccache distcc man groff lib-compat miscfiles rsync sysklogd bc lcms libmng genkernel diffutils libperl gnuconfig gcc-config gcc bin86 cpio cronbase ed expat grub lilo help2man libtool gentoo-sources
 livecd/unmerge:
 
 # This option is used to empty the directories listed.  It is useful for getting

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

[Brian Dolbec]

commit:     cd5e5ea62248a0bf70efe7f75e36a0fc0106f3e4
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Feb  1 02:17:50 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:20 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=cd5e5ea6

examples: Add newlines to accidentally unwrapped comment lines

With:

  $ sed -i 's/^\(#.*\)\(#.*\)/\1\n\2/' examples/*.spec

---
 examples/grp_template.spec           |  9 ++++++---
 examples/livecd-stage1_template.spec |  9 ++++++---
 examples/livecd-stage2_template.spec |  9 ++++++---
 examples/netboot_template.spec       |  9 ++++++---
 examples/snapshot_template.spec      |  3 ++-
 examples/stage4_template.spec        | 12 ++++++++----
 examples/tinderbox_template.spec     |  9 ++++++---
 7 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/examples/grp_template.spec b/examples/grp_template.spec
index 8cf9e27..c3d2c50 100644
--- a/examples/grp_template.spec
+++ b/examples/grp_template.spec
@@ -8,7 +8,8 @@
 # subarch: athlon-xp
 subarch:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:
@@ -26,7 +27,8 @@ target: grp
 # rel_type: default
 rel_type:
 
-# This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
+# This is the system profile to be used by catalyst to build this target.  It is
+# specified as a relative path from /usr/portage/profiles.
 # example:
 # profile: default-linux/x86/2006.1
 profile:
@@ -37,7 +39,8 @@ profile:
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
-# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
+# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
+# for the seed.
 # example:
 # default/stage3-x86-2006.1
 source_subpath:

diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
index 322ebd3..a3cd939 100644
--- a/examples/livecd-stage1_template.spec
+++ b/examples/livecd-stage1_template.spec
@@ -8,7 +8,8 @@
 # subarch: athlon-xp
 subarch:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:
@@ -26,7 +27,8 @@ target:
 # rel_type: default
 rel_type:
 
-# This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
+# This is the system profile to be used by catalyst to build this target.  It is
+# specified as a relative path from /usr/portage/profiles.
 # example:
 # profile: default-linux/x86/2006.1
 profile:
@@ -37,7 +39,8 @@ profile:
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
-# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
+# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
+# for the seed.
 # example:
 # default/stage3-x86-2006.1
 source_subpath:

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 1a26bc6..ca1ca82 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -8,7 +8,8 @@
 # subarch: athlon-xp
 subarch:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:
@@ -26,7 +27,8 @@ target:
 # rel_type: default
 rel_type:
 
-# This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
+# This is the system profile to be used by catalyst to build this target.  It is
+# specified as a relative path from /usr/portage/profiles.
 # example:
 # profile: default-linux/x86/2006.1
 profile:
@@ -37,7 +39,8 @@ profile:
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
-# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
+# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
+# for the seed.
 # example:
 # default/livecd-stage1-x86-2006.1
 source_subpath:

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 7671d4d..921ddf4 100644
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -8,7 +8,8 @@
 # subarch: athlon-xp
 subarch:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:
@@ -26,7 +27,8 @@ target:
 # rel_type: default
 rel_type:
 
-# This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
+# This is the system profile to be used by catalyst to build this target.  It is
+# specified as a relative path from /usr/portage/profiles.
 # example:
 # profile: default-linux/x86/2006.1
 profile:
@@ -37,7 +39,8 @@ profile:
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
-# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
+# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
+# for the seed.
 # example:
 # default/stage3-x86-2006.1
 source_subpath:

diff --git a/examples/snapshot_template.spec b/examples/snapshot_template.spec
index f683f25..8f2136b 100644
--- a/examples/snapshot_template.spec
+++ b/examples/snapshot_template.spec
@@ -5,7 +5,8 @@
 # target: snapshot
 target:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 6684ffc..c3a53d5 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -8,7 +8,8 @@
 # subarch: athlon-xp
 subarch:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:
@@ -26,7 +27,8 @@ target:
 # rel_type: default
 rel_type:
 
-# This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
+# This is the system profile to be used by catalyst to build this target.  It is
+# specified as a relative path from /usr/portage/profiles.
 # example:
 # profile: default-linux/x86/2006.1
 profile:
@@ -37,7 +39,8 @@ profile:
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
-# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
+# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
+# for the seed.
 # example:
 # default/stage3-x86-2006.1
 source_subpath:
@@ -119,7 +122,8 @@ stage4/splash_theme:
 # stage4/gk_mainargs: --lvm --dmraid
 stage4/gk_mainargs:
 
-# This option allows you to specify your own linuxrc script for genkernel to use# when building your CD.  This is not checked for functionality, so it is up to
+# This option allows you to specify your own linuxrc script for genkernel to use
+# when building your CD.  This is not checked for functionality, so it is up to
 # you to debug your own script.  We do not use one for the official release
 # media, so there will not be one listed below.
 # example:

diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec
index 09cc20f..db0dba2 100644
--- a/examples/tinderbox_template.spec
+++ b/examples/tinderbox_template.spec
@@ -7,7 +7,8 @@
 # subarch: athlon-xp
 subarch:
 
-# The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
+# The version stamp is an identifier for the build.  It can be anything you wish
+# it to be, but it is usually a date.
 # example:
 # version_stamp: 2006.1
 version_stamp:
@@ -24,7 +25,8 @@ target: tinderbox
 # rel_type: default
 rel_type:
 
-# This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
+# This is the system profile to be used by catalyst to build this target.  It is
+# specified as a relative path from /usr/portage/profiles.
 # example:
 # profile: default-linux/x86/2006.1
 profile:
@@ -35,7 +37,8 @@ profile:
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
-# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
+# relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
+# for the seed.
 # example:
 # default/stage3-x86-2006.1
 source_subpath:

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

[Brian Dolbec]

commit:     4b57756242ba9bfcb6817bbba500edcc93607d0f
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jan 31 22:25:47 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:20 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4b577562

examples/README: Add a pointer to the releng Git repository

Thanks to Dustin C. Hatch for pointing this out, because I wasn't able
to find it on my own.  Having a pointer distributed with Catalyst
should help other newcomers find example spec files written by folks
who know what they're doing ;).  The current examples lack a full
stage1-through-stage3 progression.

---
 examples/README | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/README b/examples/README
new file mode 100644
index 0000000..bfd517a
--- /dev/null
+++ b/examples/README
@@ -0,0 +1,5 @@
+For further examples, see the releases/weekly/specs directory [1] in
+the releng Git repository [2].
+
+[1]: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=tree;f=releases/weekly/specs;hb=HEAD
+[2]: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=summary

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

[Brian Dolbec]

commit:     2f3a3515f58433430a8ab4775a11fc21994df2d9
Author:     Brian Dolbec dolsen <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 18:53:07 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 18:53:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2f3a3515

Remove /root/* from  examples

Signed-off-by: Brian Dolbec dolsen <dolsen <AT> gentoo.org>

 examples/livecd-stage2_template.spec | 2 +-
 examples/stage4_template.spec        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index a19812ae..419f4806 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -354,7 +354,7 @@ livecd/unmerge:
 # rid of files that don't belong to a particular package, or removing files from
 # a package that you wish to keep, but won't need the full functionality.
 # example:
-# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /usr/portage /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /root/.ccache /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/bootsplash/gentoo /etc/bootsplash/gentoo-highquality /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
+# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /usr/portage /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/bootsplash/gentoo /etc/bootsplash/gentoo-highquality /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
 livecd/empty:
 
 # This option tells catalyst to clean specific files from the filesystem and is

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 75aedff8..4066bf5b 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -252,7 +252,7 @@ stage4/unmerge:
 # rid of files that don't belong to a particular package, or removing files from
 # a package that you wish to keep, but won't need the full functionality.
 # example:
-# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /usr/portage /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /root/.ccache /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
+# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /usr/portage /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
 stage4/empty:
 
 # This option tells catalyst to clean specific files from the filesystem and is

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

[Matt Turner]

commit:     a6522008e915abbbf7cddc057c9f7951e7d667a6
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 21:11:13 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 23:50:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a6522008

example: document new options

Closes: https://bugs.gentoo.org/236905
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 examples/stage4_template.spec | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 5fbf6a50..5d9a390c 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -171,15 +171,37 @@ stage4/root_overlay:
 # stage4/xinitrc:
 stage4/xinitrc:
 
-# This option is used to create non-root users on your CD.  It takes a space
-# separated list of user names.  These users will be added to the following
-# groups: users,wheel,audio,games,cdrom,usb
-# If this is specified in your spec file, then the first user is also the user
-# used to start X. Since this is not used on the release media, it is blank.
-# example:
+# This option is used to create groups. It takes a carriage-return separated
+# list of group names. For instance:
+# stage4/groups:
+#     admin
+#     web_group
+#     sudo_group
+stage4/groups:
+
+# This option is used to create non-root users. It takes a carriage-return
+# separated list of user names. For instance:
+# stage4/users:
+#     john.doe
+#     foo.bar
+#
+# These users are NOT added to any specific group. You can specify one
+# or more groups to add the user(s) to using an equal sign followed by a comma
+# separated list. For instance:
 # stage4/users:
+#     john.doe=wheel,audio,cdrom
+#     foo.bar=www,audio
 stage4/users:
 
+# This option is used to copy an SSH public key into a user's .ssh directory.
+# Catalyst will copy the SSH public key in the ~/.ssh/authorized_keys file and
+# set the file permission to 0644. It takes a carriage-return separated list of
+# users with a equal sign followed by the SSH public key path. For instance:
+# stage4/ssh_public_keys:
+#     john.doe=/path/to/johns/public/key/id_rsa.pub
+#     foo.bar=/path/to/foos/public/key/id_ed25519.pub
+stage4/ssh_public_keys:
+
 # This option is used to specify the number of kernels to build and also the
 # labels that will be used by the CD bootloader to refer to each kernel image.
 # example:

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

[Andreas K. Hüttel]

commit:     3286edf1c8b4cea0f5770bcf6aa4e289bd06d82f
Author:     Stephen Reaves <reaves735 <AT> gmail <DOT> com>
AuthorDate: Wed Jan  9 22:42:40 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 23:07:05 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3286edf1

Fixed typo

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 examples/stage4_template.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index a7a3e766..02910c88 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -129,7 +129,7 @@ stage4/motd:
 
 # This is for blacklisting modules from being hotplugged that are known to cause
 # problems.  Putting a module name here will keep it from being auto-loaded,
-# even if ti is detected by hotplug.
+# even if it is detected by hotplug.
 # example:
 # stage4/modblacklist: 8139cp
 stage4/modblacklist: