aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README17
-rw-r--r--TODO8
-rwxr-xr-xcatalyst3
-rw-r--r--[-rwxr-xr-x]modules/catalyst_lock.py0
-rw-r--r--[-rwxr-xr-x]targets/embedded/embedded-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/embedded/embedded-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/embedded/embedded-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/grp/grp-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/grp/grp-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/grp/grp-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/livecd-stage1/livecd-stage1-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/livecd-stage1/livecd-stage1-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/livecd-stage1/livecd-stage1-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/livecd-stage2/livecd-stage2-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/netboot/netboot-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/netboot/netboot-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage1/build.py0
-rw-r--r--[-rwxr-xr-x]targets/stage1/stage1-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage1/stage1-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage1/stage1-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage2/stage2-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage2/stage2-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage2/stage2-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage3/stage3-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage3/stage3-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage3/stage3-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage4/stage4-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage4/stage4-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/stage4/stage4-preclean-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/bootloader-setup.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/chroot-functions.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/create-iso.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/filesystem-functions.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/functions.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/kill-chroot-pids.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/kmerge.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/livecdfs-update.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/netboot2-final.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/post-kmerge.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/pre-kmerge.sh0
-rw-r--r--[-rwxr-xr-x]targets/support/target_image_setup.sh0
-rw-r--r--[-rwxr-xr-x]targets/tinderbox/tinderbox-chroot.sh0
-rw-r--r--[-rwxr-xr-x]targets/tinderbox/tinderbox-controller.sh0
-rw-r--r--[-rwxr-xr-x]targets/tinderbox/tinderbox-preclean-chroot.sh0
44 files changed, 19 insertions, 9 deletions
diff --git a/README b/README
index ea603d23..9590f131 100644
--- a/README
+++ b/README
@@ -2,17 +2,18 @@
Licensing
========================
-Catalyst is copyrighted by the Gentoo Foundation, and is released under the
-terms of the GNU General Public License v.2.1. For more information, please
-consult COPYING.
+Originally, Catalyst was copyrighted by the Gentoo Foundation, Inc. and was
+released under the terms of the GNU General Public License v.2.1. Since this
+is a fork of that project, all new code is no longer copyrighted to the Gentoo
+Foundation. Currently, copyright is held by the individual authors for their
+contributions. For more information, please consult COPYING.
Disclaimer
========================
-The Gentoo Foundation extends no warranty or guarantee for catalyst. This
-software is provided to the public to comply with the Gentoo social contract
-and to assist other distributors and integrators of Gentoo and Gentoo-based
-solutions. Use at your own risk.
+This software is covered by no warranty or guarantee of functionality. It is
+provided to the public for use in creating source-based distributions in a
+simple and reproducable manner. Use at your own risk.
Requirements
=======================
@@ -25,7 +26,7 @@ Requirements
What is catalyst?
========================
-Catalyst is the Gentoo Linux project's release building tool. With catalyst,
+Catalyst is a release building tool, used by Gentoo Linux. With catalyst,
you are able to completely customize your Gentoo install by customizing
the very tools that are used to install a system. Official Gentoo Linux release
media is built with catalyst.
diff --git a/TODO b/TODO
index 5ff62e64..d74f6ee0 100644
--- a/TODO
+++ b/TODO
@@ -10,4 +10,12 @@
- automatically pull stages
- check that distcc_hosts is set before enabling distcc
- allow setting of distcc_hosts in catalyst.conf with override in the specs
+- check ccache settings, such as size, and ensure we don't overwrite them
- perform user management via a loop in livecd-stage2
+- add portage jobs support
+ - --jobs
+ - --keep-going
+ - --load-average
+- perform GCC version detection in seed stages to determine supported settings
+- build bootloaders for targets on-demand, rather than using pre-built tarballs
+
diff --git a/catalyst b/catalyst
index eb18bc3a..843eba1d 100755
--- a/catalyst
+++ b/catalyst
@@ -40,7 +40,8 @@ def usage():
def version():
print "Catalyst, version "+__version__
print "Copyright 2003-2008 Gentoo Foundation"
- print "Distributed under the GNU General Public License version 2\n"
+ print "Copyright 2008 various authors"
+ print "Distributed under the GNU General Public License version 2.1\n"
def parse_config(myconfig):
# search a couple of different areas for the main config file
diff --git a/modules/catalyst_lock.py b/modules/catalyst_lock.py
index a3743c91..a3743c91 100755..100644
--- a/modules/catalyst_lock.py
+++ b/modules/catalyst_lock.py
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 89e834c5..89e834c5 100755..100644
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index a1a82d06..a1a82d06 100755..100644
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
index 5353f67d..5353f67d 100755..100644
--- a/targets/embedded/embedded-preclean-chroot.sh
+++ b/targets/embedded/embedded-preclean-chroot.sh
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 6690c91b..6690c91b 100755..100644
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 5069777c..5069777c 100755..100644
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index 98c166fe..98c166fe 100755..100644
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 30bc4708..30bc4708 100755..100644
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index 1099b1df..1099b1df 100755..100644
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
index 5353f67d..5353f67d 100755..100644
--- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 7e057f27..7e057f27 100755..100644
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
index 3115cac8..3115cac8 100755..100644
--- a/targets/netboot/netboot-chroot.sh
+++ b/targets/netboot/netboot-chroot.sh
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index c3fc0914..c3fc0914 100755..100644
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index 539c4c7e..539c4c7e 100755..100644
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index dcd7494e..dcd7494e 100755..100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 56258772..56258772 100755..100644
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index a80fc92e..a80fc92e 100755..100644
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index ca86d901..ca86d901 100755..100644
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index cad9080c..cad9080c 100755..100644
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
index 3b693d81..3b693d81 100755..100644
--- a/targets/stage2/stage2-preclean-chroot.sh
+++ b/targets/stage2/stage2-preclean-chroot.sh
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index de46bcf6..de46bcf6 100755..100644
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index f97ee085..f97ee085 100755..100644
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index 3b693d81..3b693d81 100755..100644
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 0c2611cf..0c2611cf 100755..100644
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index d95728eb..d95728eb 100755..100644
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 8f2e8941..8f2e8941 100755..100644
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 2df60406..2df60406 100755..100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index f91f53cd..f91f53cd 100755..100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 5a6323ca..5a6323ca 100755..100644
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
index 31ad6d35..31ad6d35 100755..100644
--- a/targets/support/filesystem-functions.sh
+++ b/targets/support/filesystem-functions.sh
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 6d21af8c..6d21af8c 100755..100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
index 9e8bf01d..9e8bf01d 100755..100644
--- a/targets/support/kill-chroot-pids.sh
+++ b/targets/support/kill-chroot-pids.sh
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index da1b844c..da1b844c 100755..100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a03335a9..a03335a9 100755..100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 08f6e7b1..08f6e7b1 100755..100644
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
index c17680c4..c17680c4 100755..100644
--- a/targets/support/post-kmerge.sh
+++ b/targets/support/post-kmerge.sh
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index cd23eda7..cd23eda7 100755..100644
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index c55aba60..c55aba60 100755..100644
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 6bdaaaa0..6bdaaaa0 100755..100644
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index 0409a2e6..0409a2e6 100755..100644
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
index 240e2cbb..240e2cbb 100755..100644
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.sh