diff options
author | 2007-02-08 19:35:47 +0000 | |
---|---|---|
committer | 2007-02-08 19:35:47 +0000 | |
commit | d23ba993b39978717f05c1808a09771ce04c435f (patch) | |
tree | 914c3143bdfc8194b98c623882f862b4d71fe88f /src/catalyst | |
parent | Updated with most recent versions and stabilization requests (diff) | |
download | gentoo-d23ba993b39978717f05c1808a09771ce04c435f.tar.gz gentoo-d23ba993b39978717f05c1808a09771ce04c435f.tar.bz2 gentoo-d23ba993b39978717f05c1808a09771ce04c435f.zip |
Removing catalyst and adding a README pointing to the new location. This should clear up any confusion people are having.
Diffstat (limited to 'src/catalyst')
125 files changed, 6 insertions, 15133 deletions
diff --git a/src/catalyst/AUTHORS b/src/catalyst/AUTHORS deleted file mode 100644 index 4caceae155..0000000000 --- a/src/catalyst/AUTHORS +++ /dev/null @@ -1,20 +0,0 @@ -Current Maintainers: -Chris Gianelloni <wolf31o2@gentoo.org> -Eric Edgar <rocket@gentoo.org> - -Original Authors: -John Davis <zhen@gentoo.org> -Daniel Robbins <drobbins@gentoo.org> - -Contributors: -Rob Holland <tigger@gentoo.org> -Guy Martin <gmsoft@gentoo.org> -Mike Frysinger <vapier@gentoo.org> -Gustavo Zacarias <gustavoz@gentoo.org> -Robert Paskowitz <r2d2@gentoo.org> -David Bryson <mutex@gentoo.org> -Daniel Ostrow <dostrow@gentoo.org> -Matsuu Takuto <matsuu@gentoo.org> -Joshua Kinard <kumba@gentoo.org> -Lars Weiler <pylon@gentoo.org> -Andrew Gaffney <agaffney@gentoo.org> diff --git a/src/catalyst/COPYING b/src/catalyst/COPYING deleted file mode 100644 index 14db8fc79d..0000000000 --- a/src/catalyst/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog deleted file mode 100644 index ced599b6c5..0000000000 --- a/src/catalyst/ChangeLog +++ /dev/null @@ -1,3495 +0,0 @@ -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ - - 02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> README, arch/alpha.py, - arch/amd64.py, arch/arm.py, arch/hppa.py, arch/ia64.py, arch/mips.py, - arch/ppc.py, arch/ppc64.py, arch/s390.py, arch/sh.py, arch/sparc.py, - arch/sparc64.py, arch/x86.py, catalyst, files/catalyst.conf, - modules/builder.py, modules/catalyst_lock.py, modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/generic_target.py, modules/grp_target.py, - modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, - modules/netboot2_target.py, modules/netboot_target.py, - modules/snapshot_target.py, modules/stage1_target.py, - modules/stage2_target.py, modules/stage3_target.py, - modules/stage4_target.py, modules/tinderbox_target.py, - targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-controller.sh, - targets/embedded/embedded-fs-runscript.sh, - targets/embedded/embedded-preclean-chroot.sh, targets/embedded/unmerge.sh, - targets/grp/grp-chroot.sh, targets/grp/grp-controller.sh, - targets/grp/grp-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/netboot/netboot-chroot.sh, targets/netboot/netboot-combine.sh, - targets/netboot/netboot-controller.sh, targets/netboot/netboot-image.sh, - targets/netboot2/netboot2-controller.sh, - targets/netboot2/netboot2-copyfile.sh, targets/netboot2/netboot2-pkg.sh, - targets/stage1/build.py, targets/stage1/stage1-chroot.sh, - targets/stage1/stage1-controller.sh, - targets/stage1/stage1-preclean-chroot.sh, targets/stage2/stage2-chroot.sh, - targets/stage2/stage2-controller.sh, - targets/stage2/stage2-preclean-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/stage3/stage3-controller.sh, - targets/stage3/stage3-preclean-chroot.sh, targets/stage4/stage4-chroot.sh, - targets/stage4/stage4-controller.sh, - targets/stage4/stage4-preclean-chroot.sh, - targets/support/bootloader-setup.sh, targets/support/create-iso.sh, - targets/support/functions.sh, targets/support/kmerge.sh, - targets/support/livecdfs-update.sh, targets/support/netboot2-final.sh, - targets/support/post-kmerge.sh, targets/support/pre-kmerge.sh, - targets/support/rc-update.sh, targets/support/target_image_setup.sh, - targets/support/unmerge.sh, targets/tinderbox/tinderbox-chroot.sh, - targets/tinderbox/tinderbox-controller.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh: - Removing all copyright and license comment headers from all files so we - don't ever get another bug like bug #149638. - - 02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Clean up more spacing/capitalization. - - 02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> README, - modules/generic_stage_target.py, modules/livecd_stage1_target.py, - modules/stage4_target.py, targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-controller.sh, - targets/embedded/embedded-fs-runscript.sh, - targets/embedded/embedded-preclean-chroot.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/netboot2/netboot2-copyfile.sh, - targets/stage4/stage4-controller.sh, targets/support/kmerge.sh, - targets/support/pre-kmerge.sh: - Fixed lots of spacing issues, removed livecd/type from livecd-stage1, add - splash capabilities to stage4, change 'cp -a' to 'cp -pPR', add -q to emerge - calls in kmerge.sh, and updated README. - - 13 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/livecd-bashrc, targets/support/livecdfs-update.sh: - Fix bashrc so it doesn't give an error and add System.map to livecd-kernel. - - 08 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/catalyst_support.py: - Added fix for bug #143348. - - 23 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added -q to emerge call for systempkgs.txt just to be on the safe side. - - 22 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/support/livecdfs-update.sh: - Changed some copy commands to use -f, added a check for /etc/gconf before - moving it when not using gentoo-release-livecd, and fixed a sed for root's - .bashrc, as reported on the gentoo-catalyst mailing list by Luca Casagrande - <luca.casagrande@gmail.com>. - - 16 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Fixing sed so that systemspkgs.txt is built properly. - - 11 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/sparc.py: - The sparc32 binary is in /bin, not /usr/bin. - - 11 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/chroot-functions.sh: - We now only set the options for pkgcache if we are not using fetchonly. This - should work around a problem where portage won't fetch the files if a binpkg - already exists for the package. - - 09 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added code to make a backup of custom.conf before we edit it for the - installer. - - 29 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/livecdfs-update.sh: - Remove sed from splash section, since it wasn't actually resolving the - issue, anyway. Change the installer's dialog front-end code to simply run - via sudo, since we don't need to worry about having the X DISPLAY setup or - anything. This is catalyst 2.0, so you guys can all start rejoicing. - - 26 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Fix my sed line so it actually applies correctly. - - 25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/chroot-functions.sh: - Added check for verbose, and add --verbose if found, or --quiet, to emerge - options. - - 21 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Fix the splash code so we have our splash theme on all 6 virtual consoles, - as well as a possible fix for the read-only filesystem messages from - /sbin/splash-functions.sh - - 20 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/chroot-functions.sh: - Fix --fetchonly to actually work. - - 19 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage2_template.spec: - Added description for livecd/fsops to livecd-stage2's spec template. - - 19 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/livecdfs-update.sh: - I've modified the GDM configuration section to work correctly. I have also - ensured that xdm is no longer started just because livecd/xdm is used, which - was causing issues for the generic-livecd type. This is 2.0_rc50, which - should be the last of the 'release candidates' made. If there are no bug - reports in 2 days, then I'm rolling this as 2.0 final. - - 12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Hopefully, I have fixed the issue with the Installer icons. We'll have to - see once the newer Installer is released, as I still have to fix the - installer scripts. - - 12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Removed famd from the default runlevel for gentoo-release-livecd. It really - shouldn't cause a problem, but I prefer it stay a bit clean. - - 11 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py, targets/support/bootloader-setup.sh, - targets/support/create-iso.sh, targets/support/kmerge.sh, - targets/support/livecdfs-update.sh, targets/support/mips-arcload_conf.sh: - Added patches from Joshua Kinard <kumba@gentoo.org> from bug #139337. - - 05 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2, - +livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2, - targets/support/bootloader-setup.sh: - Added patch from Gustavo Zacarias <gustavoz@gentoo.org> for sparc/silo - parameters support. This is for bug #139300. - - 28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - modules/generic_stage_target.py, modules/livecd_stage2_target.py, - targets/support/filesystem-functions.sh: - Added two patches from Joshua Kinard from bug #138255 to fix livecd/fsops - and also to remove some redundant values from livecd-stage2's valid_values. - This is 2.0_rc49. - - 28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/ppc.py, - arch/x86.py: - Fixed invocation of linux32 for x86 and ppc. This is for bug #138080. - - 22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Fix a problem where catalyst was creating an initial list, then putting that - list inside another. Thanks to Andrew Gaffney <agaffney@gentoo.org> for - pointing it out and for the fix. This is for bug #136351. - - 22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/unmerge.sh: - Removing loop for unmerge, as it didn't actually solve anything and the - portage team has helped us out by reverting the behavior that caused this - change in the first place. - - 21 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - modules/netboot2_target.py, modules/stage1_target.py, - targets/netboot2/netboot2-copyfile.sh, targets/support/pre-kmerge.sh: - Added two patches from Joshua Kinard <kumba@gentoo.org> to fix stage1 not - having /proc mounted during the preclean stage and also to clean up the - netboot2 code. This is 2.0_rc48. - - 20 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/unmerge.sh: - Change our unmerge from being a single unmerge to a loop, to work around an - unexpected change in portage 2.1's unmerge processing. - - 19 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Fixed a problem where we were putting the kernel name in twice and causing - and error when using grub as a bootloader. This is for bug #137252. - - 15 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Added a second pass to the alpha bootloader setup to create aboot items for - serial console for bug #133457. - - 12 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/cdtar/arcload-0.43-r1.tbz2: - Added arcload cdtar for mips. - - 09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/netboot/netboot-controller.sh: - Added make-busybox-symlinks to USE for busybox compile. This is catalyst - 2.0_rc47. - - 08 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py, targets/support/livecdfs-update.sh: - Add patch from bug #135051 to fix the seedcache extraction logic. - - 03 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Don't set icon theme to Clearlooks, since it doesn't exist. - - 03 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Fix sed on installer icons. - - 25 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc46. - - 23 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-controller.sh: - Added a -type f to the find call in stage1 for bug #132180. - - 19 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2: - Updated yaboot cdtar from Daniel Ostrow <dostrow@gentoo.org> so it will boot - properly on IBM PPC64 machines. - - 19 May 2006; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py: - Fix DIGESTS output - - 16 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Removed x-setup from default runlevel, as it is now controlled via the - autoconfig init script. - - 15 May 2006; Eric Edgar <rocket@gentoo.org> arch/ppc64.py: - Fix ppc64 based arches to subclass ppc64 - - 15 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/livecd_stage1_target.py: - Use the full category/package name for livecd-tools. - - 13 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Make copies and deletes recursive for firmware since some packages put their - firmware in a subdirectory. - - 10 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Fix detection of the Installer. - - 10 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/ppc64.py: - Added 970, power3, power4, and power5 sub-arches for ppc64. - - 09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Removed portion of livecdfs-update.sh that created /etc/conf.d/net as it is - no longer necessary and can cause possible problems with Installer-based - installs. - - 08 May 2006; Eric Edgar <rocket@gentoo.org> modules/catalyst_lock.py: - recursive directory create - - 01 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - modules/catalyst_support.py: - Changed a display error from bug #131502 and rolling 2.0_rc45. - - 25 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/create-iso.sh: - Added patch from Gustavo Zacharias <gustavoz@gentoo.org> for some fun - silo-fu on SPARC. - - 25 Apr 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - digests function uses raw output from hash function now - - 25 Apr 2006; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py: - change hash result format so .DIGESTS is generated correctly - - 25 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/catalyst_support.py: - Added patch to parse_spec by Andrew Gaffney <agaffney@gentoo.org> and for - bug #131190. - - 25 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added a space for bug #131181. - - 23 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/kmerge.sh: - Fixed creation of kernelpkgs.txt file for the installer. - - 21 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Somehow this hosts.bck fix got reverted and I really don't know how. Anyway, - I'm adding it back. - - 20 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/support/bootloader-setup.sh: - I missed an extra else in bootloader-setup.sh, so I'm fixing that and - rolling out an emergency rc44. - - 20 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - If you use elif, you have to use a then after it. Yeah, that one's totally - my fault. - - 19 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/livecdfs-update.sh: - Fixing my own bug in livecdfs-update.sh and rolling 2.0_rc43. - - 19 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Removed runlevel deletion, as it probably wasn't a good idea. This is for - bug #130476. - - 19 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Removed bootplash support from ppc/ppc64 since they only will work with - gensplash. Forced use of livecd/splash_type of bootsplash to get - splash=silent. This should reduce the number of things on the kernel command - line that aren't necessary. - - 18 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, catalyst, - modules/catalyst_support.py: - Added patch from Andrew Gaffney <agaffney@gentoo.org> to re-write - parse_spec. This should resolve bug #130103, as well as make the code much - cleaner. This is 2.0_rc42. - - 18 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Forced -p on tar for compressing stages. - - 18 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/chroot-functions.sh: - Fixed fetchonly option for stages 1 through 3 and livecd-stage1, and - possibly others. - - 17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/build.py: - Added patch to build.py for portage 2.1 support. - - 17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/kmerge.sh: - Fixed genkernel initramfs overlay support. Thanks to Alvin Lee - <liyiming@ict.ac.cn> in bug #129890. - - 17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Moved sed line for ##STARTX to end of file, since we aren't touching - /etc/startx until the end. - - 17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added a check for the games group and add it if it doesn't exist already. - This should resolve bug #125498. - - 13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - examples/generic_stage_template.spec, examples/grp_template.spec, - examples/livecd-stage1_template.spec, - examples/livecd-stage2_template.spec, examples/netboot2_template.spec, - examples/netboot_template.spec, examples/snapshot_template.spec, - examples/stage4_template.spec, examples/tinderbox_template.spec: - Removed portdir_overlay from the snapshot example spec and added - portage_overlay to the example specs for the relevant targets. - - 04 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc41 since it has better LiveCD support. - - 04 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Fix theme for gdm. - - 31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/functions.sh: - Removed check for livecd/dev-manager being udev since it was done - incorrectly and genkernel assumes udev by default on a 2.6 kernel and devfs - by default on a 2.4 kernel. Thanks to Alvin Lee <liyiming@ict.ac.cn> on bug - #128265 for pointing this out. - - 23 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/elilo-3.4-cdtar.tar.bz2, - +livecd/cdtar/elilo-3.6-cdtar.tar.bz2: - Replaced elilo-3.4 cdtar with elilo-3.6 cdtar for IA64. - - 22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Fix to ensure that we look inside the chroot for /etc/hosts.bck, not on our - live system. You can thank Andrew Gaffney for the fix. - - 22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh: - Don't copy motd files if we're using livecd/type generic-livecd. - - 22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/support/livecdfs-update.sh: - Made sure that livecd/motd is ignored for livecd/type: gentoo-* and added - some extra cleanup to generic-livecd. - - 16 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2, - -livecd/cdtar/yaboot-1.3.11-ppc64-cdtar-r1.tar.bz2, - +livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2, - -livecd/cdtar/ppc-yaboot-cdtar.tar.bz2, - targets/support/bootloader-setup.sh: - Added sed to PPC/PPC64 to change boot.msg to match the hardware for which - the CD was built, merged the PPC and PPC64 cdtar files into a single cdtar, - and removed all older cdtar files for PPC*. - - 13 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - livecd/files/livecd.motd.txt: - Added message to the official LiveCD MOTD mentioning how to run the - installer. Blame codeman. This is 2.0_rc40. - - 13 Mar 2006; Eric Edgar <rocket@gentoo.org> modules/snapshot_target.py: - fix so snapshot target doesnt have errors - - 13 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Finalized the sync from my fsscript for 2006.0 into catalyst. It is now no - longer necessary to use a fsscript to duplicate the official Gentoo LiveCD - builds. - - 12 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Removed hdparm and alsasound from rc-update.sh as they are pulled in by the - autoconfig script. - - 21 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added wrapping around the udev sed for those crazy 2.4-users. - - 17 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/livecdfs-update.sh: - Added sed fix for udev starting evms_activate unconditionally. This is - 2.0_rc39. - - 17 Feb 2006; Eric Edgar <rocket@gentoo.org> modules/stage4_target.py: - add stage4/unmerge stage4/rm to valid options - - 15 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Added fix for bug #122154 from Rajiv Manglani. - - 15 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/kmerge.sh: - Fixed creation of kernelpkgs.txt for the Installer. - - 14 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/cdtar/elilo-3.4-cdtar.tar.bz2: - Updated elilo tarball for IA64. - - 14 Feb 2006; Eric Edgar <rocket@gentoo.org> modules/snapshot_target.py: - DIGESTS support for snapshot creation - - 14 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is catalyst 2.0_rc38, codenamed: When will the stinking release - candidates ever end? - - 14 Feb 2006; Eric Edgar <rocket@gentoo.org> modules/grp_target.py: - fix for .DIGESTS.DIGESTS issue in grp - - 14 Feb 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fix for failure when root_overlay is not set - - 14 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Added IA64/SGI patch from plasmaroo. - - 13 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/support/kmerge.sh, targets/support/livecdfs-update.sh: - Fixed generation of grppkgs.txt and kernelpkgs.txt for the Installer. This - is 2.0_rc37. - - 10 Feb 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Allow multiple overlays for root_overlay and overlay spec option - - 10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/yaboot-1.3.11-ppc-cdtar-r1.tar.bz2, - +livecd/cdtar/yaboot-1.3.11-ppc64-cdtar-r1.tar.bz2, catalyst, - targets/support/rc-update.sh: - Updated ppc64's cdtar file with a new boot.msg, removed older file, and - fixed bug #122154. This is catalyst 2.0_rc36. - - 09 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - livecd/files/livecd.motd.txt, targets/support/livecdfs-update.sh: - Updated the LiveCD motd to tell the user to run the display manager again, - rather than startx, while mentioning that startx is useful as a rescue X - session since it starts twm. This is catalyst 2.0_rc35. - - 09 Feb 2006; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh: - Add hfs-hide options to mkisofs so macs boot - - 09 Feb 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix indentation issues - - 08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc34. - - 08 Feb 2006; Eric Edgar <rocket@gentoo.org> - targets/support/bootloader-setup.sh: - add additional console less entry when consoles are chosen for ppc64 - - 08 Feb 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fix kernelopts and extraversion env variable exports - - 08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/livecdfs-update.sh: - Rearranged generation of /usr/livecd/systempkgs.txt for the LiveCD. Thanks - to Andrew Gaffney for spotting this. This is 2.0_rc33. - - 07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/kmerge.sh: - Changing the way we determine if extraversion is set. This is catalyst - 2.0_rc32. - - 07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Change net.ethX links to link to net.lo instead of net.eth0. - - 07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - examples/stage4_template.spec: - Fixed rcadd example for stage4. Blame rajiv. - - 06 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is catalyst 2.0_rc31. - - 05 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added copy of /usr/portage/eclass for the Installer. Thanks to Andrew - Gaffney for pointing me in the right direction. - - 03 Feb 2006; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh: - change all occurrences of ${clst_livecd_cdfstype} with ${clst_fstype} - - 02 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc30. - - 02 Feb 2006; Eric Edgar <rocket@gentoo.org> - examples/livecd-stage2_template.spec: - updated examples to have console and machine_type - - 02 Feb 2006; Eric Edgar <rocket@gentoo.org> - targets/support/bootloader-setup.sh: - Change [ console ] to -console in yaboot.conf for ppc64. Spaces aren't - allowed. - - 02 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is catalyst 2.0_rc29. - - 02 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/cdtar/yaboot-1.3.11-ppc-cdtar-r1.tar.bz2: - Removed extra yaboot.conf from - livecd/cdtar/yaboot-1.3.11-ppc-cdtar-r1.tar.bz2. - - 01 Feb 2006; Eric Edgar <rocket@gentoo.org> - targets/support/kill-chroot-pids.sh: - add sleep to try and give processes a chance to die. bug 119940 - - 01 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/functions.sh: - Removed some quotes to make sure we have a binary operator and closing bug - #117649. - - 31 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/create-iso.sh: - Added fix for amd64/x86 ISO creation. This is 2.0_rc28. - - 30 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Added path from bug #120935 for PPC/PPC64. - - 30 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/stage2_target.py: - Additional spacing fixes submitted by `Kumba - - 29 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/stage1_target.py, - modules/stage2_target.py: - space cleanups contributed from `Kumba - - 29 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/grp_target.py: - add grp/use to valid_values in the grp module - - 29 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc27. - - 28 Jan 2006; Eric Edgar <rocket@gentoo.org> - -livecd/cdtar/yaboot-1.3.11-ppc-cdtar.tar.bz2, - +livecd/cdtar/yaboot-1.3.11-ppc-cdtar-r1.tar.bz2, - targets/support/bootloader-setup.sh: - ppc cdtar update; ppc64 bootloader updates - - 27 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/create-iso.sh: - Fixing HFS bless on PPC64. This is catalyst 2.0_rc26. - - 27 Jan 2006; Eric Edgar <rocket@gentoo.org> - +livecd/cdtar/yaboot-1.3.11-ppc-cdtar.tar.bz2, - modules/generic_stage_target.py, targets/support/bootloader-setup.sh, - targets/support/create-iso.sh: - Fix ppc64 iso creation. Add console machine_type for ppc yaboot separation. - - 27 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/bootloader-setup.sh: - Add ppc console and machine_type=ibm - - 27 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix type error when kernel packages arent defined - - 27 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - examples/generic_stage_template.spec, examples/grp_template.spec, - examples/livecd-stage1_template.spec, - examples/livecd-stage2_template.spec, examples/netboot_template.spec, - examples/stage4_template.spec: - Added more verbose wording and examples for pkgcache_path and - kerncache_path, where necessary. - - 26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/create-iso.sh: - Really fixing bug #120475 this time. This is 2.0_rc25. - - 26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/create-iso.sh: - Added patch from bug #120475 that resolves HFS blessing on PPC*. This is - 2.0_rc24. - - 26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - +livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2, - targets/support/bootloader-setup.sh, targets/support/create-iso.sh: - Added initial support for EFI booting on x86. This is completely untested, - so use it at your own risk. Also, no bug reports without patches, please. - This is catalyst 2.0_rc23. - - 26 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh: - kmerge should have been kerncache - - 26 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh, - targets/support/pre-kmerge.sh: - Fix a few other places for the kerncache update - - 26 Jan 2006; Eric Edgar <rocket@gentoo.org> - examples/generic_stage_template.spec, examples/grp_template.spec, - examples/livecd-stage1_template.spec, - examples/livecd-stage2_template.spec, examples/netboot2_template.spec, - examples/netboot_template.spec, examples/stage4_template.spec, - examples/tinderbox_template.spec, modules/generic_stage_target.py, - targets/support/kmerge.sh: - Separation of kerncache from snapcache - - 26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - It helps if I actually increment the version number. - - 26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh: - Added --oneshot to default options for stage1 building. Added code to wipe - world during stages 1 and 3. This is catalyst 2.0_rc22. - - 25 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/bootloader-setup.sh: - Fix bug if no kernel packages were defined but there was a postconf setting. - x86 softlevel support is enhanced. - - 24 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/bootloader-setup.sh: - Added IA64 patch from plasmaroo. This is catalyst 2.0_rc21. - - 23 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py: - Changed mcpu to mtune since mcpu is deprecated on GCC 3.4 and above. - - 20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc20. - - 20 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/netboot2_target.py: - Netboot2 fixes for spec parameter checks - - 20 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/stage4_target.py: - add makeopts spec file support. - - 20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Added fix for bug #119635. - - 19 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/pre-kmerge.sh: - Fix pre-kmerge.sh for stage4 - - 18 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc19. - - 18 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fix crash when no kernel is defined. spacing issue - - 18 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc18. - - 18 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/livecd_stage2_target.py: - Added livecd/volid to valid_values. - - 17 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - remove extra function that was converting strings to lists unnecessarily - - 17 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is catalyst 2.0_rc17. - - 17 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py, modules/livecd_stage2_target.py, - modules/stage4_target.py: - fix issue where args not allowed that arose due to earlier myspec addlargs bug - - 17 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/embedded/embedded-preclean-chroot.sh, - targets/grp/grp-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - targets/stage1/stage1-preclean-chroot.sh, - targets/stage2/stage2-preclean-chroot.sh, - targets/stage3/stage3-preclean-chroot.sh, - targets/support/chroot-functions.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh: - Added function to cleanup stray /etc/distcc/hosts files. - - 16 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/bootloader-setup.sh: - Added fix from bug #119123. This is catalyst 2.0_rc16. - - 16 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/create-iso.sh, targets/support/netboot2-final.sh: - Fixing some spacing. This is catalyst 2.0_rc15. - - 16 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh: - Attempt to fix bug #117649 - - 16 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fixes for bugs #119009, #119041 and #118985 - - 13 Jan 2006; Eric Edgar <rocket@gentoo.org> - +examples/netboot2_template.spec, modules/catalyst_support.py, - +modules/netboot2_target.py, +targets/netboot2/netboot2-controller.sh, - +targets/netboot2/netboot2-copyfile.sh, +targets/netboot2/netboot2-pkg.sh, - +targets/support/netboot2-final.sh, targets/support/pre-kmerge.sh: - Add netboot2 target - - 13 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/generic_stage_target.py, - targets/support/kmerge.sh: - Fix for ccache (null)/.ccache bug - - 13 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc14. - - 11 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, arch/ppc.py: - Added ppc -mcpu patch from Pylon for bug #118709. - - 10 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - modules/embedded_target.py, modules/stage4_target.py: - Added linuxrc to embedded and stage4 targets. - - 10 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/kmerge.sh: - filter kname - and . for kmerge.sh - - 10 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/create-iso.sh: - Added sparc64 to sparc lines for create-iso.sh to fix ISO creation on sparc64. - - 05 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - change .digests to .DIGESTS - - 04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/kmerge.sh: - Commented ccache for genkernel build which will resolve #117648 until a - proper solution can be found. This is 2.0_rc13. - - 04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-controller.sh: - Added patch from vapier for bug #117254. - - 03 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/alpha.py, - arch/amd64.py, arch/mips.py, arch/ppc.py, arch/ppc64.py, arch/s390.py, - arch/sh.py, arch/sparc.py, arch/sparc64.py, arch/x86.py: - Added -pipe to default CFLAGS/CXXFLAGS and doing some minor cleanup - (comments mostly). - - 03 Jan 2006; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Remove chost/cflags etc. warning messages - - 31 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Attempt to fix bug 117253; chost is wrong on autoresume - - 28 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/embedded_target.py, - modules/generic_stage_target.py, modules/netboot_target.py, - modules/stage1_target.py: - make setting of destdir more global and part of generic_stage_target - - 28 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/netboot_target.py: - Fix destpath bug in netboot target - - 28 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/stage4_target.py: - Fix for bug 116305;removed unnecessary pkgcache_path processing from the - stage4 target - - 23 Dec 2005; Eric Edgar <rocket@gentoo.org> arch/sh.py, - modules/generic_stage_target.py, modules/stage4_target.py: - remove stray ' from arch/sh.py - - 21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/stage1/stage1-controller.sh: - This finally fixes the issues with gcc-config/binutils-config in stage1. - This is catalyst 2.0_rc12. - - 21 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/snapshot_target.py: - Fix incorrect warning message. portdir_overlay -> portage_overlay - - 21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-controller.sh, - targets/stage1/stage1-preclean-chroot.sh: - Revert gcc-config/binutils-config to _rc11 locations. This should fix - running gcc-config and binutils-config, though it probably breaks running on - non-Gentoo platforms. - - 21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/stage1_target.py: - Make stage1 clean up python 2.3 and 2.4, also. - - 21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> README, - targets/support/livecdfs-update.sh: - Updated requirements and added creation of metadata.tar.bz2 for the installer. - - 21 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Change digests file format to HASH_NAME HASH FILE_NAME - - 21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-controller.sh: - Moved gcc-config/binutils-config to before the chroot. - - 21 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py: - Remove requirement on md5sum,sha1sum,crc32 .. only need to have shash - installed. Supports all of shashs algorithms as of 12_21_2005 - - 20 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Catalyst should die if source_subpath is not a string - - 20 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix for source_subpath bug - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/generic_stage_template.spec: - Updated example specs with information on cflags/chost/cxxflags/ldflags in - both stages 1 and 2. - - 20 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/stage1_target.py, - modules/stage2_target.py: - Disable reading of CHOST/CFLAGS/CXXFLAGS/LDFLAGS from the environment. Allow - stage1 to be overridden again. - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-controller.sh: - It looks like gcc-config/binutils-config needs to be run with the full path, - since it is run outside of the chroot. - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/stage1/stage1-controller.sh: - Fixed gcc-config calls. This is 2.0_rc11. - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is catalyst 2.0_rc10. - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/sh.py, - modules/generic_stage_target.py: - Updated sh support from Mike Frysinger <vapier@gentoo.org> and closing bug - #115866. - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/functions.sh: - Changed from -z to -n for bug #116180. - - 19 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py: - Detect missing binaries for the hashing functions and abort if not found - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> README, - files/catalyst.conf: - Updated README to list new requirements. Set default hash as crc32. Set - default digests as sha1/md5. - - 19 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, files/catalyst.conf, - modules/catalyst_support.py, modules/generic_stage_target.py, - modules/livecd_stage2_target.py, modules/stage2_target.py: - Change the internal hash checking to be quicker and more memory efficient. - Add additional hash digests options. - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/tinderbox/tinderbox-chroot.sh, - targets/tinderbox/tinderbox-controller.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh: - Fixed up spacing/coding style on tinderbox. - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/kill-chroot-pids.sh, targets/support/kmerge.sh, - targets/support/livecdfs-update.sh, targets/support/post-kmerge.sh, - targets/support/pre-kmerge.sh, targets/support/rc-update.sh, - targets/support/target_image_setup.sh, targets/support/unmerge.sh: - Fixed up spacing/coding style on support. - - 19 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst: - Optimize catalyst bytecode and set a sane sys.exit for keyboard interrupts - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage4/stage4-chroot.sh, targets/stage4/stage4-controller.sh, - targets/stage4/stage4-preclean-chroot.sh: - Fixed up spacing/coding style on stage4. - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage2/stage2-chroot.sh, targets/stage2/stage2-controller.sh, - targets/stage2/stage2-preclean-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/stage3/stage3-controller.sh, - targets/stage3/stage3-preclean-chroot.sh: - Fixed up spacing/coding style on stages 2 and 3 - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-chroot.sh, targets/stage1/stage1-controller.sh, - targets/stage1/stage1-preclean-chroot.sh: - Fixed up spacing/coding style on stage1. Also changed - gcc-config/binutils-config to be outside the chroot. - - 19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/netboot/netboot-chroot.sh, targets/netboot/netboot-combine.sh, - targets/netboot/netboot-controller.sh, targets/netboot/netboot-image.sh: - Fixed up spacing/coding style on netboot. - - 16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh: - Fixed up spacing/coding style on livecd-stage*. - - 16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/grp/grp-chroot.sh, targets/grp/grp-controller.sh, - targets/grp/grp-preclean-chroot.sh: - Fixed up spacing/coding style on grp. - - 16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-controller.sh, - targets/embedded/embedded-fs-runscript.sh, - targets/embedded/embedded-preclean-chroot.sh: - Fixed up spacing/coding style on embedded. - - 16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py, - targets/support/bootloader-setup.sh, targets/support/chroot-functions.sh, - targets/support/create-iso.sh, targets/support/filesystem-functions.sh, - targets/support/functions.sh: - Removing extra line from x86.py, fixing up comments, spacing, and coding - style in targets/support through functions.sh - - 16 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/livecd_stage2_target.py: - Fix more tab/spacing issues .. trying to make everything use tabs - - 16 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, - modules/stage1_target.py, modules/stage2_target.py, - modules/stage3_target.py, modules/stage4_target.py: - Fix warning message in stage1,2 and 3. Fix tab spacing issues in various - other files - - 14 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Add envscript warning to aid users who may not know what they are doing - - 13 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - examples/generic_stage_template.spec: - Changed example specs to match that cflags/cxxflags/chost/ldflags are now - only configurable when building a stage2 tarball, to match the current state - of portage. This is 2.0_rc9. - - 13 Dec 2005; Eric Edgar <rocket@gentoo.org> - targets/support/chroot-functions.sh: - Silence more of portages beeps and clicks and whistles - - 13 Dec 2005; Eric Edgar <rocket@gentoo.org> - targets/support/chroot-functions.sh: - Change the portage emerge to use run_emerge - - 13 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/snapshot_target.py, - modules/stage1_target.py, modules/stage2_target.py, - modules/stage3_target.py: - allow portdir_overlay to be part of all specs not including snapshot spec. - Add warnings for stage1,2 and 3 in case someone uses this feature there. - Remove overlay support from the snapshot spec but added a warning. - - 13 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/stage1_target.py, - modules/stage2_target.py: - Move allowable cflags/cxxflags/chost/ldflags changing to stage2 from stage1 - where it is allowed - - 11 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/bootloader-setup.sh: - Add support for bootloader softlevel=; have rsync delete the extra files out - of the overlay so that the overlay always matches the source dir - - 09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Swapped -v/-V since I had gotten them wrong here. - - 09 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix stupid overlay bug - - 09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/netboot/netboot-chroot.sh, targets/netboot/netboot-combine.sh, - targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/stage4/stage4-chroot.sh, targets/support/chroot-functions.sh, - targets/support/kmerge.sh, targets/support/livecdfs-update.sh, - targets/support/unmerge.sh: - Made sure we use -f on removing the default links for splash. Removed - check_portage_version as it really isn't needed anymore. Removed - --no-install from genkernel commands in kmerge.sh so users must manually - remove kernels from /boot. This is 2.0_rc8. - - 09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Made sed on devfsd.conf conditional on it existing. Removes one more error - message from a standard catalyst run. - - 09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf: - Added warning about breaking snapshot cache and re-enable autoresume, since - the errors I was getting were elsewhere. - - 09 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix indentation error the last commit caused - - 09 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Always clear autoresume points after a successful run - - 09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Changed mv -f in livecdfs-update.sh to a cp -r, as it was seriously breaking - snapshot caching after a successful gentoo-release-livecd run. - - 08 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Added famd to default on official LiveCD. - - 08 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/chroot-functions.sh: - Fixes 'too many arguments' error in check_portage_version. - - 08 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - remove extra self.env={} that was resetting the environment to null - - 08 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage1_target.py: - Fix appending livecd use flag if no use flag is specified in livecd-stage1 - spec file - - 08 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/generic_target.py: - Add a default path to the environment in the chroot - - 08 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/embedded/embedded-chroot.sh, - targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - -targets/livecd-stage2/unmerge.sh, targets/netboot/netboot-chroot.sh, - targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, - targets/stage2/stage2-preclean-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/stage3/stage3-preclean-chroot.sh, targets/stage4/stage4-chroot.sh, - targets/stage4/stage4-controller.sh, -targets/stage4/unmerge.sh, - targets/support/chroot-functions.sh, targets/support/pre-kmerge.sh, - +targets/support/unmerge.sh, targets/tinderbox/tinderbox-chroot.sh: - move unmerge.sh to support;move the CLEAN_DELAY,EMERGE_WARNING_DELAY, and - CONFIG_PROTECT stuff in the run_emerge function for cleanliness - - 08 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - files/catalyst.1: - Fixed up the man page, which has been suffering for some time, and also - reversed -v/-V in the help message. - - 08 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added fun gnome theme stuff to livecdfs-update.sh for the official Gentoo - LiveCD. - - 08 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf: - Turning off autoresume of doom until I can get more testing. I've had - several issues with it. I'll be reporting/fixing these as I come across them - but for now wish to turn it off by default as I don't want this one feature - to stop the possible 2.0 final release. - - 07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/unmerge.sh: - Removed profiles hack from livecd-stage2's unmerge, since it isn't used - anymore and probably should have been removed a long time ago when the new - code was put into place in livecdfs-update.sh and livecd-local.start - instead. - - 07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, - targets/stage3/stage3-chroot.sh, targets/stage4/stage4-chroot.sh: - Made EMERGE_WARNING_DELAY=0 for all stages. This is 2.0_rc7. - - 07 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/generic_target.py: - self.env should be a part of the super class generic_target so it applies to - snapshots as well; removing redundant pass in the generic_target class as - its not needed. There is code there to fill the statements - - 07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Forward-porting portage tmpfs mounting from catalyst 1.x, otherwise we break - the Installer. - - 07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Changed version stamp to 2.0_rc6. - - 07 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix for unpack cases - - 05 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fixes for env - - 05 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, files/catalyst.1, - modules/catalyst_support.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/snapshot_target.py, modules/tinderbox_target.py: - Stop reading env from the OS. Rely on the more on the envscript for oddball - settings. Change -v to verbose and -V to version - - 04 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is 2.0_rc5. - - 04 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/stage1_target.py: - Fix stage1 to NOT contain the code from stage2;continued cleanup from the - space fix issue - - 02 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/generic_stage_template.spec: - Added chost/cflags/cxxflags/ldflags to example spec template. - - 02 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - OK, just kidding on that last commit. We were already doing rc-update add - xdm default in livecdfs-update.sh and since it is a livecd-only function, - there's no point in having it in rc-update.sh - - 02 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/rc-update.sh: - Have rc-update add xdm if livecd/xdm is set. - - 02 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/catalyst_lock.py, modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/stage1_target.py, modules/stage4_target.py, - modules/tinderbox_target.py: - So I was just kidding on that last commit. This one is 2.0_rc4. - - 02 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - modules/catalyst_lock.py, modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/stage1_target.py, modules/stage2_target.py, - modules/stage4_target.py, modules/tinderbox_target.py: - Reverting my nasty spaces->tabs mess-up and pushing out 2.0_rc4 quickly. - - 02 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - files/catalyst.conf, modules/catalyst_lock.py, - modules/catalyst_support.py, modules/embedded_target.py, - modules/generic_stage_target.py, modules/grp_target.py, - modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, - modules/netboot_target.py, modules/stage1_target.py, - modules/stage2_target.py, modules/stage4_target.py, - modules/tinderbox_target.py, targets/stage1/stage1-controller.sh: - Fixed spacing/tabs. Updated catalyst.conf comments. Added autoresume, md5, - and sha to catalyst.conf by default. This is catalyst 2.0_rc3. - - 02 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix autoresume for unpacking tarballs - - 02 Dec 2005; Eric Edgar <rocket@gentoo.org> - targets/support/livecdfs-update.sh: - remove gnap livecd-type per Koon's request - - 02 Dec 2005; Eric Edgar <rocket@gentoo.org> targets/support/rc-update.sh: - change rc-update add modules default to rc-update add modules boot - - 02 Dec 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/grp_target.py: - Add more verbosity to digests if -V is enabled, add more print messages to - grp digesting code - - 02 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py, modules/grp_target.py: - Add sha/md5 digests support for grp and cleanup other sha/md5 code - - 01 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/grp_target.py: - Fix folder name for grp build dir to not have .tar.bz2 at the end - - 01 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, files/catalyst.conf, - modules/catalyst_support.py, modules/generic_stage_target.py: - Add md5 and sha .digests file creation per wolf31o2's feature request - - 30 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is catalyst-2.0_rc2. - - 30 Nov 2005; Eric Edgar <rocket@gentoo.org> examples/stage4_template.spec, - files/catalyst.conf, modules/generic_stage_target.py, - modules/livecd_stage1_target.py: - Fix livecd-stage1 livecd use flag bug; stage4 doc cleanups;autoresume points - after each successful kernel build;add autoresume documentation to - catalyst.conf - - 30 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/ppc.py, - targets/embedded/embedded-controller.sh, - targets/embedded/embedded-fs-runscript.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/netboot/netboot-combine.sh, targets/netboot/netboot-controller.sh, - targets/stage1/stage1-chroot.sh, targets/stage4/stage4-controller.sh, - targets/support/bootloader-setup.sh, targets/support/chroot-functions.sh, - targets/support/create-iso.sh, targets/support/filesystem-functions.sh, - targets/support/functions.sh, targets/support/kill-chroot-pids.sh, - targets/support/kmerge.sh, targets/support/livecdfs-update.sh, - targets/support/rc-update.sh: - Changed multiple spaces to tabs to satisfy my OCD. - - 29 Nov 2005; Eric Edgar <rocket@gentoo.org> - targets/support/chroot-functions.sh: - Bumped genkernel detection to require 3.3.0 or higher - - 29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/netboot/netboot-controller.sh: - Changed to clst_use from clst_embedded_use and clst_netboot_use and - clst_grp_use. This is catalyst-2.0_rc1. - - 29 Nov 2005; Eric Edgar <rocket@gentoo.org> - targets/netboot/netboot-controller.sh: - change to clst_use from clst_netboot_use - - 29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/stage4/stage4-chroot.sh: - Changed to clst_use from clst_stage4_use and clst_livecd_use. - - 29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage4/stage4-chroot.sh: - Fixed USE invocations in stage4 target. - - 29 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage1_target.py: - Force use=livecd for livecd-stage1 - - 29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - This is version 2.0_pre20051129. - - 28 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage1_template.spec, examples/stage4_template.spec: - Removed kudzu-knoppix from example spec files. - - 22 Nov 2005; Eric Edgar <rocket@gentoo.org> - +livecd/cdtar/ppc-yaboot-cdtar.tar.bz2: - Added ppc-yaboot-cdtar.tar.bz2 to have an Apple/IBM bootable cdrom - - 22 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/grp_template.spec, examples/livecd-stage1_template.spec, - examples/stage4_template.spec, +examples/tinderbox_template.spec: - Added tinderbox_template.spec to examples and cleaned up pkgcache_path - definitions in the examples to fit in 80 columns. - - 22 Nov 2005; Eric Edgar <rocket@gentoo.org> examples/grp_template.spec, - examples/livecd-stage1_template.spec, examples/stage4_template.spec, - modules/grp_target.py, modules/tinderbox_target.py, - targets/tinderbox/tinderbox-chroot.sh: - Tinderbox script: added newuse, tinderbox and grp targets added support for - overriding the pkgcache location via pkgcache_path - pkgcache_path: - /path/to/cache in the spec file, updated example specs to note pkgcache_path - - 22 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf: - Added portdir example to catalyst.conf for bug #113272. - - 22 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/support/create-iso.sh: - Fixed a few lines which were causing the isolinux directory to be removed - when using an isolinux cdtar on x86/amd64. This is 2.0_pre20051122. - - 21 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/create-iso.sh: - Changed check for /boot/isolinux.bin to /isolinux/isolinux.bin - - 21 Nov 2005; Eric Edgar <rocket@gentoo.org> - targets/support/bootloader-setup.sh, targets/support/functions.sh: - Fix pegasos kernelz rename;fix default_append_line to not include initrd= as - too many arches dont use it by default, test for an initrd in the yaboot - config. - - 18 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix split error if use is specified - - 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/palo-1.2_pre20030630-cdtar.tar.bz2, - +livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2: - Updated palo version from catalyst 1.x for HPPA. - - 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Removing for loop for grub on amd64/x86 as it was totally useless. - - 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Remove vga= line for PPC. - - 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - PPC yaboot.conf fix from Lars Weiler <pylon@gentoo.org>. - - 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -catalyst-2.0_pre20051101-slot.patch, catalyst: - Removing slot patch as it probably didn't belong here anyway, and updating - version stamp to 2.0_pre20051118. - - 18 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/livecd_stage1_target.py, - targets/support/bootloader-setup.sh: - fix the bootloader script for isolinux so that it actually makes a cfg file, - remove extra unneeded catalyst aborting print statement, reorganize rm code - to make sure is splits properly and is an array even from the cmdline - - 17 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added call to update-usbids to download the latest usb.ids file. - - 17 Nov 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/generic_stage_target.py: - Move checks of running catalyst into the target which is simpler - - 17 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Attempt to fix bug #111752, due to mount_safety_check calling a lock object - that doesnt exist yet - - 17 Nov 2005; Eric Edgar <rocket@gentoo.org> targets/support/kmerge.sh: - Keep unnecessary programs from installing into kerncache - - 17 Nov 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/generic_stage_target.py: - Turn on more tracebacks at this point to better debug .. will need to turn - them down as we find errors and build appropriate error handlers - - 15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Changed version marker to 2.0_pre20051115 for new ebuild. - - 15 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage2_target.py: - Fix bug in livecd stage2 so that it doesnt try to use tar - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh: - Fixed livecd/readme functionality, as reported to gentoo-catalyst mailing - list by Paul Kessler <kessler@co.wabasha.mn.us> and forward-ported copying - of Getting_Online.txt from catalyst 1.1.10.10. - - 11 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS: - Added Joshua Kinard to authors for his mips contributions. - - 11 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage2_template.spec: - Fixed duplicate linuxrc entry in livecd-stage2_template.spec file. Blame - Paul Kessler on gentoo-catalyst. ;] - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh: - Change variables from cat1 format to cat2 - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/stage1_target.py: - Fix modules has no attribute register - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix broken aliases code that was just proof of concept - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh: - Output mkisofs command line options to assist in debugging - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/create-iso.sh: - Fix the -o option - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Add VERY basic support for aliases kernel parameter. - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage2_target.py: - Remove large section of commented code - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/stage1_target.py: - Allow LDFLAGS to be specified as an ENV variable for stage1 - - 07 Nov 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix rc-update to automatically run default options for livecds. Removed an - erroneous key check. - - 02 Nov 2005; Eric Edgar <rocket@gentoo.org> modules/embedded_target.py, - modules/livecd_stage1_target.py, modules/tinderbox_target.py: - Make use spec key optional to default to profile defaults - - 02 Nov 2005; Eric Edgar <rocket@gentoo.org> - +examples/stage4_template.spec: - Preliminary stage4_template.spec file - - 01 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +catalyst-2.0_pre20051101-slot.patch, catalyst: - Updated version stamp and added slot patch. - - 26 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/netboot_target.py: - Fix ordering problem so self.settings is defined - - 18 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Correct a rsync issue when the directory doesnt exist - - 17 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/embedded/embedded-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/netboot/netboot-controller.sh, - targets/stage4/stage4-controller.sh: - run pre_kmerge and post_kmerge only once - - 17 Oct 2005; Eric Edgar <rocket@gentoo.org> - targets/support/bootloader-setup.sh: - MIPS bootloader patch - - 15 Oct 2005; Eric Edgar <rocket@gentoo.org> - targets/support/mips-arcload_conf.sh: - Fix MIPS Serial Detection - - 13 Oct 2005; Eric Edgar <rocket@gentoo.org> - targets/support/bootloader-setup.sh, targets/support/create-iso.sh, - +targets/support/mips-arcload_conf.sh: - Application of Kumba's patches for MIPS support - - 13 Oct 2005; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh: - Check for the correct arch specific cd building tool - - 13 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Print a warning if livecd/iso is not defined - - 11 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py: - Reverted default CHOST for x86 back to i386-pc-linux-gnu. - - 11 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/post-kmerge.sh: - Check for existence of files in /lib/modules before running depscan.sh. This - replaces the mips-specific check and makes it portable. - - 10 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - update autoresume logic when dealing with rsync unpack operations - - 10 Oct 2005; Eric Edgar <rocket@gentoo.org> - targets/support/post-kmerge.sh: - Bypass module load on mips - - 10 Oct 2005; Eric Edgar <rocket@gentoo.org> targets/support/pre-kmerge.sh: - remove --no-deps so dependancies get installed for genkernel - - 10 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix missing : statement in unpack - - 10 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fix livecd-stage2 unpack when seedcache is turned off - - 10 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/functions.sh: - Fix module unpacking and make it actually optional. - - 10 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix broken seedcache autoresume interaction - - 07 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Cleanup stage directories properly for tar installs - - 06 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/tinderbox_target.py: - Tinderbox no longer cleans /tmp/* - - 06 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/tinderbox/tinderbox-chroot.sh, - targets/tinderbox/tinderbox-controller.sh: - Fixing problem with bind mounted portage and final rsync on tinderbox target - and adding additional logging. - - 06 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/tinderbox_target.py: - Stop tinderbox from trying to create a tarball of itself - - 06 Oct 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix catalyst so it fully disables snapcache when its not specified in the - config file - - 06 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - examples/livecd-stage2_template.spec: - Removed livecd/runscript and livecd/archscript from livecd-stage2 example - spec template and updating version stamp. - - 06 Oct 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py: - allow file_check to proceed if key is not in use - - 06 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_lock.py: - Recursively make the missing directories - - 05 Oct 2005; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh: - Fix extract_modules to just echo a warning that it is missing - - 30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - files/catalyst.conf: - Updating default configuration for catalyst and updating version stamp, - since we're beginning internal testing for release. - - 15 Sep 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fix bug 106004 split strings into a list for empty and rm operation - - 15 Sep 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage2_target.py: - Append slashes to directories so rsyncs work properly - - 13 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage2_template.spec: - Changing source_subpath for livecd-stage2 example for bug #101704. - - 12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage2_template.spec, modules/livecd_stage2_target.py, - targets/support/livecdfs-update.sh: - Added livecd/xdm and livecd/xsession options. These are used to setup the - default display manager and X session, respectively. Added supporting - documentation to example spec files. Imported more work from my fsscript for - the official LiveCD. - - 12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py: - Changing default CHOST for x86 from i386-pc-linux to i686-pc-linux. For - discussion, see bug #88777. - - 12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, +arch/sh.py, - modules/generic_stage_target.py: - Added sh architecture to supported architectures. Thanks to Matsuu Takuto - <matsuu@gentoo.org> for the patch. Closing bug #105693. - - 08 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/support/kmerge.sh, targets/support/livecdfs-update.sh: - Add code to dump grppkgs.txt file on livecd-stage1 and kernelpkgs.txt file - on livecd-stage2 and removing universal motd for livecd/type of - gentoo-release-livecd. - - 08 Sep 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage1_target.py: - Add optional livecd/type env var for scripts to add optional items to the - scripts - - 08 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/files/x86-help.msg: - Removing x86-help.msg as it is no longer used. - - 08 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/README.txt, livecd/files/x86-F3.msg, livecd/files/x86-F4.msg, - livecd/files/x86-F5.msg, livecd/files/x86-F6.msg, livecd/files/x86-F7.msg: - Add dobladecenter description to bootloader files for x86/amd64. - - 06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py: - Changed pentium-mmx to use -march=pentium-mmx and closing bug #102366. - - 01 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/generic_stage_target.py: - Added split to use section for bug #104414. - - 30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/x86-F3.msg, livecd/files/x86-F4.msg, livecd/files/x86-F5.msg, - livecd/files/x86-F6.msg, livecd/files/x86-F7.msg: - Tabs to whitespaces for isolinux. - - 30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Changed isolinux to use new split-out help messages. Using grub gives a - single help message with pager. - - 30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/files/x86-F2.msg, +livecd/files/x86-F3.msg, - +livecd/files/x86-F4.msg, +livecd/files/x86-F5.msg, - +livecd/files/x86-F6.msg, +livecd/files/x86-F7.msg: - Added F2->F7 help messages for isolinux. - - 30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/README.txt, livecd/files/generic.motd.txt, - livecd/files/livecd.motd.txt, livecd/files/livecd-bashrc, - livecd/files/livecd-local.start: - Updated files from latest used to build LiveCD. - - 30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py: - Added sse to HOSTUSE for athlon-xp, since it supports SSE instructions. - - 29 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/catalyst_support.py: - Added fix for using options with = in them with --cli (ex. - livecd/gk_mainargs='--makeopts=-j3'). Blame Jason Pepas - <cell@ices.utexas.edu> for pointing this out to me via email. - - 09 Aug 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/functions.sh: - fix bug in exec_in_chroot for stage1 target - - 09 Aug 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py: - fix missing os. in os.popen. and clear the autoresume flags if the chroot is - invalid. Fix SEEDCACHE unpack issue when needing to use tarball. - - 09 Aug 2005; Eric Edgar <rocket@gentoo.org> AUTHORS, arch/hppa.py, - catalyst, examples/livecd-stage2_template.spec, - examples/snapshot_template.spec, files/catalyst.conf, - livecd/files/Getting_Online.txt, livecd/files/generic.motd.txt, - livecd/files/livecd-bashrc, livecd/files/livecd-local.start, - livecd/files/x86-help.msg, modules/catalyst_lock.py, - modules/catalyst_support.py, modules/livecd_stage2_target.py, - targets/embedded/embedded-controller.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, - targets/stage2/stage2-preclean-chroot.sh, - targets/stage3/stage3-preclean-chroot.sh, - targets/stage4/stage4-controller.sh, targets/support/bootloader-setup.sh, - targets/support/chroot-functions.sh, targets/support/create-iso.sh, - targets/support/filesystem-functions.sh, targets/support/functions.sh, - targets/support/kmerge.sh, targets/support/livecdfs-update.sh, - targets/support/target_image_setup.sh: - Forward port the changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2. Need - to look at gamecdfs-update.sh yet. - - 09 Aug 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Remove extra debugging print statement - - 09 Aug 2005; Eric Edgar <rocket@gentoo.org> catalyst, - +modules/catalyst_lock.py, modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/snapshot_target.py, modules/stage1_target.py, - modules/stage2_target.py, modules/stage4_target.py, - targets/support/functions.sh: - Add locking support. Code simplification for unpack and unpack snapshot. - Remove redundant setup_dir. change --clear_autoresume to --clear-autoresume. - Add seedcache support (Grabs output from previous target run) - options=seedcache. Cleanup code in functions.sh to remove extra /'s printed. - - 27 Jul 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py: - Add support to cache the snapshot dir. add snapcache to options. add - snapshot_cache= to override the default location of the cache in - catalyst.conf (eg snapshot_cache="/mnt/catalyst/snapshot") - - 27 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/files/Getting_Online.txt, +livecd/files/README.txt: - Forward port README.txt and Getting_Online.txt files from catalyst - 1.1.10.8's release. - - 22 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/support/rc-update.sh: - Add automatic creation/deletion of runlevels based on rcadd rcdel - - 19 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/grp_target.py: - Fix grp so that grp/use is not required anymore - - 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/isolinux-2.11-cdtar.tar.bz2, - -livecd/cdtar/isolinux-2.11-memtest86+-cdtar.tar.bz2, - -livecd/cdtar/isolinux-2.13-cdtar.tar.bz2, - -livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2, - +livecd/cdtar/isolinux-3.09-cdtar.tar.bz2, - +livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2: - Updated x86/amd64 isolinux cdtar to 3.09 and removing older versions, as - they are known to cause booting problems. - - 08 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/livecd-bashrc, targets/support/livecdfs-update.sh: - Fixing sed line for startx to auto-start X. Thanks to Christophe PEREZ - <christophe.perez@novazur.com> on the gentoo-catalyst mailing list for - finding this bug. - - 08 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-chroot.sh: - Fixed quoting in stage1 profile check. - - 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage3/stage3-chroot.sh: - Fixing USE for stage3. - - 07 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - targets/support/chroot-functions.sh: - Fix FETCH code so it will run for Pylon - - 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> modules/grp_target.py, - targets/grp/grp-chroot.sh: - Fix bindist invcation. - - 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/grp/grp-chroot.sh: - Made sure bindist was used for all emerges in GRP. - - 07 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/grp/grp-chroot.sh: - Fix USE flags for grp build - - 07 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/grp/grp-chroot.sh, - targets/stage4/stage4-chroot.sh: - let grp use the users environment variables and removed extra - grp_stage23_use from stage4 - - 07 Jul 2005; Eric Edgar <rocket@gentoo.org> - targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: - Remove unnecessary GRP_STAGE23_USE from stage2 and stage3 builds - - 07 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/support/rc-update.sh: - fix bug 98165. Change the separator on rcadd/rcdel from : to | This will - impact all previous spec files that use this option. Its beejays fault - - 06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/ppc.py: - Changed to use linux32 for ppc32 support when build host is ppc64. - - 06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/mips.py, - arch/x86.py: - Removed -fomit-frame-pointer from default CFLAGS, since it isn't necessary. - - 06 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/generic_stage_target.py: - Minor cosmetic print statement fixes for readability - - 06 Jul 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py: - Fix None None bug and exception reporting - - 06 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh: - Fix iso creation script. Case statement out of place - - 05 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/alpha.py, - arch/amd64.py, arch/hppa.py, arch/ia64.py, arch/mips.py, arch/ppc.py, - arch/ppc64.py, arch/s390.py, arch/sparc.py, arch/sparc64.py, arch/x86.py, - catalyst, files/catalyst.conf, modules/builder.py, - modules/catalyst_support.py, modules/embedded_target.py, - modules/generic_stage_target.py, modules/generic_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/snapshot_target.py, modules/stage1_target.py, - modules/stage2_target.py, modules/stage3_target.py, - modules/stage4_target.py, modules/tinderbox_target.py, - targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-fs-runscript.sh, - targets/embedded/embedded-preclean-chroot.sh, targets/embedded/unmerge.sh, - targets/grp/grp-chroot.sh, targets/grp/grp-controller.sh, - targets/grp/grp-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/livecd-stage2/unmerge.sh, targets/netboot/netboot-chroot.sh, - targets/netboot/netboot-combine.sh, targets/netboot/netboot-controller.sh, - targets/netboot/netboot-image.sh, targets/stage1/build.py, - targets/stage1/stage1-chroot.sh, targets/stage1/stage1-controller.sh, - targets/stage1/stage1-preclean-chroot.sh, targets/stage2/stage2-chroot.sh, - targets/stage2/stage2-controller.sh, - targets/stage2/stage2-preclean-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/stage3/stage3-controller.sh, - targets/stage3/stage3-preclean-chroot.sh, targets/stage4/stage4-chroot.sh, - targets/stage4/stage4-controller.sh, - targets/stage4/stage4-preclean-chroot.sh, targets/stage4/unmerge.sh, - targets/support/create-iso.sh, targets/support/functions.sh, - targets/support/kmerge.sh, targets/support/livecdfs-update.sh, - targets/support/post-kmerge.sh, targets/support/pre-kmerge.sh, - targets/support/target_image_setup.sh, - targets/tinderbox/tinderbox-chroot.sh, - targets/tinderbox/tinderbox-controller.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh: - Big honkin' copyright update. - - 05 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py: - add additional logging output. Use standard os redirection methods to log to - a file - - 05 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-chroot.sh: - Added profile sanity check for bug #97867. - - 05 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Removing acpi=off from default kernel arguments and adding ia64 - livecd-stage2 support functions and cdtar. - - 30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh, targets/support/pre-kmerge.sh: - Changed sed line for 1024x768-only splash for x86 and amd64 only, as we - control the framebuffer size there. Also, added CONSOLE=/dev/tty1 quiet to - splash command line. - - 28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/create-iso.sh: - Fixed up zisofs support. Waiting for response from sparc before touching - their ISO creation. - - 28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/livecd_stage2_target.py, targets/support/bootloader-setup.sh, - targets/support/functions.sh: - Added livecd/bootargs and added the option to the bootloader-setup.sh script - to allow it to work on all arches that dynamically build their bootloader - configuration. - - 27 Jun 2005; Eric Edgar <rocket@gentoo.org> - targets/stage4/stage4-controller.sh: - Fix stage4 so it doesnt run the bootloader stuff - - 24 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh: - Removed dokeymap from non-Gentoo releases. - - 23 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Added call to update-pciids to download the latest pci.ids file. - - 23 Jun 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/livecd_stage1_target.py, - modules/stage4_target.py: - Allow changing the location of the pkg_cache in stage4 or livecd-stage1 - - 22 Jun 2005; Eric Edgar <rocket@gentoo.org> : - Fix issue where -s on the command line would not run - - 22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/generic.motd.txt: - Changed motd to point to /boot/config-* rather than /proc/config(.gz) for - kernel configurations. - - 22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Updated hostname/domainname creation for new baselayout. - - 16 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/bootloader-setup.sh, targets/support/create-iso.sh: - Fixing some bootloader isolinux/boot stuff for x86/amd64. - - 14 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/chroot-functions.sh: - Change portage emerge to use --oneshot --nodeps to keep from merging the - same packages multiple times. - - 14 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage2/stage2-chroot.sh: - Added a -p bootstrap when catalyst is called with -V (verbose). - - 10 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Removed inittab hack, as this is done by livecd-tools. - - 09 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/minimal.motd.txt, livecd/files/universal.motd.txt: - Revert sync for bug #86914. Yeah... I need to pay more attention sometimes. - - 09 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/files/README.txt, -livecd/files/environmental.motd.txt, - -livecd/files/gentoo.png, +livecd/files/livecd.motd.txt, - livecd/files/livecd-bash_profile, livecd/files/livecd-bashrc, - livecd/files/minimal.motd.txt, livecd/files/universal.motd.txt, - targets/livecd-stage2/livecd-stage2-controller.sh: - Removed gentoo.png and creation of face directory. Changed - livecd-bash_profile to source root's .bashrc. Sync motd files with catalyst - 1.1.10_pre4. - - 02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-preclean-chroot.sh, - targets/support/chroot-functions.sh: - Added setup_binutils function and force both of them to run during stage1 - cleanup. - - 01 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage2_template.spec: - Added livecd/volid explanation to example spec. - - 01 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/create-iso.sh: - General cleanup of ISO code and added default livecd/volid when it is not set. - - 25 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/embedded/embedded-controller.sh: - Actually modify the embedded target this time. - - 25 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, - examples/livecd-stage2_template.spec, modules/livecd_stage2_target.py, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/stage4/stage4-controller.sh, targets/support/kmerge.sh: - Added mutex to AUTHORS and added livecd/linuxrc support to embedded, stage4, - and livecd-stage2 targets. - - 20 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, catalyst, - files/catalyst.conf: - Retired zhen and added storedir to default catalyst.conf. - - 20 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/livecdfs-update.sh: - Uncommented openglify, since it is needed for both opengl-update-livecd and - opengl-update. - - 18 May 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/generic_stage_target.py: - Fix print statement so it shows when kill_chroot_pids is run correctly - - 16 May 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/snapshot_target.py: - Fix snapshot target to skip the kill_pids check - - 06 May 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py: - Bug fixes in parse_spec, fix issues detecting list or string. - - 05 May 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py: - Fix bug 65284. More flexible spec parsing. Should handle cases where no - spaces are after :. Better handling of comments ( ie preprocessed and - stripped off ). Unset empty keys. - - 03 May 2005; Eric Edgar <rocket@gentoo.org> catalyst, - targets/support/kill-chroot-pids.sh: - Remove extra P_NAME definition that is never used. Saves processing time. - Bumped catalyst to pre2 - - 03 May 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/generic_stage_target.py, modules/livecd_stage2_target.py, - +targets/support/kill-chroot-pids.sh: - User info about runscript and archscript. Added checks for processes running - in the chroot and created a script to kill them. Should fix the unmounting - issues with gconfd or any other running application in the chroot - - 29 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/stage1/stage1-chroot.sh, targets/stage1/stage1-preclean-chroot.sh: - Remove using gcc-config to set things up as we should all be using 2005.0 - seed stages now. - - 29 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/livecd-stage2_template.spec: - Added livecd/users to example livecd-stage2 spec file. - - 29 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/support/livecdfs-update.sh: - Change default hostnames for livecds - - 29 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/support/bootloader-setup.sh, targets/support/livecdfs-update.sh: - Fix /etc/hosts aliases for catalyst-livecd and work on help menu for grub - bootloading - - 29 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage2_target.py: - Clear autoresume flags when build is done - - 29 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage2_target.py, targets/support/bootloader-setup.sh, - targets/support/create-iso.sh: - Fix isolinux so that it finds menus and kernels and stuff - - 28 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Make purge operation a little less chatty, removed print statements - - 28 Apr 2005; Eric Edgar <rocket@gentoo.org> - livecd/cdtar/isolinux-2.13-cdtar.tar.bz2, - livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2: - updated isolinux-2.13 cdtars to have files under boot/ rather than isolinux/ - - 28 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/livecd_stage2_target.py: - print warning message about deprecated use of cdfstype - - 28 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/support/chroot-functions.sh: - statically define genkernel location to eliminate which command failure if - genkernel is not installed - - 27 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - change the portage_overlay to an array so it always works - - 27 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py: - Fix exception handling to remove extraneous prints of None - - 27 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/stage4_target.py: - Remove iso creation code from stage4 - - 27 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/snapshot_target.py, - targets/embedded/embedded-controller.sh, targets/grp/grp-controller.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/netboot/netboot-controller.sh, - targets/stage1/stage1-controller.sh, targets/stage2/stage2-controller.sh, - targets/stage3/stage3-controller.sh, targets/stage4/stage4-controller.sh, - targets/support/bootloader-setup.sh, targets/support/chroot-functions.sh, - targets/support/create-iso.sh, targets/support/kmerge.sh, - targets/support/target_image_setup.sh, - targets/tinderbox/tinderbox-controller.sh: - Fix some exception handling in catalyst_support.py - remove intermediate destination folder of iso and tarball - Add additional tests for folders not found on host but defined - in spec file. Keep catalyst from erroring in this case. - Change exit code on shell scripts so that errors are reported to catalyst - and causes catalyst to die on errors - Fix bug in livecd-stage1-chroot.sh so that it uses USE flags properly - Added additional check for mkisofs. Informs user of where to get the program. - Removed autoresume code from ccache and distcc installation until I can figure - out a way to have the autoresume flag go someplace outside the chroot. - - 26 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst: - Remove bind mounts before rm operations happen at startup - - 26 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - Fix bug where purge deletes the autoresume directory but doesnt recreate it - - 26 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py: - fix minor bug in the purge code so that it actually runs the commands - - 22 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/embedded_target.py, - modules/generic_stage_target.py, modules/livecd_stage2_target.py, - modules/stage4_target.py: - Change ordering of tasks so root_overlay and fsscript occur after - livecd_update, giving users a chance to override livecd_update - - 21 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py: - Added a better exception handling message for keyboard interrupt and added - countdown timer for purge operation to give an opportunity to exit - - 21 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py: - Add support to clear the autoresume flags and improve the purge code to - clean the chroot, and pkg/kern cache - - 21 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py, - modules/livecd_stage1_target.py: - only append livecd-tools to the livecd-stage1 target package list and move a - check out of the way so command line and spec files can co-exist - - 21 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py: - fixed python syntax in set_packages so catalyst will run - - 21 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/stage4_target.py, modules/tinderbox_target.py, - targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-controller.sh, - targets/livecd-stage1/livecd-stage1-controller.sh, - -targets/livecd-stage2/livecd-stage2-bootloader.sh, - -targets/livecd-stage2/livecd-stage2-cdfs.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - -targets/livecd-stage2/livecd-stage2-iso.sh, - targets/stage4/stage4-chroot.sh, targets/stage4/stage4-controller.sh, - +targets/support/bootloader-setup.sh, targets/support/chroot-functions.sh, - +targets/support/create-iso.sh, targets/support/filesystem-functions.sh, - targets/support/functions.sh, targets/support/livecdfs-update.sh, - +targets/support/target_image_setup.sh: - embedded target cleanups ... iso,bootloader,target_setup generalizations, - minor code fixes - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/support/livecdfs-update.sh: - Moved xinitrc to after livecdfs-update to allow for changing the xinitrc to - a custom one if livecd/type is gentoo-gamecd. Added more default setup to - livecdfs-update.sh for livecd/type: gentoo-gamecd, gentoo-release-livecd, - and generic-livecd. - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/support/rc-update.sh: - Updated rc-update.sh with better defaults for different livecd/type settings - and cleaning up file copying in livecd-stage2-controller.sh to match - catalyst 1.1.9. - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> README: - Made example of catalyst.conf in README match the default catalyst.conf - provided. - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> -NOTES, README, - -REMARKS, -TODO: - Removing old files from previous maintainers and updating README. - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/livecd_stage2_target.py, targets/support/livecdfs-update.sh: - Added livecd/users option to create non-root users. The first user listed - will also be used for auto-starting X, if X is merged onto the CD. - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/support/livecdfs-update.sh: - Updated all instances of livecd/type: gentoo-release-environmental to - gentoo-release-livecd and added generic-livecd. - - 20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/fsscript.sh.example, examples/gamecd.conf.example, - examples/generic_stage_template.spec, examples/grp_template.spec, - examples/livecd-stage1_template.spec, - examples/livecd-stage2_template.spec, examples/netboot_template.spec, - examples/snapshot_template.spec: - Imported example files from catalyst 1.1.9 to make them more verbose. - - 18 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/grp_target.py: - Fix grp/use bug #89365 - - 15 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/kmerge.sh: - Fixes for initramfs overlay support. - - 15 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/kmerge.sh, - targets/support/pre-kmerge.sh: - Fix ctrl-c error if pre-kmerge.sh is running by sourcing - /tmp/chroot-functions.sh and removed extra equal sign to fix a genkernel - caching bug; Also adding preliminary support for initramfs_overlay from genkernel - - 14 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, targets/support/kmerge.sh: - Removed support for postconf as genkernel no longer has that option - - 14 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot_target.py, - modules/stage4_target.py, modules/tinderbox_target.py, - targets/stage1/stage1-chroot.sh, targets/stage1/stage1-controller.sh, - targets/stage1/stage1-preclean-chroot.sh, - targets/support/chroot-functions.sh: - AUTORESUME PATCH; modified the chroot-functions.sh script so the chroot will - die properly on CTRL-C; fixed stage1 bug with gcc-setup - - 11 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/livecd_stage2_target.py: - Added support for livecd-stage2 to use a snapshot or livecd-stage1 image - - 11 Apr 2005; Eric Edgar <rocket@gentoo.org> - modules/generic_stage_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/stage4_target.py, - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/stage4/stage4-controller.sh, +targets/stage4/unmerge.sh, - targets/support/functions.sh, targets/support/kmerge.sh, - targets/support/livecdfs-update.sh, +targets/support/rc-update.sh: - Generalized kernel support, fsscript, rcupdate, etc for stage4 - - 09 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/support/pre-kmerge.sh: - Removed sed for usb devices from legacy genkernel, as we're going to require - a version much higher that no longer exhibits the bug. - - 08 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - examples/gamecd.conf.example, -targets/support/gamecdfs-update.sh, - targets/support/livecdfs-update.sh: - Removed empty gamecdfs-update.sh, updated livecdfs-update.sh to work - properly with hotplug firmwares, and also updated gamecd.conf.example, since - the ut2004demo shell script has been renamed to ut2004-demo. - - 08 Apr 2005; Eric Edgar <rocket@gentoo.org> targets/support/pre-kmerge.sh: - let genkernel always reinstall itself - - 07 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py, - modules/stage1_target.py, targets/support/livecdfs-update.sh: - fix case bug in livecdfs-update.sh; fix bug in initial command line - arguement parsing; add cflags spec file support which is only allowed to - override in stage1 - - 07 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/stage3/stage3-chroot.sh: - Fix a use flag bug in the stage3 - - 07 Apr 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py: - Changes to allow cflags, chost, cxxflags in a spec file - - 06 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage2/livecd-stage2-controller.sh, - targets/stage1/stage1-preclean-chroot.sh, targets/support/functions.sh, - targets/support/gamecdfs-update.sh, targets/support/livecdfs-update.sh, - targets/support/pre-kmerge.sh: - change the code to use more case statements. Fix gcc issue in stage1. - - 06 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1-controller.sh, - targets/support/gamecdfs-update.sh, targets/support/livecdfs-update.sh: - Merging in changes from catalyst 1.1.x for gamecd support. - - 06 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/stage1/stage1-preclean-chroot.sh: - Removing gcc-config stuff to see if its still required to work around a gcc - bug - - 06 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/support/chroot-functions.sh, targets/support/kmerge.sh: - Added tests for genkernel >3.2.0 - - 05 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst: - Fixed email address - - 05 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS: - Updated AUTHORS with new maintainers and updated contributors list. - - 05 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - examples/fsscript.sh.example, livecd/files/README.txt, - livecd/files/livecd-bash_profile, livecd/files/livecd-bashrc, - livecd/files/minimal.motd.txt, livecd/files/universal.motd.txt, - targets/support/gamecdfs-update.sh, targets/support/livecdfs-update.sh: - Changed maintainers. Updated examples/fsscript.sh.example to provide better - documentation. Lots of minor cosmetic updates. Updated minimal.motd.txt and - universal.motd.txt to resolve documentation issue on bug #86914. Added - x-setup to default runlevel on gamecd builds. Removed extranneous bashlogin - sed-fu from livecdfs-update.sh and made default timezone UTC rather than - GMT. - - 05 Apr 2005; Eric Edgar <rocket@gentoo.org> - targets/livecd-stage2/livecd-stage2-controller.sh: - Removed a few unnecessary comments - - 05 Apr 2005; Eric Edgar <rocket@gentoo.org> : - Removed obsolete files from the livecd directory as the functionality has - moved into the targets folders - - 04 Apr 2005; Eric Edgar <rocket@gentoo.org> - +targets/netboot/netboot-chroot.sh, +targets/netboot/netboot-controller.sh: - Additional catalyst 2.0.0 files - - 04 Apr 2005; Eric Edgar <rocket@gentoo.org> catalyst, arch/arm.py, - +livecd/cdtar/grub-memtest86+-cdtar.tar.bz2, - +livecd/cdtar/isolinux-2.11-cdtar.tar.bz2, - +livecd/cdtar/isolinux-2.11-memtest86+-cdtar.tar.bz2, - -livecd/isogen/alpha-isogen.sh, -livecd/isogen/hppa-isogen.sh, - -livecd/isogen/ppc-isogen.sh, -livecd/isogen/sparc-isogen.sh, - -livecd/isogen/sparc64-isogen.sh, -livecd/isogen/x86-isogen.sh, - -livecd/runscript/alpha-archscript.sh, - -livecd/runscript/default-runscript.sh, - -livecd/runscript/hppa-archscript.sh, -livecd/runscript/ppc-archscript.sh, - -livecd/runscript/sparc-archscript.sh, -livecd/runscript/x86-archscript.sh, - -livecd/runscript-support/gamecdfs-update.sh, - -livecd/runscript-support/kmerge.sh, - -livecd/runscript-support/livecdfs-update.sh, - -livecd/runscript-support/post-kmerge.sh, - -livecd/runscript-support/pre-kmerge.sh, modules/catalyst_support.py, - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, -modules/netboot.py, - +modules/netboot_target.py, modules/snapshot_target.py, - modules/stage1_target.py, +modules/stage4_target.py, - modules/tinderbox_target.py, targets/embedded/embedded-chroot.sh, - +targets/embedded/embedded-controller.sh, - targets/embedded/embedded-preclean-chroot.sh, -targets/embedded/embedded.sh, - -targets/embedded/kmerge.sh, targets/grp/grp-chroot.sh, - +targets/grp/grp-controller.sh, targets/grp/grp-preclean-chroot.sh, - -targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, - +targets/livecd-stage1/livecd-stage1-controller.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - -targets/livecd-stage1/livecd-stage1.sh, - +targets/livecd-stage2/livecd-stage2-bootloader.sh, - +targets/livecd-stage2/livecd-stage2-cdfs.sh, - +targets/livecd-stage2/livecd-stage2-controller.sh, - +targets/livecd-stage2/livecd-stage2-iso.sh, - targets/livecd-stage2/unmerge.sh, -targets/netboot/netboot-busybox.sh, - targets/netboot/netboot-combine.sh, targets/netboot/netboot-image.sh, - -targets/netboot/netboot-kernel.sh, -targets/netboot/netboot-packages.sh, - -targets/netboot/netboot-setup.sh, -targets/netboot/netboot.sh, - targets/stage1/build.py, targets/stage1/stage1-chroot.sh, - +targets/stage1/stage1-controller.sh, - +targets/stage1/stage1-preclean-chroot.sh, - -targets/stage1/stage1-preclean1-chroot.sh, - -targets/stage1/stage1-preclean2-chroot.sh, -targets/stage1/stage1.sh, - targets/stage2/stage2-chroot.sh, +targets/stage2/stage2-controller.sh, - targets/stage2/stage2-preclean-chroot.sh, -targets/stage2/stage2.sh, - targets/stage3/stage3-chroot.sh, +targets/stage3/stage3-controller.sh, - targets/stage3/stage3-preclean-chroot.sh, -targets/stage3/stage3.sh, - +targets/stage4/stage4-chroot.sh, +targets/stage4/stage4-controller.sh, - +targets/stage4/stage4-preclean-chroot.sh, - +targets/support/chroot-functions.sh, - +targets/support/filesystem-functions.sh, +targets/support/functions.sh, - +targets/support/gamecdfs-update.sh, +targets/support/kmerge.sh, - +targets/support/livecdfs-update.sh, +targets/support/post-kmerge.sh, - +targets/support/pre-kmerge.sh, targets/tinderbox/tinderbox-chroot.sh, - +targets/tinderbox/tinderbox-controller.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh, - -targets/tinderbox/tinderbox.sh: - Initial Import of Catalyst 2.0.0 - - 30 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Added /usr/portage as tmpfs (this will be made conditional later). - - 29 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/files/livecd-bash_profile, livecd/runscript/default-runscript.sh: - Added a new livecd-bash_profile that sources ~/.bashrc in case we're called - from an interactive shell. - - 29 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/files/livecd-bash_profile, +livecd/files/livecd-bashrc, - livecd/files/livecd-local.start, -livecd/files/mkvardb, - livecd/runscript-support/pre-kmerge.sh, - livecd/runscript/default-runscript.sh: - Moved livecd-bash_profile to livecd-bashrc. Added check for - /usr/livecd/profiles to livecd-local.start. Removed mkvardb. Removed legacy - sed call from pre-kmerge.sh since it has been fixed in genkernel for a long - time. - - 24 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/arm.py, catalyst, - modules/generic_stage_target.py: - Applying arm patch from vapier and closing bug #86466. This is now catalyst - 1.1.8, so enjoy. - - 24 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> +livecd/files/mkvardb, - livecd/runscript/default-runscript.sh, - targets/livecd-stage1/livecd-stage1.sh: - Adding back in the kill for livecd-stage1 for gconfd-2 and resolving bug - #73363. Adding in mkvardb script to create a /var/db/pkg entry from an - arbitrary set of files. Modifying default-runscript.sh to copy mkvardb to - /tmp in the chroot. - - 19 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/ppc-archscript.sh: - Added -l to mkisofs line for ppc as this allows full 31 character file names. - - 16 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2, catalyst: - Changing catalyst version to 1.1.8_pre1 and updating yaboot cdtar to allow - for multiple initrd files. - - 16 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/ppc-archscript.sh: - Modifed PPC archscript to close bug #84648 and also to make the PPC - archscript produce multiple initrd files, like x86/amd64. - - 09 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/isolinux-2.11-cdtar.tar.bz2, - -livecd/cdtar/isolinux-2.11-memtest86+-cdtar.tar.bz2, - livecd/runscript/ppc-archscript.sh: - Alright, so I lied to you. This is now the 1.1.7 release. I removed the 2.11 - isolinux cdtar tarballs and updated the ppc-archscript.sh to use the - livecd/volid for the HFS volid, too. - - 09 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Calling this one 1.1.7 and rolling a tarball. - - 08 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, - livecd/runscript/ppc-archscript.sh, livecd/runscript/sparc-archscript.sh, - -livecd/runscript/sparc64-archscript.sh, - livecd/runscript/x86-archscript.sh, modules/livecd_stage2_target.py: - Added livecd/volid to set the volume ID when creating the ISO, patch by - Gustavo Zacarias <gustavoz@gentoo.org>. Also copied sparc64-archscript.sh to - sparc-archscript.sh and removing sparc64 one, as they are identical now. - - 08 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/cdtar/isolinux-2.13-cdtar.tar.bz2, - +livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2: - Adding experimental isolinux cdtar for isolinux 2.13 and memtest86+ 1.51. - - 08 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Removed hdparm from default runlevel as it break ide=nodma at boot. - - 07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/pre-kmerge.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh: - Revert last set of changes and remove portage version check from emerge in - livecd-stage1, as it breaks catalyst's ability to fail properly on an - incomplete emerge. - - 07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/pre-kmerge.sh: - Change genkernel check to use best_version and has_version to determine if - the any previously installed versions of genkernel are up to date. Change - emerge line for kernels to use -n option to only install if they were not - previously installed. - - 06 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2, - -livecd/cdtar/silo-1.3.2-sparc64-cdtar.tar.bz2, - -livecd/cdtar/silo-1.4.4-sparc32-cdtar.tar.bz2, - livecd/runscript/sparc-archscript.sh: - Applying sparc32 patch from gustavoz. Replacing silo cdtar files with - unified sparc32/sparc64 cdtar. - - 06 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh, - livecd/runscript-support/pre-kmerge.sh: - Change sudoers update to only run if /etc/sudoers exists and only reduce - splash to 1024x768 on minimal and universal install CD. - - 05 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> targets/grp/grp.sh, - targets/livecd-stage1/livecd-stage1.sh: - Changing the killall -9 gconfd-2 to gconftool-2 --shutdown and resolving bug - #73363. - - 03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, - livecd/runscript/ppc-archscript.sh, livecd/runscript/sparc-archscript.sh, - livecd/runscript/sparc64-archscript.sh, - livecd/runscript/x86-archscript.sh: - Added a new empty livecd file to each archscript. This will be used for an - identifier by genkernel to allow booting from a non-primary CDROM. - - 03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Catalyst 1.1.6 is here. - - 03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-preclean2-chroot.sh: - Commenting out stage1 cleaning of /var/db. - - 02 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/pre-kmerge.sh: - Made splash reduction to 1024x768 only for minimal and universal release media. - - 01 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-preclean2-chroot.sh: - Added SLOT files back to /var/db entries in stage1. - - 01 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/files/gentoo.png, livecd/files/livecd-local.start, - livecd/runscript/default-runscript.sh, - livecd/runscript-support/livecdfs-update.sh, - targets/livecd-stage2/unmerge.sh: - Moved portage profiles from livecd-local.start to unmerge.sh, since /usr is - not writeable at boot. Removed -a from cp in default-runscript.sh to keep - the copy from preserving permissions and also adding /usr/share/faces and - default Gentoo icon. We'll see how the icon does for us. Removing serial - init script, as it causes problems with the splash theme. - - 28 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1.sh: - -n, not -z - - 28 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/livecd-local.start, livecd/runscript/default-runscript.sh, - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - livecd/runscript-support/post-kmerge.sh, modules/snapshot_target.py, - targets/livecd-stage1/livecd-stage1.sh, targets/stage1/stage1-chroot.sh, - targets/stage1/stage1-preclean2-chroot.sh: - Removed x-setup from local.start and added in symlinks for gconf, portage - profiles (for installer) and /var/db. Added a touch for root's .bashrc for - baselayout and removed /etc/startx from the environmental type. Commented - unmerge of sources in kmerge.sh, as they should be unmerged by the spec - file. Changed livecdfs-update.sh to setup /etc/hosts properly, allow wheel - users to use sudo with no password, mount /usr/lib/X11/xkb/compiled as tmpfs - for X, use the latest pci.ids and usb.ids from portage, and create - /lib/firmware if it doesn't exist. Commented unmerge of genkernel in - post-kmerge.sh, as it should be unmerged by the spec file. Fixed typo in - snapshot_target.py. Made gconfd check in livecd-stage1.sh work if more than - one gconfd-2 is running. Added a gcc-config fix to stage1-chroot.sh. Changed - gcc-config check in stage1-preclean2-chroot.sh to ensure gcc-config is an - executable. - - 04 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf: - Removed ccache from default options as it breaks catalyst when merged with - USE=-ccache. - - 04 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/snapshot_target.py: - Added /local/ to snapshot exclusion. - - 31 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Updated to attempt to start 5 interfaces, rather than 4. You can blame - gustavoz and his 5 interface Xeon for this. - - 29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1.sh: - Added a conditional before killing gconfd-2. This is also going to be - catalyst 1.1.5, so let's hope we don't find any more bugs, at least for this - release. - - 29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh: - Moved killall -9 gconfd-2 to execute outside chroot. - - 29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/x86-help.msg: - Modified x86-help.msg to remove agpgart line, add noload= line, and replace - tabs with spaces. - - 29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/x86-archscript.sh: - Removed acpi from x86-archscript.sh as it breaks acpi calls on the command - line. - - 29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Version 1.1.4 - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1.sh: - Added killall for gconfd-2 back into livecd-stage1.sh - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/alpha-archscript.sh: - Alpha fixes for multiple kernels.. - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/kmerge.sh: - Changed kmerge.sh from --devfs to --no-udev as --devfs doesn't exist. - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/hppa-archscript.sh, livecd/runscript/sparc-archscript.sh, - livecd/runscript/sparc64-archscript.sh: - Force devfs if udev is not selected for all supporting arches. - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/alpha-archscript.sh, livecd/runscript/x86-archscript.sh, - livecd/runscript-support/kmerge.sh: - Forcing devfs if livecd/dev-manager isn't udev. This should fix building 2.4 - kernels. - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh: - Re-enabled preclean in grp and added gconfd-2 killing. - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/x86-archscript.sh: - Changed acpi=ht to acpi=off. This fixes acpi loading and also allows for - users to use apm. - - 28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1.sh, - targets/netboot/netboot-packages.sh, targets/stage1/stage1-chroot.sh, - targets/stage3/stage3-chroot.sh, targets/tinderbox/tinderbox-chroot.sh: - Added ability to pause indefinitely. This closes bug #79798. I've also added - the gcond-2 killall back in, but now it is in the actual preclean script and - is executed inside the chroot. - - 26 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst: - Updated for 1.1.3 release. - - 26 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/netboot/netboot-busybox.sh, targets/netboot/netboot-kernel.sh, - targets/netboot/netboot-packages.sh, - targets/tinderbox/tinderbox-chroot.sh: - Updated to use package.use correctly. Blame Robert Paskowitz - <rpaskowitz@confucius.ca> from the gentoo-catalyst mailing list. - - 26 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-preclean2-chroot.sh: - Fixed find line for new stage1 /var/db/pkg. - - 25 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-preclean2-chroot.sh: - Added code to clean up /var/db/pkg, while still keeping the CONTENTS, - COUNTER and ebuilds. This should keep a stage1 useable, while still keeping - its size small. - - 24 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Removed gpm changes, as it has been moved to livecd-tools and autoconfig, - added net.ethX symlinks, and added copying of files from - /usr/lib/hotplug/firmware into firmware tarball. - - 23 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Firmware updated to use new /lib/firmware directory. - - 16 Jan 2005; John Davis <zhen@gentoo.org> catalyst: - fix from pvdabeel@gentoo.org. patch fixes a small bug that caused grp to not - work when both -f and -C were used on the command line. - - 13 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/netboot/netboot-packages.sh, targets/stage1/stage1-chroot.sh, - targets/stage3/stage3-chroot.sh: - Added a portage version check to each target that uses --newuse to ensure a - high enough version is used. This resolves bug #75336. - - 13 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/livecd-local.start: - Possible local.start fix for beejay. - - 12 Jan 2005; John Davis <zhen@gentoo.org> - modules/embedded.py: - kernel building patch for embedded from mutex@gentoo.org (bug #76542) - - 11 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/kmerge.sh: - Added ccache support to genkernel call in livecd-stage2. - - 11 Jan 2005; John Davis <zhen@gentoo.org> - targets/netboot/netboot-busybox.sh, targets/netboot/netboot-combine.sh, - targets/netboot/netboot-image.sh, targets/netboot/netboot-kernel.sh, - targets/netboot/netboot.sh: - netboot path from gmsoft@gentoo.org. The patch addresses many bugs and adds - some feature enhancements. - - 11 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1.sh, - targets/netboot/netboot-packages.sh, targets/stage1/stage1-chroot.sh, - targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: - Added a -F or --fetchonly command line option and closing out bug #77480. - Also added a portage version check to livecd-stage1 to close out bug #68307. - - 11 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh, - targets/stage3/stage3-chroot.sh: - Fixed DHCP for eth0->eth3 in livecdfs-update.sh and also changed stage3 - target to use emerge -e when building. This is only temporary until the - bootstrap.sh script can be fixed or another solution can be decided upon. - - 09 Jan 2005; John Davis <zhen@gentoo.org> targets/embedded/embedded.sh, - +targets/embedded/kmerge.sh: - partial fix for #76542, waiting for the necessary patch to modules/embedded.py - from mutex@gentoo.org - - 09 Jan 2005; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - modules/livecd_stage2_target.py: - fix for bug #76146 - - 05 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh, targets/stage1/stage1.sh: - Updated livecdfs-update.sh to modify inittab to use bashlogin. Updated - targets/stage1/stage1.sh to no longer clean /var/db/pkg, which should fix - the brokenness of a stage1 tarball. - - 04 Jan 2005; John Davis <zhen@gentoo.org> catalyst: - patch for pvdabeel@gentoo.org. -f and -C can now be used together on the - cmdline - - 04 Jan 2005; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - modules/livecd_stage2_target.py: - fix for #76530 - - 04 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -livecd/cdtar/isolinux-2.08-cdtar.tar.bz2, - -livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2, - -livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2, - +livecd/cdtar/isolinux-2.11-cdtar.tar.bz2, - +livecd/cdtar/isolinux-2.11-memtest86+-cdtar.tar.bz2: - Upgraded the isolinux cdtar files and closing bug #70518. - - 04 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> - modules/embedded_target.py, modules/generic_stage_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/netboot.py, - modules/stage1_target.py, modules/tinderbox_target.py: - Added patches from Eric Edgar <e_edgar@hotmail.com> from bug #70663 to - separate out specific target logic from the generic targets modules. - - 03 Jan 2005; John Davis <zhen@gentoo.org> arch/ppc.py: - new PPC arch file from pvdabeel@gentoo.org - - 01 Jan 2005; John Davis <zhen@gentoo.org> catalyst, - examples/generic_stage_template.spec, modules/catalyst_support.py: - tweaking error handling in the main catalyst script - updated the example to include a blurb about portage_confdir - - 29 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Cleanup on livecdfs-update.sh script and testing a possible bashlogin fix. - - 17 Dec 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py: - fix for #73851 - - 17 Dec 2004; John Davis <zhen@gentoo.org> modules/catalyst_support.py: - fix for #66592. catalyst now gives a traceback when it bails out, making - troubleshooting amazingly easier - - 17 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - modules/catalyst_support.py, modules/embedded_target.py, - modules/generic_stage_target.py, modules/grp_target.py, - modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, - modules/netboot.py, modules/stage1_target.py, modules/tinderbox_target.py: - Reversing patch from Eric Edgar from bug #70663. - - 17 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/x86-archscript.sh: - Added -no-emul-boot back into x86-archscript.sh as apparently isolinux will - not work without it (mkisofs fails on creating ISO). - - 16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - modules/catalyst_support.py, modules/embedded_target.py, - modules/generic_stage_target.py, modules/grp_target.py, - modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, - modules/netboot.py, modules/stage1_target.py, modules/tinderbox_target.py: - Added patches from Eric Edgar <e_edgar@hotmail.com> from bug #70663 to - separate out specific target logic from the generic targets modules. - - 16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - modules/embedded_target.py, targets/embedded/embedded-fs-runscript.sh, - targets/embedded/embedded.sh: - Added more embedded updates from mutex@gentoo.org and Closing bug #67289. - - 16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - +examples/gamecd.conf.example, -livecd/files/gamecd-xinitrc, - livecd/runscript/default-runscript.sh, - livecd/runscript-support/gamecdfs-update.sh, - livecd/runscript-support/livecdfs-update.sh, - modules/livecd_stage2_target.py: - Added gamecd/conf option to livecd_stage2_target.py, added - gamecd.conf.example to /examples, cleaned up game-specific code in - gamecdfs-update.sh to make it more generic, added more fundtionality to - livecdfs-update.sh and default-runscript.sh for gentoo-release-environmental - and gentoo-gamecd to make spec files simpler and to remove the need for - specifying a gamecd/environmental fsscript in livecd/fsscript, allowing the - user to still use a custom fsscript of their own. - - 16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/files/environmental.motd.txt, - targets/livecd-stage1/livecd-stage1.sh: - Added environmental.motd.txt for gentoo-release-environmental livecd/type. - - 15 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/default-runscript.sh, - livecd/runscript-support/livecdfs-update.sh: - Added gentoo-release-environmental as a valid livecd/type and did some - cleanup in livecdfs-update.sh to allow hotplug to dhcp on detected ethernet - devices other than eth0. - - 14 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - targets/livecd-stage1/livecd-stage1-chroot.sh: - Changed livecd-stage1 to merge each package individually. This should not - make it into a production version of catalyst, but is here as a possible - solution to bug #68307. - - 12 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, - livecd/runscript/sparc-archscript.sh, - livecd/runscript/sparc64-archscript.sh, - livecd/runscript/x86-archscript.sh: - Added failures to all arches on mkisofs failure and also made -z option to - mkisofs optional on x86 depending on loop type used. - - 12 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/x86-archscript.sh: - Making sure the mkisofs call causes a failure when it doesn't complete - successfully. Once again, blame jforman, our beloved infra-monkey. - - 12 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/default-runscript.sh: - squashfs-utils->squashfs-tools fix. Blame jforman. - - 09 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/isogen/x86-isogen.sh: - Removed -no-emul-boot from x86-isogen.sh to keep the ISO being made from - possibly not booting on really old systems. - - 09 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/x86-archscript.sh: - Removed -no-emul-boot from x86-archscript.sh to keep the ISO being made from - possibly not booting on really old systems. - - 08 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Save some space by removing redundant firmware after tarball is made, only - perform sed on /etc/conf.d/gpm if it exists, and change fstab to be more - readable. - - 06 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> - targets/stage1/stage1-preclean2-chroot.sh: - Added patch from vapier and closing bug #73556. - - 22 Nov 2004; John Davis <zhen@gentoo.org> modules/embedded_target.py, - modules/generic_stage_target.py, -targets/embedded/cramfs-runscript.sh, - +targets/embedded/embedded-fs-runscript.sh, - targets/livecd-stage2/unmerge.sh, targets/stage1/stage1-chroot.sh, - targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: - fixes for bugs #49819 and #71033. Partial fix for #67289 - waiting on a patch - from mutex@gentoo.org for modules/embedded.py - - 19 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/gamecd-xinitrc, livecd/runscript-support/gamecdfs-update.sh, - livecd/runscript-support/livecdfs-update.sh: - Fixing up some GameCD stuff and also fixing a problem with the ls and grep - aliases having --color rather than --color=auto. - - 17 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/livecd-local.start: - Let's try actually making a proper edit on livecd/files/livecd-local.start - this time, shall we... - - 17 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/livecd-local.start: - Fixing up livecd/files/livecd-local.start to remove ALSA config and make - x-setup check for /etc/startx. - - 14 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/gamecdfs-update.sh: - Fixing minor sed bug in gamecdfs-update.sh. - - 07 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - examples/snapshot_template.spec, - livecd/runscript-support/gamecdfs-update.sh, - livecd/runscript-support/livecdfs-update.sh: - Fixing typo in snapshot_template.spec and closing bug #70321. - - 02 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/pre-kmerge.sh: - Ssshhh... I've added my super-secret pre-kmerge.sh sed replacement so - genkernel will only add the 1024x768 version of the gensplash image to the - bzImage, which added with the livecd-stage2 removal of the unused splash - images, makes for a significantly smaller (54MB v. 50MB) LiveCD. - - 29 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> - +livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2, - livecd/runscript/sparc64-archscript.sh: - Updated with silo/mkisofs patch from gustavoz. - - 28 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/files/x86-help.msg: - Updated x86-help.msg to make it fall more inline with current - genkernel/livecd-tools options. - - 28 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, - livecd/runscript-support/pre-kmerge.sh: - Removing auto-keymap from kmerge.sh and moving it to x86-archscript.sh since - it is only working properly on amd64 and x86 anyway. Also fixing a typo in - genkernel's module_load for x86 during pre-kmerge.sh, which should fix USB - loading. - - 22 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf, - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - targets/livecd-stage2/unmerge.sh, targets/netboot/netboot-kernel.sh: - Changed kernel build caching to use kerncache option, rather than pkgcache - option. Fixed --postconf and --callback for builds that do not require them. - Removed delay when removing package sin the system profile. This is now - catalyst 1.1.0, so enjoy. - - 21 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - Stopping udev from using the nasty device tarball. We don't need it anyway. - - 21 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, - livecd/runscript/sparc-archscript.sh, - livecd/runscript/sparc64-archscript.sh, - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, modules/catalyst_support.py: - Fixing gpm support by uncommenting default settings. Fixing case where - boot/kernel/$kname/packages or boot/kernel/$kname/postconf were empty. - Changing sparc kernel files from kernel* to kernel-* so kernel.msg does - not get renamed. Fixed a problem where we were accidentally removing the - hwdata-knoppix versions of pci.ids and usb.ids and linking - /usr/share/misc/*.ids to non-existent files. This should hopefully be it - for 2004.3 and catalyst 1.1.0. - - 19 Oct 2004; John Davis <zhen@gentoo.org> arch/ia64.py: - patch from vapier@gentoo.org for bug #68080 - - 19 Oct 2004; John Davis <zhen@gentoo.org> catalyst, files/catalyst.conf, - livecd/runscript-support/kmerge.sh: - made kernel caching dependent on the "pkgcache" option so that genkernel's - postconf can actually work - - 18 Oct 2004; John Davis <zhen@gentoo.org> - livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh: - patch submitted by wolf31o2@gentoo.org to fix the rest of the gensplash woes - - 17 Oct 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - firmware tarball fix for packages that need firmware such as ipw2100 - - 16 Oct 2004; <zhen@gentoo.org> livecd/files/x86-help.msg, - livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - modules/livecd_stage2_target.py: - patches for gensplash support from Chris Gianelloni <wolf31o2@gentoo.org> - - 14 Oct 2004; <zhen@gentoo.org> livecd/runscript/x86-archscript.sh: - acpi=off changed to acpi=ht. enables HT automatically for intel users, but - should not hurt non-HT users - - 12 Oct 2004; John Davis <zhen@gentoo.org> - targets/embedded/cramfs-runscript.sh, targets/embedded/embedded-chroot.sh, - +targets/embedded/unmerge.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, targets/netboot/netboot.sh, - targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh, - livecd/runscript-support/kmerge.sh: - bugfixes for #67195, #67197, #67122, and #46918 - - 12 Oct 2004; John Davis <zhen@gentoo.org> modules/netboot.py: - small netboot fixups - - 11 Oct 2004; <zhen@gentoo.org> modules/netboot.py, - targets/netboot/netboot-busybox.sh, targets/netboot/netboot-image.sh, - targets/netboot/netboot-kernel.sh, targets/netboot/netboot-packages.sh, - targets/netboot/netboot.sh: - sweeping updates and changes to the netboot code. the patches should fix the - arch specific code as well as some pkgcache issues, etc. Much thanks to Mike - Frysinger <vapier@gentoo.org> for writing and contributing the patches. - - 06 Oct 2004; John Davis <zhen@gentoo.org> files/catalyst.1, - livecd/runscript-support/kmerge.sh, targets/netboot/netboot-busybox.sh, - targets/netboot/netboot-image.sh, targets/netboot/netboot-kernel.sh, - targets/netboot/netboot.sh: - more code cleanup and maintenance - - 05 Oct 2004; John Davis <zhen@gentoo.org> modules/catalyst_support.py, - modules/generic_stage_target.py, +modules/netboot.py, - +targets/netboot/netboot-busybox.sh, +targets/netboot/netboot-image.sh, - +targets/netboot/netboot-kernel.sh, +targets/netboot/netboot-packages.sh, - +targets/netboot/netboot.sh: - initial import of the netboot code. thanks to Guy Martin <gmsoft@gentoo.org> - for writing them! - - 05 Oct 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, - targets/stage3/stage3-chroot.sh, targets/tinderbox/tinderbox-chroot.sh: - bugfix for #66083 which in turn addresses #61605. distcc apparently does not - have to start a server on the build host for it to distribute. - - 04 Oct 2004; John Davis <zhen@gentoo.org> catalyst: - added a new -s/ --snapshot option. no more using --cli to create snapshots, - just do -s version_stamp - - 29 Sep 2004; John Davis <zhen@gentoo.org> targets/stage2/stage2-chroot.sh: - bugfix #60502 - the stage2 target can now resume the bootstrapping process - - 28 Sep 2004; John Davis <zhen@gentoo.org> TODO, - +examples/fsscript.sh.example, examples/livecd-stage2_template.spec, - livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, - modules/livecd_stage2_target.py: - udev support for livecds - - 16 Sep 2004; John Davis <zhen@gentoo.org> modules/catalyst_support.py, - +targets/livecd-stage2/unmerge.sh: - bug #59681 resolved thanks to the patch from viric@vicerveza.homeunix.net! - Also, livecd-stage2 unmerge.sh added back in. - - 13 Sep 2004; John Davis <zhen@gentoo.org> catalyst, - livecd/runscript-support/livecdfs-update.sh: - bugfixes for #60887 and #63338 - - 09 Sep 2004; John Davis <zhen@gentoo.org> catalyst: - bugfixes for #63382 and #63338 - - 08 Sep 2004; John Davis <zhen@gentoo.org> - livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, - livecd/runscript/ppc-archscript.sh, livecd/runscript/sparc-archscript.sh, - livecd/runscript/sparc64-archscript.sh, livecd/runscript/x86-archscript.sh, - livecd/runscript-support/kmerge.sh, livecd/runscript-support/pre-kmerge.sh, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - -targets/livecd-stage2/unmerge.sh, targets/stage1/stage1-chroot.sh, - targets/stage3/stage3-chroot.sh, targets/tinderbox/tinderbox-chroot.sh: - lots of changes in this revision. first of all, major cosmetic fixups to the - archscripts. i also fixed a non-reported bug where pkgcache was not being used - for distcc or ccache builds in most of the targets. bug #56581 is finially - closed (kernel caching for multiple runs of the livecd-stage2 build) - big - performance enhancement here. - - 07 Sep 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - modules/livecd_stage2_target.py: - fix for bug #63033, thanks to usata@gentoo.org for the patch - - 30 Aug 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/livecdfs-update.sh, targets/grp/grp-chroot.sh: - bugfixes for #61537 and #61779 - - 13 Aug 2004; John Davis <zhen@gentoo.org> +files/catalyst.1, - modules/generic_stage_target.py, modules/livecd_stage2_target.py, - modules/snapshot_target.py: - bugfixes for #55014 (catalyst needs a manpage), #56581 (livecd-stage2 I/O - enhancements), and #56773 (catalyst overlay for build root). Snapshotting - time should also be improved due to a more efficient use of rsync. This commit will - mark the portage version of catalyst-1.9.0. - - 10 Aug 2004; John Davis <zhen@gentoo.org> arch/mips.py: - add support for mips4n32 subarch. thanks to iluxa@gentoo.org. closes bug - #59882. - - 02 Aug 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py: - fix for bug #58208 - - 02 Aug 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - bugfix #51086 - - 02 Aug 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - +targets/stage1/build.py, -targets/stage1/build.sh, - targets/stage1/stage1-chroot.sh, targets/stage1/stage1-preclean2-chroot.sh, - targets/stage1/stage1.sh, targets/stage2/stage2-chroot.sh, - targets/stage3/stage3-chroot.sh: - applied patch from bug #58840. it should fix up things for uclibc stages and - cascaded profiles. thanks to Mike Frysinger (vapier@gentoo.org) for the patch. - - 21 Jul 2004; John Davis <zhen@gentoo.org> +livecd/files/gamecd-xinitrc, - +livecd/files/gamecd.motd.txt, +livecd/files/generic-motd.txt, - +livecd/files/livecd-bash_profile, +livecd/files/livecd-local.start, - -livecd/files/livecd-rclocal, +livecd/files/minimal.motd.txt, - -livecd/files/motd.txt, +livecd/files/universal.motd.txt, - livecd/runscript/default-runscript.sh, livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - modules/livecd_stage2_target.py: - addition of wolf31o2's gamecd patchset. untested, so please beware - - 14 Jul 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/livecdfs-update.sh, - modules/generic_stage_target.py, modules/livecd_stage2_target.py: - fixed a bug for livecd-stage2. somehow, the inheritance got mucked up and the - livecds were not cleaning out livecd/empty livecd/rm etc. I moved the code for - this out of generic_stage_target and into livecd-stage2 since the - livecd-stage2 class was overriding generic_stage_target for cleaning anyway. - - 13 Jul 2004; <zhen@gentoo.org> livecd/runscript-support/livecdfs-update.sh: - changed the behavior of rcadd/ rcdel. it was getting hokey to have to add the - default rc'ed programs when only one change was required to rcadd. so I - changed it so that the defaults are *always* loaded and specified additions/ - deletions are just added on top of those. - - 12 Jul 2004; John Davis <zhen@gentoo.org> catalyst, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/tinderbox/tinderbox-chroot.sh: - changing the more verbose behavior to the -V (verbose) flag - - 12 Jul 2004; <zhen@gentoo.org> catalyst, - targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh, - targets/tinderbox/tinderbox-chroot.sh: - the -d (debug) flag now makes catalyst calculate an emerge -vp of the packages - it is about to merge so that deps and USE flags are more evident - - 11 Jul 2004; <zhen@gentoo.org> +catalyst, -catalyst.new.py, - modules/catalyst_support.py: - completely rewrote the catalyst main script so that it can actually utilize - more than one command line flag. new functionality included, but not active - yet (--debug and --verbose). arguments can still be passed on the commandline - through the use of the -C (--cli) flag. updated the arg_parse function in - catalyst_support.py to accomodate my changes. - - 02 Jul 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - modules/generic_target.py, modules/grp_target.py, - modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, - modules/snapshot_target.py, modules/stage1_target.py, - modules/stage2_target.py, modules/stage3_target.py, - modules/tinderbox_target.py, targets/stage1/stage1.sh: - fixes for bugs #55192 and #54137 - added a new key for all specfiles, portage_confdir. - this should point to a directory similar in functionality to /etc/portage. - - cleaned up the module code a bit so that unnecessary modules - are not imported. - - more work on resuming. it is getting there, but it still needs a ton of work, - so please test, and report bugs. - - 18 Jun 2004; John Davis <zhen@gentoo.org> catalyst, - modules/catalyst_support.py, modules/generic_stage_target.py, - targets/stage1/build.sh, targets/stage1/stage1-chroot.sh, - targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: - stage resuming functionality should be working. I still have to work on GRP - and livecds, but they should not be hard. I could not incorporate emerge - --resume into stage resuming functionality because in some instances, portage - is remerged (bootstrap, stage2), which wipes out the resume data and puts - catalyst into an infinite portage merging loop (very unproductive, trust me ;) - ). I also made some small tweaks to the stage target scripts which clean up - the envscript stuff. Not noticable performance wise, but it makes me feel all - warm and fuzzy to know that it is programmed absolutely correctly ;) - - 16 Jun 2004; John Davis <zhen@gentoo.org> TODO, modules/catalyst_support.py, - modules/generic_stage_target.py: - revamped the cmd() structure so that it could properly return error codes. - Please note that this might break catalyst until there is some further - testing. SO DO NOT USE IT FOR BUILDING ANYTHING IMPORTANT (yet). The benefit - of me doing this is that SIGINT (ctrl-c) makes catalyst die nice and proper - now. Additionally, catalyst will stop when there is an error with an ebuild - ... it didn't do this before, it just plowed along and packed things up. - - Much thanks to <carpaski@gentoo.org> for (writing) pointing me to the spawn() code in - portage.py and then answering my noob questions. - - 13 Jun 2004; John Davis <zhen@gentoo.org> - livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh: - some last minute fixins - (stuff to work with the new genkernel) - - 13 Jun 2004; John Davis <zhen@gentoo.org> catalyst: - rolling out 1.0.8.1 - - 11 Jun 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh, modules/livecd_stage2_target.py: - new key, livecd/fsscript. use this to run commands in the livecdfs before it - is made into an iso - - 10 Jun 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - livecd/runscript-support/post-kmerge.sh, - livecd/runscript-support/pre-kmerge.sh: - two new functions for livecd-stage2: livecd/rcadd and livecd/rcdel. these two - functions control what scripts are added to their respective runlevels. This - option would be specified like so in the spec file: livecd/rcadd: - metalog:default foo:boot. the syntax is the same for livecd/rcdel. - - 08 Jun 2004; John Davis <zhen@gentoo.org> modules/builder.py, - modules/catalyst_support.py, modules/livecd_stage2_target.py: - livecd-stage2 traced back when boot/kernel/x/config was an empty string, fixed - the code to give a nice error msg instead of a cryptic traceback - - 04 Jun 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/livecdfs-update.sh: - small fix for bootsplash, needed to link clst_livecd_bootsplash to - /etc/bootsplash/default - - 04 Jun 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py, - targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-preclean-chroot.sh, targets/grp/grp-chroot.sh, - targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh, - targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1.sh, targets/stage1/stage1-chroot.sh, - targets/stage1/stage1-preclean1-chroot.sh, targets/stage1/stage1.sh, - targets/stage2/stage2-chroot.sh, targets/stage2/stage2-preclean-chroot.sh, - targets/stage3/stage3-chroot.sh, targets/stage3/stage3-preclean-chroot.sh, - targets/tinderbox/tinderbox-chroot.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh, - targets/tinderbox/tinderbox.sh: - Fixes bug 51603, a lot of distcc fixups (has to do w/ bind mounts and such) - - 02 Jun 2004; John Davis <zhen@gentoo.org> modules/snapshot_target.py: - Fixes to address bugs #51072 and #52045. The snapshot logic was tweaked to be - more efficient, and I added a new snapshot specfile option, portdir_overlay. - It should be a full path pointing to a portage overlay dir. - - 27 May 2004; John Davis <zhen@gentoo.org> - livecd/cdtar/silo-1.3.1-cdtar.tar.bz2, - livecd/cdtar/silo-1.3.2-sparc64-cdtar.tar.bz2, - livecd/cdtar/silo-1.4.4-sparc32-cdtar.tar.bz2, - livecd/runscript/default-runscript.sh: - added updated silos and fixed motd bug - - 22 May 2004; John Davis <zhen@gentoo.org> REMARKS, catalyst: - rolling out version 1.0.8 - - 22 May 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - modules/livecd_stage2_target.py: - added key livecd/bootsplash - - 21 May 2004; John Davis <zhen@gentoo.org> arch/sparc.py, arch/sparc64.py, - livecd/runscript/sparc-archscript.sh, - livecd/runscript/sparc64-archscript.sh: - sparc fixup patches from gustavoz at g.org - - 20 May 2004; John Davis <zhen@gentoo.org> modules/livecd_stage2_target.py: - added support for blacklisting modules via hotplug in livecd-stage2. spec key - is livecd/modblacklist - - 19 May 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh, modules/livecd_stage2_target.py, - livecd/runscript/x86-archscript.sh: - added support for livecd/overlay, changed vga=0x317 to vga=791 - in the x86 archscript as it is a more standard setting and should - work on more hardware - - 17 May 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh, livecd/runscript/x86-archscript.sh, - livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - modules/livecd_stage2_target.py: - fixes for the genkernel arg handling - we can now do it on a per-kernel basis. - we also now have basic motd copying support for more branded livecds - - 16 May 2004; John Davis <zhen@gentoo.org> - livecd/runscript-support/kmerge.sh, modules/livecd_stage2_target.py: - added a feature to the livecd-stage2 specfile called "livecd/genkernel_args" - for passing args to genkernel. gmsoft@gentoo.org requested this one. - - 16 May 2004; John Davis <zhen@gentoo.org> catalyst, - modules/catalyst_support.py, modules/embedded_target.py, - modules/generic_stage_target.py, modules/generic_target.py, - modules/grp_target.py, modules/livecd_stage1_target.py, - modules/livecd_stage2_target.py, modules/stage1_target.py, - modules/stage2_target.py, modules/stage3_target.py, - modules/tinderbox_target.py, targets/stage1/stage1-preclean2-chroot.sh: - finally parsed out targets.py. fixed gcc-config typo in stage1 the stage1 that - caused gcc profile problems. - - 12 May 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh, livecd/runscript-support/kmerge.sh, - livecd/runscript-support/livecdfs-update.sh, - livecd/runscript-support/post-kmerge.sh, - livecd/runscript-support/pre-kmerge.sh, modules/catalyst_support.py, - modules/targets.py: - fixed default-runscript.sh so that it is easier to read (no more chroot >> EOF - silliness). Most notably, I have taken advantage of the update-modules - --assume-kernel fix from agriffis so that we can actually use 3rd party - modules now. Please note that >=baselayout-1.9.0 is required. - - 02 May 2004; Olivier Crete <tester@gentoo.org> - arch/x86.py: - Added forgotten CHOST for i386 subarch - - 30 Apr 2004; John Davis <zhen@gentoo.org> - livecd/cdtar/isolinux-2.08-cdtar.tar.bz2, - livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2, - livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2, - livecd/files/x86-help.msg, livecd/runscript/x86-archscript.sh: - lots of changes - -fixed 2004.0 branding in the isolinux cdtar - -fixed up acpi stuff in the runscripts - -fixed up the x86 help message and corrected the numerous errors in it - - 26 Apr 2004; John Davis <zhen@gentoo.org> catalyst, - livecd/runscript/default-runscript.sh: - fixed the /etc/issue /O macro issue, and changed the version in catalyst to - 1.0.7. we are ready for release - - 16 Apr 2004; John Davis <zhen@gentoo.org> targets/stage1/stage1-chroot.sh: - fix for the problem that gustavoz found wrt the /dev creation stuff not - detecting arches. also an efficiency fix for stage1 building - - 14 Apr 2004; John Davis <zhen@gentoo.org> - targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-preclean-chroot.sh, targets/embedded/embedded.sh, - targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1.sh, targets/stage1/stage1-chroot.sh, - targets/stage1/stage1-preclean1-chroot.sh, targets/stage1/stage1.sh, - targets/stage2/stage2-chroot.sh, targets/stage2/stage2-preclean-chroot.sh, - targets/stage2/stage2.sh, targets/stage3/stage3-chroot.sh, - targets/stage3/stage3.sh, targets/tinderbox/tinderbox-chroot.sh, - targets/tinderbox/tinderbox-preclean-chroot.sh, - targets/tinderbox/tinderbox.sh: - fix for bug #47733 - fixes for distcc and an envscript bugfix - - 13 Apr 2004; John Davis <zhen@gentoo.org> modules/targets.py: - fix for bug 47626 - - 12 Apr 2004; John Davis <zhen@gentoo.org> modules/catalyst_support.py, - targets/embedded/cramfs-runscript.sh, targets/embedded/embedded-chroot.sh, - targets/embedded/embedded-preclean-chroot.sh, targets/embedded/embedded.sh, - targets/grp/grp-chroot.sh, targets/grp/grp-preclean-chroot.sh, - targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, - targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, - targets/livecd-stage1/livecd-stage1.sh, targets/stage1/stage1-chroot.sh, - targets/stage1/stage1-preclean1-chroot.sh, - targets/stage1/stage1-preclean2-chroot.sh, targets/stage1/stage1.sh, - targets/stage2/stage2-chroot.sh, targets/stage2/stage2-preclean-chroot.sh, - targets/stage2/stage2.sh, targets/stage3/stage3.sh, - targets/tinderbox/tinderbox.sh: - lots of cleanup on the bash backend. take a look @ the code and report bugs to - zhen@gentoo.org please. - - 06 Apr 2004; John Davis <zhen@gentoo.org> targets/stage1/stage1-chroot.sh: - fix for /dev in stage1 - - 05 Apr 2004; John Davis <zhen@gentoo.org> modules/targets.py: - bugfix for #46861 - - 04 Apr 2004; Benjamin Judas <beejay@gentoo.org> - livecd/kconfig/config-2004.1-gentoo-dev-sources-2.6.3-r1, - livecd/kconfig/config-2004.1-xfs-sources-2.4.24-r3: - Added the two kernel-configs for 2004.1 x86 - - 04 Apr 2004; John Davis <zhen@gentoo.org> targets/embedded/embedded.sh, - targets/grp/grp.sh, targets/stage1/stage1-chroot.sh, - targets/stage2/stage2.sh, targets/stage3/stage3.sh, - targets/tinderbox/tinderbox.sh: - fix to address missing /dev in stages, fixed path for env-update in all of the - targets - - 02 Apr 2004; John Davis <zhen@gentoo.org> modules/targets.py: - use broken for grp, livecd-stage1, tinderbox, etc. fixed - - 01 Apr 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh: - added in fix for the module.conf stuff courtesy of Benjamin Judas - <beejay@gentoo.org> - - 01 Apr 2004; John Davis <zhen@gentoo.org> catalyst, files/catalyst.conf, - files/x86-help.msg: - cosmetic touchups for 1.0.5 - - 31 Mar 2004; John Davis <zhen@gentoo.org> targets/stage2/stage2.sh: - added support to the stage2 for stackable profiles bootstrap - - 31 Mar 2004; John Davis <zhen@gentoo.org> arch/sparc.py, modules/targets.py: - sparc compatibility patches from gustavoz@gentoo.org added. These patches add - support for sparc32/64 build compatibility - - 30 Mar 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh, modules/targets.py, - targets/stage1/build.sh: - fix for bug 46022, more stackable profile fixes, embedded patches added - - 26 Mar 2004; John Davis <zhen@gentoo.org> - livecd/runscript/default-runscript.sh, modules/targets.py, - targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1.sh, - targets/stage1/stage1-chroot.sh, targets/stage2/stage2.sh, - targets/stage3/stage3.sh, targets/tinderbox/tinderbox.sh: - fixes for bugs #44625 and #45805 - - 24 Mar 2004; John Davis <zhen@gentoo.org> catalyst, - livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2, - livecd/runscript/default-runscript.sh, livecd/runscript/x86-archscript.sh: - memtest is in. if you want to use it, check out the memtest86 cd tarball - Also, fixes for bugs 45078, 45188, 44306 - - 23 Mar 2004; John Davis <zhen@gentoo.org> - livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, - livecd/runscript/ppc-archscript.sh, livecd/runscript/sparc64-archscript.sh, - livecd/runscript/x86-archscript.sh, modules/targets.py, - targets/livecd-stage3/unmerge.sh: - added "livecd/iso" to targets.py and fixed up the archscripts so that isos are - created at the end of the livecd-stage2 process. - - 22 Mar 2004; John Davis <zhen@gentoo.org> modules/targets.py, - targets/embedded/embedded.sh: - preliminary embedded support added thanks to david@futuretel.com (mut3x) - - 19 Mar 2004; John Davis <zhen@gentoo.org> targets/grp/grp.sh, - targets/stage1/stage1.sh, targets/stage3/stage3.sh: - removing the hardened-gcc deps since the package itself is deprecated' - - 05 Mar 2004; John Davis <zhen@gentoo.org> catalyst: - changing location of /etc/catalyst.conf to /etc/catalyst/catalyst.conf - - 04 Mar 2004; John Davis <zhen@gentoo.org> alpha-isogen.sh, - examples/livecd/alpha/alpha-livecd-stage1-20040225.spec, - examples/livecd/alpha/alpha-livecd-stage2-20040225.spec, - examples/livecd/alpha/config-2.4.21-r4-alpha, - examples/livecd/alpha/config-2.4.21-r4-jensen, - examples/livecd/alpha/config-2.4.21-r4-legacy, - examples/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2, - examples/livecd/runscript/alpha-archscript.sh, files/catalyst.conf: - fixes for bugs 43676, 43701. Alpha support added as well. - - 25 Feb 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>: - added powerpc livecd support, preparing for 2004.0 release. Preliminary - kde/gnome cd specs added. - - 18 Feb 2004; John Davis <zhen@gentoo.org> files/catalyst.conf: - fix in catalyst.conf for bug #42044 - - 13 Feb 2004; John Davis <zhen@gentoo.org> sparc64-isogen.sh, arch/sparc.py, - arch/sparc64.py, examples/livecd/runscript/sparc64-archscript.sh, - examples/livecd/sparc64/config-2.4.24-sparc64: - sparc fixups contributed by Gustavo Zacarias <gustavoz@gentoo.org> - - 12 Feb 2004; Daniel Robbins <drobbins@gentoo.org>: fixed bugs in previous - feature additions (see 11 Feb 2004) and added support for a $clst_conf - environment variable. You can use the $clst_conf variable to point to - a file to use in place of /etc/catalyst.conf. By setting this variable - in your shell, catalyst can easily be used by multiple people on the - same machine. Also, ccache support now works for genkernel. - - 11 Feb 2004; Daniel Robbins <drobbins@gentoo.org>: removed file for - livecd-stage2 target, as this is handled by the runscript now. Added support - for "/boot/kernel/foo/use", "/boot/kernel/foo/packages," and made - "/boot/kernel/foo/extraversion" an optional rather than required parameter. - The aforementioned "packages" is used to specify kernel-related packages - (like module ebuilds) to merge with each kernel, and the new "use" option is - used to specify the USE settings you'd like exported to the environment - during kernel as well as kernel "packages" build. - - 10 Feb 2004; John Davis <zhen@gentoo.org> README, TODO, catalyst, - modules/builder.py, modules/catalyst_support.py, modules/targets.py, - targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1.sh, - targets/livecd-stage2/livecd-stage2.sh, targets/stage1/stage1-chroot.sh, - targets/stage2/stage2.sh, targets/stage3/stage3.sh, - targets/tinderbox/tinderbox.sh: - added envscripts support (fixes bug #39832) massive cleanup of tree to prepare - it for ebuild - added headers to everything and removed deprecated dirs - - 14 Jan 2004; zhen <zhen@gentoo.org> arch/mips.py, modules/targets.py: - adding Kumba's patches for MIPS - - 16 Dec 2003; Guy Martin <gmsoft@gentoo.org> : arch/hppa.py,modules/targets.py: - Added hppa specific code. - - 29 Nov 2003; Daniel Robbins <drobbins@gentoo.org>: Tinderbox target added. See - tinderbox examples in examples/ dir. - - 08 Nov 2003; Daniel Robbins <drobbins@gentoo.org>: spec file support integrated - into catalyst. Use "-f/--file specfile" as argument; see examples dir for examples. - "grp" target now functional. See examples/x86-grp-20031102.spec for an example of - how to use it. - - 08 Nov 2003; Daniel Robbins <drobbins@gentoo.org>: support functions for spec - file parsing and reading added. Will get added to the code soon. - - 05 Nov 2003; Daniel Robbins <drobbins@gentoo.org>: Many bug fixes later, things - seem to be working well for stage1/2/3 so I've added a README. - - 28 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: Significant rework of code - structure. Everything is falling nicely into place. - - 28 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: Exception handling fully- - integrated into current prototype code. - - 27 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: beginning of exception - handling integration, got some of the target code nicely fleshed out. - - 24 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: major code rework in - progress on the python parts. - - 17 Oct 2003; zhen <zhen@gentoo.org> files/grp/x86/x86.conf, - files/grp/x86/x86.pkg.cd1, files/grp/x86/x86.pkg.cd2, files/grp/x86/x86.src, - files/livecd/x86-basic/base.pkg, files/livecd/x86-basic/kern.pkg: - for organiation's sake, I have moved the files, such as livecd foundations, - into catalyst/files. It will make it easier for us when ebuild time comes - around. - - 15 Oct 2003; zhen <zhen@gentoo.org> targets/stage3/stage3.sh: - All preliminary target build scripts are now added and coded to near as spec - that we can have at this point. - - 14 Oct 2003; Daniel Robbins <drobins@gentoo.org>: new and improved ChangeLog; - snapshots now work ("./catalyst-util.py snap 20031014",) and snapshotting - cleans up after itself (temp files deleted,) something that should be - continued as much as reasonably possible in other parts of catalyst. Also, we - have /etc/catalyst.conf config file reading stub code completed, and internal - fall-backs to reasonable global config defaults completed. - - diff --git a/src/catalyst/ChangeLog.old b/src/catalyst/ChangeLog.old deleted file mode 100644 index d789ee91ce..0000000000 --- a/src/catalyst/ChangeLog.old +++ /dev/null @@ -1,106 +0,0 @@ -# ChangeLog for gentoo-src/stager -# Copyright 2002-2003 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog.old,v 1.2 2004/10/15 02:48:20 zhen Exp $ - - 12 Oct 2003; Daniel Robbins <drobins@gentoo.org>: subarch test outsourced to - python catalyst-subarches function. - - 12 Oct 2003; zhen <zhen@gentoo.org> include/build_functions.sh: fixed the - entry in include/build_functions.sh for location of bootstrap.sh - - 12 Oct 2003; zhen <zhen@gentoo.org> catalyst: - removing dup enter_chroot - - 12 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> catalyst: - document subarches checking - - 12 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> catalyst: - Fix valid subarch test. - - 12 Oct 2003; zhen <zhen@gentoo.org> catalyst, include/build_functions.sh, - include/functions.sh: - thanks to robbat2, the cmdline argument handling is now fixed. I moved - start_build to build_functions.sh cleaning up the main catalyst script some - more. - - 11 Oct 2003; <zhen@gentoo.org> include/build_functions.sh: - fixed SRCBALL and DESTBALL, making it transparent for profiles - - 11 Oct 2003; <zhen@gentoo.org> catalyst, include/functions.sh: - added an exit condition to the cmd line argument case statement - - 09 Oct 2003; <zhen@gentoo.org> catalyst, bin/build.sh, bin/stage1, - files/catalyst.conf, include/build_functions.sh, include/functions.sh: - the changes that I made to the above files should make catalyst completely - transparent to no matter what profile we are using. check files/catalyst.conf - for the list of BUILDTYPEs that we support. - - 08 Oct 2003; zhen <zhen@gentoo.org> catalyst: - changed how cmd line arguments are handled - - 08 Oct 2003; zhen <zhen@gentoo.org> catalyst: - I changed the is_special handling so that it is cleaner and faster - - 08 Oct 2003; zhen <zhen@gentoo.org> catalyst, include/functions.sh, - livecd/foundations/x86-basic/base.pkg, - livecd/foundations/x86-basic/kern.pkg, - livecd/foundations/x86-basic/post-clean.sh, - livecd/foundations/x86-basic/pre-clean.sh, - livecd/foundations/x86-basic/settings: - I outsourced more functions to include/functions.sh. I made it a seperate file - from build_fucntions.sh so that we can keep our build and other functions - apart. I also added in the livecd stuffs from the stager side of things. - - 08 Oct 2003; zhen <zhen@gentoo.org> catalyst, include/build_functions.sh: - I outsourced all of the build functions to include/build_functions.sh. In the - future, this will happen more - the code needs cleaned up. - - 07 Oct 2003; zhen <zhen@gentoo.org> catalyst, bin/bootstrap.sh, bin/stage1: - I mucked with stage1 and bootstrap.sh to add support for ${BUILDTYPE} (profile - transparency). Also, I removed gettext from bootstrap, since mainline gentoo - does not use that anymore. - - 05 Oct 2003; zhen <zhen@gentoo.org> catalyst: - since we now have a default profile in portage, i massaged some errors - messages to reflect that. - - 04 Oct 2003; zhen <zhen@gentoo.org> catalyst, bin/bootstrap.sh, bin/stage1: - removed ccache support from catalyst stage1 build cause it breaks the build. - Additionally, I removed gettext support from bootstrap, because according to - our new default profile, we don't use that anymore. - - 02 Oct 2003; zhen <zhen@gentoo.org> catalyst, files/catalyst.conf: - added a new var, BUILDTYPE, adding more transparency for building. - In the future, we will be building both selinux and hardened sources. - - 02 Oct 2003; zhen <zhen@gentoo.org> catalyst: - fixed some formatting when catalyst prints out build info, additionally, - trying to make catalyst more transparent for future expansion of stages - - 21 Sep 2003; <zhen@gentoo.org> catalyst: - fixed the order/ way in which we handle cmd line arguments wrt to -h or - --help. I moved this functionality from the main program section to - prechecks(). - - 21 Sep 2003; <zhen@gentoo.org> README.catalyst, catalyst: - I edited catalyst to change our naming convention from stage*-arch-h.* to - stage*-arch-etdyn-ssp.* re method's request. This will not be the first time - I change naming conventions, as catalyst will be eventually extended to - do selinux-* stages also. - - Additionally, I updated README.catalyst to include profile information. - - 10 Sep 2003; <zhen@gentoo.org> README.catalyst, README.stager, bin/catalyst, - bin/hardened-bootstrap.sh, bin/stage1: - I renamed README.stager to README.catalyst and have made some very minor - changes to it. bin/bootstrap.sh has been renamed to bin/hardened-bootstrap.sh. - I have hacked bootstrap to use the hardened profile, as well as utilize - hardened-gcc. bin/catalyst itself has undergone some more changes (nothing too - major). Additionally, bin/stage1 has been hacked to accept the hardened profile, - and use hardened-gcc. - - 09 September 2003; John Davis <zhen@gentoo.org>: Initial import of hardened stager. - I am forking this from the original stager code in order to better fit our needs. - The original stager code is still used by Gentoo, and is maintained by Daniel Robbins <drobbins@gentoo.org>. - I would like to thank him and the rest of the contributors that coded stager. - diff --git a/src/catalyst/README b/src/catalyst/README index f64cca7ec6..8197da0b70 100644 --- a/src/catalyst/README +++ b/src/catalyst/README @@ -1,57 +1,6 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/README,v 1.17 2006/10/02 20:41:53 wolf31o2 Exp $ - -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. - -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. - -Requirements -======================= - -- Python 2.4 or greater (may still work with 2.3) -- A portage snapshot (or portage tree to make your own) -- A Gentoo generic stage3 tarball -- shash for digest support - -What is Catalyst? -======================== - -Catalyst is the Gentoo Linux project's release building tool. 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. - -Catalyst is capable of: - -- Building installation stages for every architecture supported by Gentoo -- Building bootable LiveCDs for every architecture supported by Gentoo -- Building GRP (Gentoo Reference Platform) sets for every architecture supported by Gentoo -- Setting up a Tinderbox target for test building -- Building netboot images - -Configuring catalyst -======================== - -After emerging/installing catalyst, the first (and probably only) thing -that you will have to do is edit /etc/catalyst/catalyst.conf to your liking. - -Example catalyst.conf: - -distdir="/usr/portage/distfiles" -options="pkgcache kerncache" -sharedir="/usr/lib/catalyst" - -There are many more options that can be set, but those defaults are good -for out of the box operation. For more documentation on what you can do -with catalyst, please check the man page or the online documentation at -http://www.gentoo.org/proj/en/releng/catalyst. +### +# +# This package has moved from CVS to SVN. It can be found at: +# svn+ssh://svn.gentoo.org/var/svnroot/catalyst +# +### diff --git a/src/catalyst/arch/alpha.py b/src/catalyst/arch/alpha.py deleted file mode 100644 index e582ab24f4..0000000000 --- a/src/catalyst/arch/alpha.py +++ /dev/null @@ -1,76 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/alpha.py,v 1.5 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_alpha(builder.generic): - "abstract base class for all alpha builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="alpha" - self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-mieee -pipe" - -class arch_alpha(generic_alpha): - "builder class for generic alpha (ev4+)" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev4" - self.settings["CHOST"]="alpha-unknown-linux-gnu" - -class arch_ev4(generic_alpha): - "builder class for alpha ev4" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev4" - self.settings["CHOST"]="alphaev4-unknown-linux-gnu" - -class arch_ev45(generic_alpha): - "builder class for alpha ev45" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev45" - self.settings["CHOST"]="alphaev45-unknown-linux-gnu" - -class arch_ev5(generic_alpha): - "builder class for alpha ev5" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev5" - self.settings["CHOST"]="alphaev5-unknown-linux-gnu" - -class arch_ev56(generic_alpha): - "builder class for alpha ev56 (ev5 plus BWX)" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev56" - self.settings["CHOST"]="alphaev56-unknown-linux-gnu" - -class arch_pca56(generic_alpha): - "builder class for alpha pca56 (ev5 plus BWX & MAX)" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=pca56" - self.settings["CHOST"]="alphaev56-unknown-linux-gnu" - -class arch_ev6(generic_alpha): - "builder class for alpha ev6" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev6" - self.settings["CHOST"]="alphaev6-unknown-linux-gnu" - self.settings["HOSTUSE"]=["ev6"] - -class arch_ev67(generic_alpha): - "builder class for alpha ev67 (ev6 plus CIX)" - def __init__(self,myspec): - generic_alpha.__init__(self,myspec) - self.settings["CFLAGS"]+=" -O2 -mcpu=ev67" - self.settings["CHOST"]="alphaev67-unknown-linux-gnu" - self.settings["HOSTUSE"]=["ev6"] - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({ "alpha":arch_alpha, "ev4":arch_ev4, "ev45":arch_ev45, - "ev5":arch_ev5, "ev56":arch_ev56, "pca56":arch_pca56, - "ev6":arch_ev6, "ev67":arch_ev67 }) diff --git a/src/catalyst/arch/amd64.py b/src/catalyst/arch/amd64.py deleted file mode 100644 index d4b44aec4b..0000000000 --- a/src/catalyst/arch/amd64.py +++ /dev/null @@ -1,22 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/amd64.py,v 1.6 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder - -class generic_amd64(builder.generic): - "abstract base class for all amd64 builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="amd64" - self.settings["CHROOT"]="chroot" - -class arch_amd64(generic_amd64): - "builder class for generic amd64 (athlon64/opteron)" - def __init__(self,myspec): - generic_amd64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="x86_64-pc-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"amd64":arch_amd64}) - diff --git a/src/catalyst/arch/arm.py b/src/catalyst/arch/arm.py deleted file mode 100644 index 27e61752d6..0000000000 --- a/src/catalyst/arch/arm.py +++ /dev/null @@ -1,58 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/arm.py,v 1.6 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_arm(builder.generic): - "Abstract base class for all arm (little endian) builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="arm" - self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CXXFLAGS"]="-O1 -pipe" - -class generic_armeb(builder.generic): - "Abstract base class for all arm (big endian) builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="arm" - self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CXXFLAGS"]="-O1 -pipe" - -class arch_arm(generic_arm): - "Builder class for arm (little endian) target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) - self.settings["CHOST"]="arm-unknown-linux-gnu" - -class arch_armeb(generic_armeb): - "Builder class for arm (big endian) target" - def __init__(self,myspec): - generic_armeb.__init__(self,myspec) - self.settings["CHOST"]="armeb-unknown-linux-gnu" - -class arch_armv4l(generic_arm): - "Builder class for armv4l (StrongArm-110) target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) - self.settings["CFLAGS"]+=" -mcpu=strongarm110" - self.settings["CHOST"]="armv4l-unknown-linux-gnu" - -class arch_armv5b(generic_arm): - "Builder class for armv5b (XScale) target" - def __init__(self,myspec): - generic_arm.__init__(self,myspec) - self.settings["CFLAGS"]+=" -mcpu=xscale" - self.settings["CHOST"]="armv5b-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({ - "arm" : arch_arm, - "armv4l" : arch_armv4l, - "armeb" : arch_armeb, - "armv5b" : arch_armv5b - - }) diff --git a/src/catalyst/arch/hppa.py b/src/catalyst/arch/hppa.py deleted file mode 100644 index d683b6a664..0000000000 --- a/src/catalyst/arch/hppa.py +++ /dev/null @@ -1,42 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/hppa.py,v 1.7 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_hppa(builder.generic): - "Abstract base class for all hppa builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="hppa" - self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CXXFLAGS"]="-O2 -pipe" - -class arch_hppa(generic_hppa): - "Builder class for hppa systems" - def __init__(self,myspec): - generic_hppa.__init__(self,myspec) - self.settings["CFLAGS"]+=" -march=1.0" - self.settings["CHOST"]="hppa-unknown-linux-gnu" - -class arch_hppa1_1(generic_hppa): - "Builder class for hppa 1.1 systems" - def __init__(self,myspec): - generic_hppa.__init__(self,myspec) - self.settings["CFLAGS"]+=" -march=1.1" - self.settings["CHOST"]="hppa1.1-unknown-linux-gnu" - -class arch_hppa2_0(generic_hppa): - "Builder class for hppa 2.0 systems" - def __init__(self,myspec): - generic_hppa.__init__(self,myspec) - self.settings["CFLAGS"]+=" -march=2.0" - self.settings["CHOST"]="hppa2.0-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({ - "hppa": arch_hppa, - "hppa1.1": arch_hppa1_1, - "hppa2.0": arch_hppa2_0 - }) diff --git a/src/catalyst/arch/ia64.py b/src/catalyst/arch/ia64.py deleted file mode 100644 index 604549fb92..0000000000 --- a/src/catalyst/arch/ia64.py +++ /dev/null @@ -1,18 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ia64.py,v 1.6 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class arch_ia64(builder.generic): - "builder class for ia64" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="ia64" - self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="ia64-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({ "ia64":arch_ia64 }) diff --git a/src/catalyst/arch/mips.py b/src/catalyst/arch/mips.py deleted file mode 100644 index 93ccba68da..0000000000 --- a/src/catalyst/arch/mips.py +++ /dev/null @@ -1,97 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/mips.py,v 1.7 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_mips(builder.generic): - "Abstract base class for all mips builders [Big-endian]" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="mips" - self.settings["CHROOT"]="chroot" - self.settings["CHOST"]="mips-unknown-linux-gnu" - -class generic_mipsel(builder.generic): - "Abstract base class for all mipsel builders [Little-endian]" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="mips" - self.settings["CHROOT"]="chroot" - self.settings["CHOST"]="mipsel-unknown-linux-gnu" - -class arch_mips1(generic_mips): - "Builder class for MIPS I [Big-endian]" - def __init__(self,myspec): - generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -pipe" - -class arch_mips2(generic_mips): - "Builder class for MIPS II [Big-endian]" - def __init__(self,myspec): - generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips2 -mabi=32 -pipe" - -class arch_mips3(generic_mips): - "Builder class for MIPS III [Big-endian]" - def __init__(self,myspec): - generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe" - -class arch_mips4(generic_mips): - "Builder class for MIPS IV [Big-endian]" - def __init__(self,myspec): - generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe" - -class arch_mips4n32(generic_mips): - "Builder class for MIPS IV [Big-endian N32]" - def __init__(self,myspec): - generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe" - self.settings["CHOST"]="mips64-unknown-linux-gnu" - -class arch_mipsel1(generic_mipsel): - "Builder class for all MIPS I [Little-endian]" - def __init__(self,myspec): - generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -pipe" - -class arch_mipsel2(generic_mipsel): - "Builder class for all MIPS II [Little-endian]" - def __init__(self,myspec): - generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips2 -mabi=32 -pipe" - -class arch_mipsel3(generic_mipsel): - "Builder class for all MIPS III [Little-endian]" - def __init__(self,myspec): - generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe" - -class arch_mipsel4(generic_mipsel): - "Builder class for all MIPS IV [Little-endian]" - def __init__(self,myspec): - generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe" - - - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({ - "mips" :arch_mips1, - "mips1" :arch_mips1, - "mips2" :arch_mips2, - "mips3" :arch_mips3, - "mips4" :arch_mips4, - "mips4n32" :arch_mips4n32, - "mipsel" :arch_mipsel1, - "mipsel1" :arch_mipsel1, - "mipsel2" :arch_mipsel2, - "mipsel3" :arch_mipsel3, - "mipsel4" :arch_mipsel4, - "sgir4k" :arch_mips3, - "sgir5k" :arch_mips4, - "sgir10kplus" :arch_mips4, - "cobalt" :arch_mipsel4 - }) diff --git a/src/catalyst/arch/ppc.py b/src/catalyst/arch/ppc.py deleted file mode 100644 index f908f1ba06..0000000000 --- a/src/catalyst/arch/ppc.py +++ /dev/null @@ -1,62 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ppc.py,v 1.19 2006/10/02 20:41:53 wolf31o2 Exp $ - -import os,builder -from catalyst_support import * - -# gcc-3.3.3 is required to do G5 optimizations -# install a 32bit kernel personality changer (that works) before building on a -# ppc64 host new gcc optimization feature requires -fno-strict-aliasing needed, -# otherwise code complains use the experimental thing for nptl builds - -class generic_ppc(builder.generic): - "abstract base class for all ppc builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="ppc" - self.settings["CHOST"]="powerpc-unknown-linux-gnu" - if self.settings["hostarch"]=="ppc64": - if not os.path.exists("/bin/linux32"): - raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix." - self.settings["CHROOT"]="linux32 chroot" - else: - self.settings["CHROOT"]="chroot" - -class arch_power_ppc(generic_ppc): - "builder class for generic powerpc/power" - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=common -mtune=common -fno-strict-aliasing -pipe" - -class arch_ppc(generic_ppc): - "builder class for generic powerpc" - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=powerpc -mtune=powerpc -fno-strict-aliasing -pipe" - -class arch_power(generic_ppc): - "builder class for generic power" - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=power -mtune=power -fno-strict-aliasing -pipe" - -class arch_g3(generic_ppc): - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=G3 -mtune=G3 -fno-strict-aliasing -pipe" - -class arch_g4(generic_ppc): - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=G4 -mtune=G4 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" - self.settings["HOSTUSE"]=["altivec"] - -class arch_g5(generic_ppc): - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=G5 -mtune=G5 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" - self.settings["HOSTUSE"]=["altivec"] - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"ppc":arch_ppc,"power":arch_power,"power-ppc":arch_power_ppc,"g3":arch_g3,"g4":arch_g4,"g5":arch_g5}) - diff --git a/src/catalyst/arch/ppc64.py b/src/catalyst/arch/ppc64.py deleted file mode 100644 index 92e79ad6b5..0000000000 --- a/src/catalyst/arch/ppc64.py +++ /dev/null @@ -1,52 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ppc64.py,v 1.7 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder - -class generic_ppc64(builder.generic): - "abstract base class for all ppc64 builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="ppc64" - self.settings["CHROOT"]="chroot" - -class arch_ppc64(generic_ppc64): - "builder class for generic ppc64 (G5/Power4/Power5)" - def __init__(self,myspec): - generic_ppc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CXXFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="powerpc64-unknown-linux-gnu" - -class arch_970(arch_ppc64): - "builder class for G5 under ppc64" - def __init__(self,myspec): - arch_ppc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970 -mabi=altivec" - self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970 -mabi=altivec" - self.settings["HOSTUSE"]=["altivec"] - -class arch_power3(arch_ppc64): - "builder class for power3 under ppc64" - def __init__(self,myspec): - arch_ppc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3" - self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3" - -class arch_power4(arch_ppc64): - "builder class for power4 under ppc64" - def __init__(self,myspec): - arch_ppc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4" - self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4" - -class arch_power5(arch_ppc64): - "builder class for power5 under ppc64" - def __init__(self,myspec): - arch_ppc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe -mcpu=power5 -mtune=power5" - self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=power5 -mtune=power5" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"ppc64":arch_ppc64,"970":arch_970,"power3":arch_power3,"power4":arch_power4,"power5":arch_power5}) - diff --git a/src/catalyst/arch/s390.py b/src/catalyst/arch/s390.py deleted file mode 100644 index 0b4d098f50..0000000000 --- a/src/catalyst/arch/s390.py +++ /dev/null @@ -1,22 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/s390.py,v 1.5 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_s390(builder.generic): - "abstract base class for all s390 builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="s390" - self.settings["CHROOT"]="chroot" - -class arch_s390(generic_s390): - "builder class for generic s390" - def __init__(self,myspec): - generic_s390.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="s390-ibm-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"s390":arch_s390}) diff --git a/src/catalyst/arch/sh.py b/src/catalyst/arch/sh.py deleted file mode 100644 index 8059fdef0e..0000000000 --- a/src/catalyst/arch/sh.py +++ /dev/null @@ -1,87 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/sh.py,v 1.5 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_sh(builder.generic): - "Abstract base class for all sh builders [Little-endian]" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="sh" - self.settings["CHROOT"]="chroot" - -class generic_sheb(builder.generic): - "Abstract base class for all sheb builders [Big-endian]" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="sh" - self.settings["CHROOT"]="chroot" - -class arch_sh(generic_sh): - "Builder class for SH [Little-endian]" - def __init__(self,myspec): - generic_sh.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="sh-unknown-linux-gnu" - -class arch_sh2(generic_sh): - "Builder class for SH-2 [Little-endian]" - def __init__(self,myspec): - generic_sh.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -m2 -pipe" - self.settings["CHOST"]="sh2-unknown-linux-gnu" - -class arch_sh3(generic_sh): - "Builder class for SH-3 [Little-endian]" - def __init__(self,myspec): - generic_sh.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -m3 -pipe" - self.settings["CHOST"]="sh3-unknown-linux-gnu" - -class arch_sh4(generic_sh): - "Builder class for SH-4 [Little-endian]" - def __init__(self,myspec): - generic_sh.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -m4 -pipe" - self.settings["CHOST"]="sh4-unknown-linux-gnu" - -class arch_sheb(generic_sheb): - "Builder class for SH [Big-endian]" - def __init__(self,myspec): - generic_sheb.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="sheb-unknown-linux-gnu" - -class arch_sh2eb(generic_sheb): - "Builder class for SH-2 [Big-endian]" - def __init__(self,myspec): - generic_sheb.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -m2 -pipe" - self.settings["CHOST"]="sh2eb-unknown-linux-gnu" - -class arch_sh3eb(generic_sheb): - "Builder class for SH-3 [Big-endian]" - def __init__(self,myspec): - generic_sheb.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -m3 -pipe" - self.settings["CHOST"]="sh3eb-unknown-linux-gnu" - -class arch_sh4eb(generic_sheb): - "Builder class for SH-4 [Big-endian]" - def __init__(self,myspec): - generic_sheb.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -m4 -pipe" - self.settings["CHOST"]="sh4eb-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({ - "sh" :arch_sh, - "sh2" :arch_sh2, - "sh3" :arch_sh3, - "sh4" :arch_sh4, - "sheb" :arch_sheb, - "sh2eb" :arch_sh2eb, - "sh3eb" :arch_sh3eb, - "sh4eb" :arch_sh4eb - }) diff --git a/src/catalyst/arch/sparc.py b/src/catalyst/arch/sparc.py deleted file mode 100644 index 1af61576e4..0000000000 --- a/src/catalyst/arch/sparc.py +++ /dev/null @@ -1,28 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/sparc.py,v 1.9 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_sparc(builder.generic): - "abstract base class for all sparc builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="sparc" - if self.settings["hostarch"]=="sparc64": - if not os.path.exists("/bin/sparc32"): - raise CatalystError,"required /bin/sparc32 executable not found (\"emerge sparc-utils\" to fix.)" - self.settings["CHROOT"]="/bin/sparc32 chroot" - else: - self.settings["CHROOT"]="chroot" - -class arch_sparc(generic_sparc): - "builder class for generic sparc (sun4cdm)" - def __init__(self,myspec): - generic_sparc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -pipe" - self.settings["CXXFLAGS"]="-O2 -pipe" - self.settings["CHOST"]="sparc-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"sparc":arch_sparc}) diff --git a/src/catalyst/arch/sparc64.py b/src/catalyst/arch/sparc64.py deleted file mode 100644 index 10cb36188d..0000000000 --- a/src/catalyst/arch/sparc64.py +++ /dev/null @@ -1,23 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/sparc64.py,v 1.7 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_sparc64(builder.generic): - "abstract base class for all sparc64 builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="sparc64" - self.settings["CHROOT"]="chroot" - -class arch_sparc64(generic_sparc64): - "builder class for generic sparc64 (sun4u)" - def __init__(self,myspec): - generic_sparc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc -pipe" - self.settings["CXXFLAGS"]="-O2 -mcpu=ultrasparc -pipe" - self.settings["CHOST"]="sparc-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"sparc64":arch_sparc64}) diff --git a/src/catalyst/arch/x86.py b/src/catalyst/arch/x86.py deleted file mode 100644 index 4961083c73..0000000000 --- a/src/catalyst/arch/x86.py +++ /dev/null @@ -1,88 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/x86.py,v 1.25 2006/10/02 20:41:53 wolf31o2 Exp $ - -import builder,os -from catalyst_support import * - -class generic_x86(builder.generic): - "abstract base class for all x86 builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="x86" - if self.settings["hostarch"]=="amd64": - if not os.path.exists("/bin/linux32"): - raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix.)" - self.settings["CHROOT"]="linux32 chroot" - else: - self.settings["CHROOT"]="chroot" - -class arch_x86(generic_x86): - "builder class for generic x86 (386+)" - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=i686 -pipe" - self.settings["CHOST"]="i386-pc-linux-gnu" - -class arch_i386(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i386 -pipe" - self.settings["CHOST"]="i386-pc-linux-gnu" - -class arch_i486(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i486 -pipe" - self.settings["CHOST"]="i486-pc-linux-gnu" - -class arch_i586(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i586 -pipe" - self.settings["CHOST"]="i586-pc-linux-gnu" - -class arch_pentium_mmx(arch_i586): - def __init__(self,myspec): - arch_i586.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe" - self.settings["HOSTUSE"]=["mmx"] - -class arch_i686(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i686 -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" - -class arch_athlon(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=athlon -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" - self.settings["HOSTUSE"]=["mmx","3dnow"] - -class arch_athlon_xp(generic_x86): - #this handles XP and MP processors - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=athlon-xp -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" - self.settings["HOSTUSE"]=["mmx","3dnow","sse"] - -class arch_pentium4(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" - self.settings["HOSTUSE"]=["mmx","sse"] - -class arch_pentium3(generic_x86): - def __init__(self,myspec): - generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=pentium3 -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" - self.settings["HOSTUSE"]=["mmx","sse"] - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"pentium4":arch_pentium4,"x86":arch_x86,"i386":arch_i386,"i486":arch_i486,"i586":arch_i586,"i686":arch_i686,"athlon":arch_athlon, - "athlon-xp":arch_athlon_xp,"athlon-mp":arch_athlon_xp,"pentium3":arch_pentium3,"pentium-mmx":arch_pentium_mmx}) - diff --git a/src/catalyst/catalyst b/src/catalyst/catalyst deleted file mode 100644 index 0dcbf6aaa9..0000000000 --- a/src/catalyst/catalyst +++ /dev/null @@ -1,411 +0,0 @@ -#!/usr/bin/python -OO -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.162 2006/10/02 20:41:53 wolf31o2 Exp $ - -# Maintained in full by: -# Eric Edgar <rocket@gentoo.org> -# Chris Gianelloni <wolf31o2@gentoo.org> - -import os,sys,imp,string,getopt -import pdb - -__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>" -__version__="2.0" - -conf_values={} - -def usage(): - print "Usage catalyst [options] [-C variable=value...] [ -s identifier]" - print " -a --clear-autoresume clear autoresume flags" - print " -c --config use specified configuration file" - print " -C --cli catalyst commandline (MUST BE LAST OPTION)" - print " -d --debug enable debugging" - print " -f --file read specfile" - print " -F --fetchonly fetch files only" - print " -h --help print this help message" - print " -p --purge clear tmp dirs,package cache and autoresume flags" - print " -s --snapshot generate a Portage snapshot" - print " -V --version display version information" - print " -v --verbose verbose output" - print - print "Usage examples:" - print - print "Using the commandline option (-C, --cli) to build a Portage snapshot:" - print "catalyst -C target=snapshot version_stamp=my_date" - print - print "Using the snapshot option (-s, --snapshot) to build a Portage snapshot:" - print "catalyst -s 20051208" - print - print "Using the specfile option (-f, --file) to build a stage target:" - print "catalyst -f stage1-specfile.spec" - -def version(): - print "Gentoo Catalyst, version "+__version__ - print "Copyright 2003-2006 The Gentoo Foundation" - print "Distributed under the GNU General Public License version 2\n" - -def parse_config(myconfig): - # search a couple of different areas for the main config file - myconf={} - config_file="" - - confdefaults={ "storedir":"/var/tmp/catalyst",\ - "sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\ - "portdir":"/usr/portage","options":"",\ - "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\ - "hash_function":"crc32"} - - # first, try the one passed (presumably from the cmdline) - if myconfig: - if os.path.exists(myconfig): - print "Using command line specified Catalyst configuration file, "+myconfig - config_file=myconfig - - else: - print "!!! catalyst: Could not use specified configuration file "+\ - myconfig - sys.exit(1) - - # next, try the default location - elif os.path.exists("/etc/catalyst/catalyst.conf"): - print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf" - config_file="/etc/catalyst/catalyst.conf" - - # can't find a config file (we are screwed), so bail out - else: - print "!!! catalyst: Could not find a suitable configuration file" - sys.exit(1) - - # now, try and parse the config file "config_file" - try: - execfile(config_file, myconf, myconf) - - except: - print "!!! catalyst: Unable to parse configuration file, "+myconfig - sys.exit(1) - - # now, load up the values into conf_values so that we can use them - for x in confdefaults.keys(): - if myconf.has_key(x): - print "Setting",x,"to config file value \""+myconf[x]+"\"" - conf_values[x]=myconf[x] - else: - print "Setting",x,"to default value \""+confdefaults[x]+"\"" - conf_values[x]=confdefaults[x] - - # parse out the rest of the options from the config file - if "ccache" in string.split(conf_values["options"]): - print "Compiler cache support enabled." - conf_values["CCACHE"]="1" - - if "pkgcache" in string.split(conf_values["options"]): - print "Package cache support enabled." - conf_values["PKGCACHE"]="1" - - if "snapcache" in string.split(conf_values["options"]): - print "Snapshot cache support enabled." - conf_values["SNAPCACHE"]="1" - - if "seedcache" in string.split(conf_values["options"]): - print "Seed cache support enabled." - conf_values["SEEDCACHE"]="1" - - if "kerncache" in string.split(conf_values["options"]): - print "Kernel cache support enabled." - conf_values["KERNCACHE"]="1" - - if "distcc" in string.split(conf_values["options"]): - print "Distcc support enabled." - conf_values["DISTCC"]="1" - - if "autoresume" in string.split(conf_values["options"]): - print "Autoresuming support enabled." - conf_values["AUTORESUME"]="1" - - if "purge" in string.split(conf_values["options"]): - print "Purge support enabled." - conf_values["PURGE"]="1" - - if "clear-autoresume" in string.split(conf_values["options"]): - print "Cleaning autoresume flags support enabled." - conf_values["CLEAR_AUTORESUME"]="1" - - if myconf.has_key("envscript"): - print "Envscript support enabled." - conf_values["ENVSCRIPT"]=myconf["envscript"] - - if myconf.has_key("digests"): - conf_values["digests"]=myconf["digests"] - -def import_modules(): - # import catalyst's own modules (i.e. catalyst_support and the arch modules) - targetmap={} - - try: - for x in required_build_targets: - try: - fh=open(conf_values["sharedir"]+"/modules/"+x+".py") - module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE)) - fh.close() - - except IOError: - raise CatalystError,"Can't find "+x+".py plugin in "+\ - conf_values.settings["sharedir"]+"/modules/" - - for x in valid_build_targets: - try: - fh=open(conf_values["sharedir"]+"/modules/"+x+".py") - module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE)) - module.register(targetmap) - fh.close() - - except IOError: - raise CatalystError,"Can't find "+x+".py plugin in "+\ - conf_values.settings["sharedir"]+"/modules/" - - except ImportError: - print "!!! catalyst: Python modules not found in "+\ - conf_values["sharedir"]+"/modules; exiting." - sys.exit(1) - - return targetmap - -def do_spec(myspecfile): - try: - addlargs=read_spec(myspecfile) - except: - sys.exit(1) - - return addlargs - -def do_cli(cmdline): - try: - return arg_parse(cmdline) - - except CatalystError: - print "!!! catalyst: Could not parse commandline, exiting." - sys.exit(1) - -def build_target(addlargs, targetmap): - try: - if not targetmap.has_key(addlargs["target"]): - raise CatalystError,"Target \""+addlargs["target"]+"\" not available." - - mytarget=targetmap[addlargs["target"]](conf_values, addlargs) - - mytarget.run() - - except: - raise - -if __name__ == "__main__": - targetmap={} - - version() - if os.getuid() != 0: - # catalyst cannot be run as a normal user due to chroots, mounts, etc - print "!!! catalyst: This script requires root privileges to operate" - sys.exit(2) - - # we need some options in order to work correctly - if len(sys.argv) < 2: - usage() - sys.exit(2) - - # parse out the command line arguments - try: - opts,args = getopt.getopt(sys.argv[1:], "apxhvdc:C:f:FVs:", ["purge","help", "version", "debug",\ - "clear_autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="]) - - except getopt.GetoptError: - usage() - sys.exit(2) - - # defaults for commandline opts - debug=False - verbose=False - fetch=False - myconfig="" - myspecfile="" - mycmdline=[] - myopts=[] - - # check preconditions - if len(opts) == 0: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - run=0 - for o, a in opts: - if o in ("-h", "--help"): - usage() - sys.exit(1) - - if o in ("-V", "--version"): - print "Catalyst version "+__version__ - sys.exit(1) - - if o in ("-d", "--debug"): - if len(sys.argv) < 3: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - else: - conf_values["DEBUG"]="1" - - if o in ("-c", "--config"): - if len(sys.argv) < 3: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - else: - myconfig=a - - if o in ("-C", "--cli"): - run=1 - x=sys.argv.index(o)+1 - while x < len(sys.argv): - mycmdline.append(sys.argv[x]) - x=x+1 - - if o in ("-f", "--file"): - run=1 - myspecfile=a - - if o in ("-F", "--fetchonly"): - if len(sys.argv) < 3: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - else: - conf_values["FETCH"]="1" - - if o in ("-v", "--verbose"): - if len(sys.argv) < 3: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - else: - conf_values["VERBOSE"]="1" - - if o in ("-s", "--snapshot"): - if len(sys.argv) < 3: - print "!!! catalyst: missing snapshot identifier\n" - usage() - sys.exit(2) - else: - run=1 - mycmdline.append("target=snapshot") - mycmdline.append("version_stamp="+a) - - if o in ("-p", "--purge"): - if len(sys.argv) < 3: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - else: - conf_values["PURGE"]="1" - if o in ("-a", "--clear-autoresume"): - if len(sys.argv) < 3: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - else: - conf_values["CLEAR_AUTORESUME"]="1" - if run != 1: - print "!!! catalyst: please specify one of either -f or -C\n" - usage() - sys.exit(2) - - # import configuration file and import our main module using those settings - parse_config(myconfig) - sys.path.append(conf_values["sharedir"]+"/modules") - from catalyst_support import * - - # Start checking that digests are valid now that the hash_map was imported from catalyst_support - if conf_values.has_key("digests"): - for i in conf_values["digests"].split(): - if not hash_map.has_key(i): - print - print i+" is not a valid digest entry" - print "Valid digest entries:" - print hash_map.keys() - print - print "Catalyst aborting...." - sys.exit(2) - if find_binary(hash_map[i][1]) == None: - print - print "digest="+i - print "\tThe "+hash_map[i][1]+\ - " binary was not found. It needs to be in your system path" - print - print "Catalyst aborting...." - sys.exit(2) - if conf_values.has_key("hash_function"): - if not hash_map.has_key(conf_values["hash_function"]): - print - print conf_values["hash_function"]+" is not a valid hash_function entry" - print "Valid hash_function entries:" - print hash_map.keys() - print - print "Catalyst aborting...." - sys.exit(2) - if find_binary(hash_map[conf_values["hash_function"]][1]) == None: - print - print "hash_function="+conf_values["hash_function"] - print "\tThe "+hash_map[conf_values["hash_function"]][1]+\ - " binary was not found. It needs to be in your system path" - print - print "Catalyst aborting...." - sys.exit(2) - - # import the rest of the catalyst modules - targetmap=import_modules() - - addlargs={} - - if myspecfile: - addlargs.update(do_spec(myspecfile)) - - if mycmdline: - addlargs.update(do_cli(mycmdline)) - - if not addlargs.has_key("target"): - raise CatalystError, "Required value \"target\" not specified." - - # everything is setup, so the build is a go - try: - build_target(addlargs, targetmap) - - except CatalystError: - print - print "Catalyst aborting...." - sys.exit(2) - except KeyboardInterrupt: - print "\nCatalyst build aborted due to user interrupt ( Ctrl-C )" - print - print "Catalyst aborting...." - sys.exit(2) - except LockInUse: - print "Catalyst aborting...." - sys.exit(2) - except: - print "Catalyst aborting...." - raise - sys.exit(2) - - #except CatalystError: - # print - # print "Catalyst aborting...." - # sys.exit(2) - #except KeyError: - # print "\nproblem with command line or spec file ( Key Error )" - # print "Key: "+str(sys.exc_value)+" was not found" - # print "Catalyst aborting...." - # sys.exit(2) - #except UnboundLocalError: - # print - # print "UnboundLocalError: "+str(sys.exc_value)+" was not found" - # raise - # print - # print "Catalyst aborting...." - # sys.exit(2) diff --git a/src/catalyst/examples/fsscript.sh.example b/src/catalyst/examples/fsscript.sh.example deleted file mode 100644 index d34ced1396..0000000000 --- a/src/catalyst/examples/fsscript.sh.example +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# This is an example fsscript for use with the livecd-stage2 target (key -# livecd/fsscript). This file is copied into the rootfs of the CD after the -# kernel(s) and any external modules have been compiled and is then executed -# within the context of the chroot. - -# Example, I want to add specific nameservers to the CD's resolv.conf: -echo "192.168.0.1" >> /etc/resolv.conf diff --git a/src/catalyst/examples/gamecd.conf.example b/src/catalyst/examples/gamecd.conf.example deleted file mode 100644 index 955eac4e08..0000000000 --- a/src/catalyst/examples/gamecd.conf.example +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# these variables are to be used for creating the menu entry and also to tell -# the CD what to execute once X starts -GAME_NAME="Unreal Tournament 2004 Demo" -GAME_EXECUTABLE="/usr/games/bin/ut2004-demo" diff --git a/src/catalyst/examples/generic_stage_template.spec b/src/catalyst/examples/generic_stage_template.spec deleted file mode 100644 index 466e2b6bb5..0000000000 --- a/src/catalyst/examples/generic_stage_template.spec +++ /dev/null @@ -1,107 +0,0 @@ -# generic installation stage specfile -# 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. For stages, the -# supported targets are: stage1 stage2 stage3 -# example: -# target: stage2 -target: - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/stage3-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# These options are only available when building a stage1 or stage2 target and -# are all optional. These allow for emulating the changes possible during ai -# bootstrap. Some possible uses of these would be building embedded stages -# requiring a different CHOST or building a stage2 with NPTL support from a -# stage1 tarball that is built without it. -# If left blank, then the catalyst defaults from arch.py are used. - -# This option is used to change the CHOST from what is default in the profile -# to whatever you specify. This is useful for building NPTL, for example. -# example: -# chost: i686-pc-linux-gnu -chost: - -# This option allows you to change the default CFLAGS that will be used in -# building this stage. This really should remain generic, as putting -# optimizations flags here will build a stage1 tarball that is no longer -# generic. -# example: -# cflags: -Os -pipe -fomit-frame-pointer -mcpu=i686 -cflags: - -# This is for setting the CXXFLAGS. Generally, this would be set to the same -# as CFLAGS. In fact, it will mirror CFLAGS by default. -# example: -# cxxflags: -Os -pipe -fomit-frame-pointer -mcpu=i686 -cxxflags: - -# Setting this option sets LDFLAGS in make.conf in your stage. This would be -# useful for setting up an embedded or hardened system. -# example: -# ldflags: -Wl,-O1 -Wl,-z,now -ldflags: diff --git a/src/catalyst/examples/grp_template.spec b/src/catalyst/examples/grp_template.spec deleted file mode 100644 index fe78ee1b9b..0000000000 --- a/src/catalyst/examples/grp_template.spec +++ /dev/null @@ -1,114 +0,0 @@ -# generic GRP (Gentoo Reference Platform) specfile -# 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. For GRP, the -# supported targets are: grp -# example: -# target: grp -target: grp - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/stage3-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# Since GRP is capable of building packages/source sets for more than one CD, -# this defines the layout for the directories under $clst_sharedir/builds. -# example: -# grp: src cd2 -grp: src cd2 - -# GRP is also able to build packages with customized USE settings. However, it -# is very possible to cause 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. Some examples would be things like the -# socks5 USE flag. -# example: -# grp/use: gtk2 gnome kde qt bonobo cdr esd gtkhtml mozilla mysql perl ruby tcltk cups ldap ssl tcpd -svga -grp/use: - -# This tells catalyst what type of GRP set this list of packages will create. -# Valid options here are srcset or pkgset to either download the source, or to -# build packages, respectively. -# example: -# grp/src/type: srcset -grp/src/type: - -# Since this is a srcset, these ebuilds will have their distfiles fetched and -# the distfiles will be stored in the src directory under $clst_sharedir/builds. -# Packages will not be made out of this list. We use this for grabbing things -# that need a compiled kernel to build, or things listed in the Handbook that -# should be available before the first reboot during an install. -# example: -# grp/src/packages: gentoo-sources udev vanilla-sources rp-pppoe speedtouch fcdsl fritzcapi globespan-adsl pptpclient slmodem lvm2 evms iputils vixie-cron fcron dcron sysklogd metalog syslog-ng raidtools jfsutils xfsprogs reiserfsprogs dosfstools ntfsprogs lilo grub isdn4k-utils iproute2 wireless-tools wpa_supplicant pcmcia-cs hotplug coldplug dhcpcd slocate genkernel ipw2100 ipw2200 fxload logrotate -grp/src/packages: - -# This is mostly here for completeness. This is the pkgset definition. -# example: -# grp/cd2/type: pkgset -grp/cd2/type: - -# This is our list of packages that will comprise our package set. These are -# fetched, compiled, and the packages are stored under $clst_sharedir/builds. -# example: -# grp/cd2/packages: dante tsocks sys-apps/eject minicom links acpid apmd parted whois tcpdump cvs zip unzip netcat partimage app-admin/sudo app-cdr/cdrtools gnome emacs dev-lang/ruby enlightenment kde mozilla-firefox mozilla-thunderbird xfce4 openbox fluxbox sylpheed openoffice-bin gimp xemacs xmms abiword gaim xchat pan tetex xcdroast k3b samba nmap gradm ettercap ethereal mplayer -grp/cd2/packages: diff --git a/src/catalyst/examples/livecd-stage1_template.spec b/src/catalyst/examples/livecd-stage1_template.spec deleted file mode 100644 index a0e5463271..0000000000 --- a/src/catalyst/examples/livecd-stage1_template.spec +++ /dev/null @@ -1,88 +0,0 @@ -# livecd-stage1 example specfile -# 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. For building a CD, -# we start with livecd-stage1 as our target. -# example: -# target: livecd-stage1 -target: - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/stage3-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# The livecd-stage1 target is where you will build packages for your CD. These -# packages can be built with customized USE settings. The settings here are -# additive to the default USE configured by the profile. For building release -# media, the first thing we do is disable all default USE flags with -* and then -# begin to set our own. -# example: -# livecd/use: -* ipv6 socks5 livecd fbcon ncurses readline ssl -livecd/use: - -# This is the set of packages that we will merge into the CD's filesystem. 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. -# example: -# livecd/packages: livecd-tools dhcpcd acpid apmd gentoo-sources coldplug fxload irssi gpm syslog-ng parted links raidtools dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs ntfsprogs pwgen rp-pppoe screen mirrorselect penggy iputils hwdata-knoppix hwsetup lvm2 evms vim pptpclient mdadm ethtool wireless-tools prism54-firmware wpa_supplicant -livecd/packages: diff --git a/src/catalyst/examples/livecd-stage2_template.spec b/src/catalyst/examples/livecd-stage2_template.spec deleted file mode 100644 index 34068fae6d..0000000000 --- a/src/catalyst/examples/livecd-stage2_template.spec +++ /dev/null @@ -1,363 +0,0 @@ -# livecd-stage2 example specfile -# 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. For building a CD, -# we continue with livecd-stage2 as the target. -# example: -# target: livecd-stage2 -target: - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/livecd-stage1-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# This allows the optional directory containing the output packages for kernel -# builds. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# kerncache_path: /tmp/kernel -kerncache_path: - -# The fstype is used to determine what sort of CD we should build. This is -# used to set the type of loopback filesystem that we will use on our CD. -# Possible options are as follows: -# squashfs - This gives the best compression, but requires a kernel patch. -# zisofs - This uses in-kernel compression and is supported on all platforms. -# normal - This creates a loop without compression. -# noloop - This copies the files to the CD directly, withuot using a loopback. -# example: -# livecd/fstype: squashfs -livecd/fstype: - -# The fsops are a list of optional parameters that can be passed to the tool -# which will create the filesystem specified in livecd/fstype. It is valid for -# the following fstypes: squashfs, jffs, jffs2, cramfs -# example: -# livecd/fsops: -root-owned -livecd/fsops: - -# The cdtar is essentially the bootloader for the CD. It also holds the main -# configuration for the bootloader. On x86/amd64, it also can include a small -# memory testing application, called memtest86+. -# example: -# livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2 -livecd/cdtar: - -# This is the full path and filename to the ISO image that the livecd-stage2 -# target will create. -# example: -# livecd/iso: /tmp/installcd-x86-minimal.iso -livecd/iso: - -# A fsscript is simply a shell script that is copied into the chroot of the CD -# after the kernel(s) and any external modules have been compiled and is -# executed within the chroot. It can contain any commands that are available -# via the packages installed by our stages or by the packages installed during -# the livecd-stage1 build. We do not use one for the official release media, so -# there will not be one listed below. The syntax is simply the full path and -# filename to the shell script that you wish to execute. The script is copied -# into the chroot by catalyst automatically. -# example: -# livecd/fsscript: -livecd/fsscript: - -# The splash type determines the automatic arguments for the bootloader on -# supported architectures. The possible options are gensplash and bootsplash. -# example: -# livecd/splash_type: gensplash -livecd/splash_type: - -# This is where you set the splash theme. This theme must be present in either -# /etc/splash or /etc/bootsplash, depending on your livecd/splash_type, before -# the kernel has completed building during the livecd-stage2 target. -# example: -# livecd/splash_theme: livecd-2005.0 -livecd/splash_theme: - -# This is a set of arguments that get passed to the bootloader for your CD. It -# is used on the x86/amd64 release media to enable keymap selection. -# example: -# livecd/bootargs: dokeymap -livecd/bootargs: - -# This is a set of arguments that will be passed to genkernel for all kernels -# defined in this target. It is useful for passing arguments to genkernel that -# are not otherwise available via the livecd-stage2 spec file. -# example: -# livecd/gk_mainargs: --lvm2 --dmraid -livecd/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 -# 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: -# livecd/linuxrc: -livecd/linuxrc: - -# This option controls quite a bit of catalyst internals and sets up several -# defaults. Each type behaves slightly differently and is explained below. -# gentoo-release-minimal - This creates an official minimal InstallCD. -# gentoo-release-universal - This creates an official universal InstallCD. -# gentoo-release-livecd - This creates an official LiveCD environment. -# gentoo-gamecd - This creates an official Gentoo GameCD. -# generic-livecd - This should be used for all non-official media. -# example: -# livecd/type: gentoo-release-minimal -livecd/type: - -# 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 CD if you do not -# provide one yourself. Since we do not use this for the official releases, it -# is left blank below. -# example: -# livecd/readme: -livecd/readme: - -# This is for the CD's message of the day. It is not required for official -# release media, as catalyst builds a default motd when the livecd/type is set -# to one of the gentoo-* options. This setting overrides the default motd even -# on official media. Since we do not use this for the official releases, it is -# left blank below. -# example: -# livecd/motd: -livecd/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. -# example: -# livecd/modblacklist: 8139cp -livecd/modblacklist: - -# This is for adding init scripts to runlevels. The syntax for the init script -# is the script name, followed by a pipe, followed by the runlevel in which you -# want the script to run. It looks like spind|default and is space delimited. -# We do not use this on the official media, as catalyst sets up the runlevels -# correctly for us. Since we do not use this, it is left blank below. -# This option will automatically create missing runlevels -# example: -# livecd/rcadd: -livecd/rcadd: - -# This is for removing init script from runlevels. It is executed after the -# defaults shipped with catalyst, so it is possible to remove the defaults using -# this option. It can follow the same syntax as livcd/rcadd, or you can leave -# the runlevel off to remove the script from any runlevels detected. We do not -# use this on the official media, so it is left blank. -# example: -# livecd/rcdel: -livecd/rcdel: - -# This overlay is dropped onto the CD filesystem and is outside any loop which -# has been configured. This is typically used for adding the documentation, -# distfiles, snapshots, and stages to the official media. These files will not -# be available if docache is enabled, as they are outside the loop. -# example: -# livecd/overlay: /tmp/overlay-minimal -livecd/overlay: - -# This overlay is dropped onto the filesystem within the loop. This can be used -# for such things as updating configuration files or adding anything else you -# would want within your CD filesystem. Files added here are available when -# docache is used. We do not use this on the official media, so we will leave -# it blank below. -# example: -# livecd/root_overlay: -livecd/root_overlay: - -# This is here to enable udev support in both catalyst and genkernel. This -# option requires genkernel >= 3.1.0, and is not needed with genkernel >=3.2.0, -# as udev is the default. -# example: -# livecd/devmanager: udev -livecd/devmanager: - -# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc -# and is used by the livecd/type gentoo-gamecd and generic-livecd. While the -# file will still be copied for any livecd/type, catalyst will only create the -# necessary /etc/startx for those types, so X will not be automatically started. -# This is useful also for setting up X on a CD where you do not wish X to start -# automatically. We do not use this on the release media, so it is left blank. -# example: -# livecd/xinitrc: -livecd/xinitrc: - -# This is used by catalyst to determine which display manager you wish to -# become the default. This is used on the official Gentoo LiveCD and is valid -# for any livecd/type. -# example: -# livecd/xdm: gdm -livecd/xdm: - -# This is used by catalyst to determine which X session should be started by -# default by the display manager. This is used on the official Gentoo LiveCD -# and is valid for any livecd/type. -# example: -# livecd/xsession: gnome -livecd/xsession: - -# 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: -# livecd/users: -livecd/users: - -# This option sets the volume ID of the CD created. -# example: -# livecd/volid: Gentoo Linux 2005.0 X86 -livecd/volid: - -# This option is only used when creating a GameCD. This specifies the file that -# contains the definitions for GAME_NAME and GAME_EXECUTABLE, which are used by -# the GameCD scripts to set some specific options for the game. This is not -# used on the release media, and is therefore blank. -# example: -# gamecd/conf: -gamecd/conf: - -# 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: -# boot/kernel: gentoo -boot/kernel: - -# This option tells catalyst which kernel sources to merge for this kernel -# label. This can use normal portage atoms to specify a specific version. -# example: -# boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/sources: - -# 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. -# example: -# boot/kernel/gentoo/config: /tmp/2.6.11-smp.config -boot/kernel/gentoo/config: - -# This option sets genkernel parameters on a per-kernel basis and applies only -# to this kernel label. This can be used for building options into only a -# single kernel, where compatibility may be an issue. Since we do not use this -# on the official release media, it is left blank, but it follows the same -# syntax as livecd/gk_mainargs. -# example: -# boot/kernel/gentoo/gk_kernargs: -boot/kernel/gentoo/gk_kernargs: - -# This option sets the USE flags used to build the kernel and also any packages -# which are defined under this kernel label. These USE flags are additive from -# the default USE for the specified profile. -# example: -# boot/kernel/gentoo/use: pcmcia usb -X -boot/kernel/gentoo/use: - -# This option appends an extension to the name of your kernel, as viewed by a -# uname -r/ This also affects any modules built under this kernel label. This -# is useful for having two kernels using the same sources to keep the modules -# from overwriting each other. We do not use this on the official media, so it -# is left blank. -# example: -# boot/kernel/gentoo/extraversion: -boot/kernel/gentoo/extraversion: - -# This option is for merging kernel-dependent packages and external modules that -# are configured against this kernel label. -# example: -# boot/kernel/gentoo/packages: pcmcia-cs speedtouch slmodem globespan-adsl hostap-driver hostap-utils ipw2100 ipw2200 fritzcapi fcdsl cryptsetup -boot/kernel/gentoo/packages: - -# This option is only for ppc64 machines. If used it will create the /etc/yaboot.conf -# entry used for booting a ibm powerpc machine. -# example: -# boot/kernel/gentoo/machine_type: ibm -boot/kernel/gentoo/machine_type: - -# 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: -# boot/kernel/gentoo/console: hvsi0 -# boot/kernel/gentoo/console: hvc0 -# boot/kernel/gentoo/console: tty0 ttyS0 -boot/kernel/gentoo/console: - -# This is a list of packages that will be unmerged after all the kernels have -# 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: - -# This option is used to empty the directories listed. It is useful for getting -# 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: - -# This option tells catalyst to clean specific files from the filesystem and is -# very usefu in cleaning up stray files in /etc left over after livecd/unmerge. -# example: -# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2005.0/16* /etc/splash/livecd-2005.0/12* /etc/splash/livecd-2005.0/6* /etc/splash/livecd-2005.0/8* /etc/splash/livecd-2005.0/images/silent-16* /etc/splash/livecd-2005.0/images/silent-12* /etc/splash/livecd-2005.0/images/silent-6* /etc/splash/livecd-2005.0/images/silent-8* /etc/splash/livecd-2005.0/images/verbose-16* /etc/splash/livecd-2005.0/images/verbose-12* /etc/splash/livecd-2005.0/images/verbose-6* /etc/splash/livecd-2005.0/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf -livecd/rm: diff --git a/src/catalyst/examples/netboot2_template.spec b/src/catalyst/examples/netboot2_template.spec deleted file mode 100644 index 71e2fe005f..0000000000 --- a/src/catalyst/examples/netboot2_template.spec +++ /dev/null @@ -1,301 +0,0 @@ -subarch: mips3 -version_stamp: 2006.0 -target: netboot2 -rel_type: default -profile: uclibc/mips -snapshot: 20060107 -source_subpath: default/stage3-mips-uclibc-mips3-20051026 - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -boot/kernel: ip22r4k ip22r5k ip27r10k ip28r10k ip30r10k ip32r5k -boot/kernel/ip22r4k/sources: =mips-sources-2.6.14.5 -boot/kernel/ip22r5k/sources: =mips-sources-2.6.14.5 -boot/kernel/ip27r10k/sources: =mips-sources-2.6.14.5 -boot/kernel/ip28r10k/sources: =mips-sources-2.6.14.5 -boot/kernel/ip30r10k/sources: =mips-sources-2.6.14.5 -boot/kernel/ip32r5k/sources: =mips-sources-2.6.14.5 - -boot/kernel/ip22r4k/config: /usr/share/genkernel/mips/ip22r4k-2006_0.cf -boot/kernel/ip22r5k/config: /usr/share/genkernel/mips/ip22r5k-2006_0.cf -boot/kernel/ip27r10k/config: /usr/share/genkernel/mips/ip27r10k-2006_0.cf -boot/kernel/ip28r10k/config: /usr/share/genkernel/mips/ip28r10k-2006_0.cf -boot/kernel/ip30r10k/config: /usr/share/genkernel/mips/ip30r10k-2006_0.cf -boot/kernel/ip32r5k/config: /usr/share/genkernel/mips/ip32r5k-2006_0.cf - -boot/kernel/ip22r4k/use: -doc -boot/kernel/ip22r5k/use: -doc -boot/kernel/ip27r10k/use: -doc ip27 -boot/kernel/ip28r10k/use: -doc ip28 -boot/kernel/ip30r10k/use: -doc ip30 -boot/kernel/ip32r5k/use: -doc - -boot/kernel/ip22r4k/gk_kernargs: --kernel-cross-compile=mips-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image -boot/kernel/ip22r5k/gk_kernargs: --kernel-cross-compile=mips-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image -boot/kernel/ip27r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image -boot/kernel/ip28r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image -boot/kernel/ip30r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image -boot/kernel/ip32r5k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2 --initramfs-overlay=/tmp/image - -netboot2/builddate: 20060107 -netboot2/busybox_config: /usr/share/genkernel/mips/nb-busybox.cf - -netboot2/use: - -* - multicall - readline - ssl - -netboot2/packages: - com_err - dropbear - dvhtool - e2fsprogs - gcc-mips64 - jfsutils - mdadm - nano - ncurses - openssl - popt - portmap - reiserfsprogs - rsync - sdparm - ss - ttcp - uclibc - util-linux - wget - xfsprogs - -netboot2/packages/com_err/files: - /lib/libcom_err.so - /lib/libcom_err.so.2 - /lib/libcom_err.so.2.1 - /usr/bin/compile_et - /usr/lib/libcom_err.so - -netboot2/packages/dropbear/files: - /usr/bin/dbclient - /usr/bin/dbscp - /usr/bin/dropbearconvert - /usr/bin/dropbearkey - /usr/bin/dropbearmulti - /usr/sbin/dropbear - -netboot2/packages/dvhtool/files: - /usr/sbin/dvhtool - -netboot2/packages/e2fsprogs/files: - /bin/chattr - /bin/lsattr - /bin/uuidgen - /lib/libblkid.so - /lib/libblkid.so.1 - /lib/libblkid.so.1.0 - /lib/libe2p.so - /lib/libe2p.so.2 - /lib/libe2p.so.2.3 - /lib/libext2fs.so - /lib/libext2fs.so.2 - /lib/libext2fs.so.2.4 - /lib/libuuid.so - /lib/libuuid.so.1 - /lib/libuuid.so.1.2 - /sbin/badblocks - /sbin/blkid - /sbin/debugfs - /sbin/dumpe2fs - /sbin/e2fsck - /sbin/e2image - /sbin/e2label - /sbin/filefrag - /sbin/findfs - /sbin/fsck - /sbin/fsck.ext2 - /sbin/fsck.ext3 - /sbin/logsave - /sbin/mke2fs - /sbin/mkfs.ext2 - /sbin/mkfs.ext3 - /sbin/resize2fs - /sbin/tune2fs - /usr/lib/e2initrd_helper - /usr/lib/libblkid.so - /usr/lib/libe2p.so - /usr/lib/libext2fs.so - /usr/lib/libuuid.so - /usr/sbin/mklost+found - -netboot2/packages/jfsutils/files: - /sbin/fsck.jfs - /sbin/jfs_fsck - /sbin/jfs_mkfs - /sbin/jfs_tune - /sbin/mkfs.jfs - -netboot2/packages/mdadm/files: - /etc/mdadm.conf - /sbin/mdadm - -netboot2/packages/nano/files: - /bin/nano - /bin/rnano - /usr/bin/nano - -netboot2/packages/ncurses/files: - /etc/terminfo - /lib/libcurses.so - /lib/libncurses.so - /lib/libncurses.so.5 - /lib/libncurses.so.5.4 - /usr/bin/toe - /usr/lib/libcurses.so - /usr/lib/libform.so - /usr/lib/libform.so.5 - /usr/lib/libform.so.5.4 - /usr/lib/libmenu.so - /usr/lib/libmenu.so.5 - /usr/lib/libmenu.so.5.4 - /usr/lib/libncurses.so - /usr/lib/libpanel.so - /usr/lib/libpanel.so.5 - /usr/lib/libpanel.so.5.4 - /usr/lib/terminfo - /usr/share/tabset/std - /usr/share/tabset/stdcrt - /usr/share/tabset/vt100 - /usr/share/tabset/vt300 - /usr/share/terminfo/a/ansi - /usr/share/terminfo/d/dumb - /usr/share/terminfo/e/eterm - /usr/share/terminfo/l/linux - /usr/share/terminfo/r/rxvt - /usr/share/terminfo/s/screen - /usr/share/terminfo/s/sun - /usr/share/terminfo/v/vt100 - /usr/share/terminfo/v/vt102 - /usr/share/terminfo/v/vt200 - /usr/share/terminfo/v/vt220 - /usr/share/terminfo/v/vt52 - /usr/share/terminfo/x/xterm - /usr/share/terminfo/x/xterm-color - /usr/share/terminfo/x/xterm-xfree86 - -netboot2/packages/openssl/files: - /usr/lib/libcrypto.so - /usr/lib/libcrypto.so.0 - /usr/lib/libcrypto.so.0.9.7 - /usr/lib/libssl.so - /usr/lib/libssl.so.0 - /usr/lib/libssl.so.0.9.7 - -netboot2/packages/popt/files: - /usr/lib/libpopt.so - /usr/lib/libpopt.so.0 - /usr/lib/libpopt.so.0.0.0 - -netboot2/packages/portmap/files: - /sbin/portmap - -netboot2/packages/reiserfsprogs/files: - /sbin/fsck.reiserfs - /sbin/mkfs.reiserfs - /sbin/mkreiserfs - /sbin/reiserfsck - /sbin/reiserfstune - -netboot2/packages/rsync/files: - /usr/bin/rsync - -netboot2/packages/sdparm/files: - /usr/bin/sdparm - -netboot2/packages/ss/files: - /lib/libss.so - /lib/libss.so.2 - /lib/libss.so.2.0 - /usr/bin/mk_cmds - /usr/lib/libss.so - -netboot2/packages/ttcp/files: - /usr/bin/ttcp - -netboot2/packages/uclibc/files: - /etc/ld.so.cache - /lib/ld-uClibc-0.9.27.so - /lib/ld-uClibc.so.0 - /lib/libc.so.0 - /lib/libcrypt-0.9.27.so - /lib/libcrypt.so.0 - /lib/libdl-0.9.27.so - /lib/libdl.so.0 - /lib/libm-0.9.27.so - /lib/libm.so.0 - /lib/libnsl-0.9.27.so - /lib/libnsl.so.0 - /lib/libpthread-0.9.27.so - /lib/libpthread.so.0 - /lib/libresolv-0.9.27.so - /lib/libresolv.so.0 - /lib/librt-0.9.27.so - /lib/librt.so.0 - /lib/libthread_db-0.9.27.so - /lib/libthread_db.so.1 - /lib/libuClibc-0.9.27.so - /lib/libutil-0.9.27.so - /lib/libutil.so.0 - /sbin/ldconfig - /usr/bin/getent - /usr/bin/ldd - /usr/lib/Scrt1.o - /usr/lib/crt0.o - /usr/lib/crt1.o - /usr/lib/crti.o - /usr/lib/crtn.o - /usr/lib/libc.so - /usr/lib/libcrypt.so - /usr/lib/libdl.so - /usr/lib/libm.so - /usr/lib/libnsl.so - /usr/lib/libpthread.so - /usr/lib/libresolv.so - /usr/lib/librt.so - /usr/lib/libthread_db.so - /usr/lib/libutil.so - -netboot2/packages/util-linux/files: - /sbin/fdisk - /sbin/mkfs - /sbin/mkswap - /sbin/swapoff - /sbin/swapon - /usr/bin/ddate - /usr/bin/setterm - /usr/bin/whereis - -netboot2/packages/wget/files: - /usr/bin/wget - -netboot2/packages/xfsprogs/files: - /bin/xfs_copy - /bin/xfs_growfs - /bin/xfs_info - /lib/libhandle.so - /lib/libhandle.so.1 - /lib/libhandle.so.1.0.3 - /sbin/fsck.xfs - /sbin/mkfs.xfs - /sbin/xfs_repair - -# Setting the option overrides the location of the pkgcache -pkgcache_path: - -# Setting the option overrides the location of the kerncache -kerncache_path: - diff --git a/src/catalyst/examples/netboot_template.spec b/src/catalyst/examples/netboot_template.spec deleted file mode 100644 index 11a40da0ff..0000000000 --- a/src/catalyst/examples/netboot_template.spec +++ /dev/null @@ -1,155 +0,0 @@ -# generic netboot image specfile -# used to build a network bootable 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. For building a -# netboot image, we use the netboot target. -# example: -# target: netboot -target: - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/stage3-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# This allows the optional directory containing the output packages for kernel -# builds. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# kerncache_path: /tmp/kernel -kerncache_path: - -# This option tells catalyst which kernel sources to merge for building this -# image. This can use normal portage atoms to specify a specific version. -# example: -# netboot/kernel/sources: gentoo-sources -netboot/kernel/sources: - -# This option is the full path and filename to a kernel .config file that is -# used by genkernel to compile the kernel for this image. -# example: -# netboot/kernel/config: /tmp/2.6.11-netboot.config -netboot/kernel/config: - -# This option sets the USE flags used to build the kernel. These USE flags are -# additive from the default USE for the specified profile. -# example: -# netboot/kernel/use: ultra1 -netboot/kernel/use: - -# This option sets the USE flags with which the optional packages below are -# built. Like the kernel USE, they are additive. -# example: -# netboot/use: -netboot/use: - -# 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 -# netboot/busybox_config: /tmp/busybox.config -netboot/busybox_config: - -# This is the full path and filename to the tarball to use as the base for the -# netboot image. -# example: -# netboot/base_tarball: /usr/lib/catalyst/netboot/netboot-base.tar.bz2 -netboot/base_tarball: - -# These are the packages that will be built for your netboot image using the USE -# flags set in netboot/use. These package names are also labels used later when -# determining what files to copy into your netboot image. -# example: -# netboot/packages: raidtools xfsprogs e2fsprogs reiserfsprogs - -# This is where you tell catalyst which files from each package to copy into the -# netboot image. -# example: -# netboot/packages/raidtools/files: /sbin/raidstart /sbin/mkraid /sbin/detect_multipath /sbin/raidreconf /sbin/raidstop /sbin/raidhotadd /sbin/raidhotremove /sbin/raidsetfaulty /sbin/raid0run -netboot/packages/raidtools/files: - -# Here is the same thing for xfsprogs. -# example: -# netboot/packages/xfsprogs/files: /sbin/mkfs.xfs /sbin/xfs_repair /bin/xfs_check -netboot/packages/xfsprogs/files: - -# Here is the same thing for e2fsprogs. -# example: -# netboot/packages/e2fsprogs/files: /sbin/mke2fs -netboot/packages/e2fsprogs/files: - -# Here is the same thing for reiserfsprogs. -# example: -# netboot/packages/reiserfsprogs/files: /sbin/mkreiserfs -netboot/packages/reiserfsprogs/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. -# example: -# netboot/extra_files: /lib/libresolv.so.2 /lib/libnss_compat.so.2 /lib/libnss_dns.so.2 /lib/libnss_files.so.2 /sbin/consoletype -netboot/extra_files: - -# Setting the option overrides the location of the pkgcache -pkgcache_path: - -# Setting the option overrides the location of the kerncache -kerncache_path: - diff --git a/src/catalyst/examples/snapshot_template.spec b/src/catalyst/examples/snapshot_template.spec deleted file mode 100644 index b4b6d9fa16..0000000000 --- a/src/catalyst/examples/snapshot_template.spec +++ /dev/null @@ -1,11 +0,0 @@ -# portage snapshot example specfile - -# This is the target for creating a snapshot. -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: diff --git a/src/catalyst/examples/stage4_template.spec b/src/catalyst/examples/stage4_template.spec deleted file mode 100644 index 6e44712bf8..0000000000 --- a/src/catalyst/examples/stage4_template.spec +++ /dev/null @@ -1,272 +0,0 @@ -# stage4 example specfile -# 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. For building a CD, -# we start with stage4 as our target. -# example: -# target: stage4 -target: - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/stage3-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# This allows the optional directory containing the output packages for kernel -# builds. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# kerncache_path: /tmp/kernel -kerncache_path: - -# The stage4 target is where you will build packages for basically updated -# stage3. These packages can be built with customized USE settings. The -# settings here are additive to the default USE configured by the profile. -# Leaving this blank will default to the system use flags -# example: -# stage4/use: ipv6 socks5 fbcon ncurses readline ssl -stage4/use: - -# This is the set of packages that we will merge into the stage4 tarball. 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. -# example: -# stage4/packages: livecd-tools dhcpcd acpid apmd gentoo-sources coldplug fxload irssi gpm syslog-ng parted links raidtools dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs ntfsprogs pwgen rp-pppoe screen mirrorselect penggy iputils hwdata-knoppix hwsetup lvm2 evms vim pptpclient mdadm ethtool wireless-tools prism54-firmware wpa_supplicant -stage4/packages: - -# A fsscript is simply a shell script that is copied into the chroot of the stage4 -# after the kernel(s) and any external modules have been compiled and is -# executed within the chroot. It can contain any commands that are available -# via the packages installed by our stages or by the packages installed during -# the stage4-stage1 build. We do not use one for the official release media, so -# there will not be one listed below. The syntax is simply the full path and -# filename to the shell script that you wish to execute. The script is copied -# into the chroot by catalyst automatically. -# example: -# stage4/fsscript: -stage4/fsscript: - -# The splash type determines the automatic arguments for the bootloader on -# supported architectures. The possible options are gensplash and bootsplash. -# example: -# stage4/splash_type: gensplash -stage4/splash_type: - -# This is where you set the splash theme. This theme must be present in either -# /etc/splash or /etc/bootsplash, depending on your stage4/splash_type, before -# the kernel has completed building during the stage4-stage2 target. -# example: -# stage4/splash_theme: livecd-2005.0 -stage4/splash_theme: - -# This is a set of arguments that will be passed to genkernel for all kernels -# defined in this target. It is useful for passing arguments to genkernel that -# are not otherwise available via the stage4-stage2 spec file. -# example: -# stage4/gk_mainargs: --lvm2 --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 -# 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: -# stage4/linuxrc: -stage4/linuxrc: - -# This is for the message of the day. It is not required -# release media, as catalyst builds a default motd when the stage4/type is set -# to one of the gentoo-* options. This setting overrides the default motd even -# on official media. Since we do not use this for the official releases, it is -# left blank below. -# example: -# stage4/motd: -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. -# example: -# stage4/modblacklist: 8139cp -stage4/modblacklist: - -# This is for adding init scripts to runlevels. The syntax for the init script -# is the script name, followed by a pipe, followed by the runlevel in which you -# want the script to run. It looks like spind|default and is space delimited. -# We do not use this on the official media, as catalyst sets up the runlevels -# correctly for us. Since we do not use this, it is left blank below. -# example: -# stage4/rcadd: -stage4/rcadd: - -# This is for removing init script from runlevels. It is executed after the -# defaults shipped with catalyst, so it is possible to remove the defaults using -# this option. It can follow the same syntax as livcd/rcadd, or you can leave -# the runlevel off to remove the script from any runlevels detected. We do not -# use this on the official media, so it is left blank. -# example: -# stage4/rcdel: -stage4/rcdel: - -# This overlay is dropped onto the filesystem within the loop. This can be used -# for such things as updating configuration files or adding anything else you -# would want within your stage4 filesystem. Files added here are available when -# docache is used. We do not use this on the official media, so we will leave -# it blank below. -# example: -# stage4/root_overlay: -stage4/root_overlay: - -# This is here to enable udev support in both catalyst and genkernel. This -# option requires genkernel >= 3.1.0, and is not needed with genkernel >=3.2.0, -# as udev is the default. -# example: -# stage4/devmanager: udev -stage4/devmanager: - -# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc -# and is used by the stage4/type gentoo-gamecd and generic-livecd. While the -# file will still be copied for any stage4/type, catalyst will only create the -# necessary /etc/startx for those types, so X will not be automatically started. -# This is useful also for setting up X on a CD where you do not wish X to start -# automatically. We do not use this on the release media, so it is left blank. -# example: -# 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: -# stage4/users: -stage4/users: - -# 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: -# boot/kernel: gentoo -boot/kernel: - -# This option tells catalyst which kernel sources to merge for this kernel -# label. This can use normal portage atoms to specify a specific version. -# example: -# boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/sources: - -# 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. -# example: -# boot/kernel/gentoo/config: /tmp/2.6.11-smp.config -boot/kernel/gentoo/config: - -# This option sets genkernel parameters on a per-kernel basis and applies only -# to this kernel label. This can be used for building options into only a -# single kernel, where compatibility may be an issue. Since we do not use this -# on the official release media, it is left blank, but it follows the same -# syntax as stage4/gk_mainargs. -# example: -# boot/kernel/gentoo/gk_kernargs: -boot/kernel/gentoo/gk_kernargs: - -# This option sets the USE flags used to build the kernel and also any packages -# which are defined under this kernel label. These USE flags are additive from -# the default USE for the specified profile. -# example: -# boot/kernel/gentoo/use: pcmcia usb -X -boot/kernel/gentoo/use: - -# This option appends an extension to the name of your kernel, as viewed by a -# uname -r/ This also affects any modules built under this kernel label. This -# is useful for having two kernels using the same sources to keep the modules -# from overwriting each other. We do not use this on the official media, so it -# is left blank. -# example: -# boot/kernel/gentoo/extraversion: -boot/kernel/gentoo/extraversion: - -# This option is for merging kernel-dependent packages and external modules that -# are configured against this kernel label. -# example: -# boot/kernel/gentoo/packages: pcmcia-cs speedtouch slmodem globespan-adsl hostap-driver hostap-utils ipw2100 ipw2200 fritzcapi fcdsl cryptsetup -boot/kernel/gentoo/packages: - -# This is a list of packages that will be unmerged after all the kernels have -# 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: - -# This option is used to empty the directories listed. It is useful for getting -# 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/bootsplash/gentoo /etc/bootsplash/gentoo-highquality /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 -# very usefu in cleaning up stray files in /etc left over after stage4/unmerge. -# example: -# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2005.0/16* /etc/splash/livecd-2005.0/12* /etc/splash/livecd-2005.0/6* /etc/splash/livecd-2005.0/8* /etc/splash/livecd-2005.0/images/silent-16* /etc/splash/livecd-2005.0/images/silent-12* /etc/splash/livecd-2005.0/images/silent-6* /etc/splash/livecd-2005.0/images/silent-8* /etc/splash/livecd-2005.0/images/verbose-16* /etc/splash/livecd-2005.0/images/verbose-12* /etc/splash/livecd-2005.0/images/verbose-6* /etc/splash/livecd-2005.0/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf -stage4/rm: diff --git a/src/catalyst/examples/tinderbox_template.spec b/src/catalyst/examples/tinderbox_template.spec deleted file mode 100644 index 892c5adc6d..0000000000 --- a/src/catalyst/examples/tinderbox_template.spec +++ /dev/null @@ -1,93 +0,0 @@ -# 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/reference.xml -# example: -# 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. -# example: -# version_stamp: 2005.0 -version_stamp: - -# The target specifies what target we want catalyst to do. -# example: -# target: tinderbox -target: tinderbox - -# The rel_type defines what kind of build we are doing. This is merely another -# identifier, but it useful for allowing multiple concurrent builds. Usually, -# default will suffice. -# example: -# 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. -# example: -# profile: default-linux/x86/2005.0 -profile: - -# This specifies which snapshot to use for building this target. -# example: -# snapshot: 20050324 -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. -# example: -# default/stage3-x86-2004.3 -source_subpath: - -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - -# This is an optional directory containing portage configuration files. It -# follows the same syntax as /etc/portage and should be consistent across all -# targets to minimize problems. -# example: -# portage_confdir: /etc/portage -portage_confdir: - -# This option specifies the location to a portage overlay that you would like to -# have used when building this target. -# example: -# portage_overlay: /usr/local/portage -portage_overlay: - -# This allows the optional directory containing the output packages for -# catalyst. Mainly used as a way for different spec files to access the same -# cache directory. Default behavior is for this location to be autogenerated -# by catalyst based on the spec file. -# example: -# pkgcache_path: /tmp/packages -pkgcache_path: - -# The tinderbox target can build packages with any USE settings. However, it -# should be noted that these settings are additive to the settings in the -# chosen profile. This is extremely useful when testing possible changed to a -# profile or package. -# example: -# tinderbox/use: gtk2 gnome kde qt bonobo cdr esd gtkhtml mozilla mysql perl ruby tcltk cups ldap ssl tcpd -svga -tinderbox/use: - -# This is the list of packages that will be built by the tinderbox target. -# Each of these is considered a separate target to test, and catalyst will use -# rsync to reset the build area to the default from the source_subpath before -# each package. This allows for testing USE changes on individual packages as -# well as for dependency issues. -# exampleL -# tinderbox/packages: dante tsocks sys-apps/eject minicom links acpid apmd parted whois tcpdump cvs zip unzip netcat partimage app-admin/sudo app-cdr/cdrtools gnome emacs dev-lang/ruby enlightenment kde mozilla-firefox mozilla-thunderbird xfce4 openbox fluxbox sylpheed openoffice-bin gimp xemacs xmms abiword gaim xchat pan tetex xcdroast k3b samba nmap gradm ettercap ethereal mplayer -tinderbox/packages: - -# Setting the option overrides the location of the pkgcache -pkgcache_path: - -# Setting the option overrides the location of the kerncache -kerncache_path: - diff --git a/src/catalyst/files/catalyst.1 b/src/catalyst/files/catalyst.1 deleted file mode 100644 index 4154760e61..0000000000 --- a/src/catalyst/files/catalyst.1 +++ /dev/null @@ -1,124 +0,0 @@ -.TH "CATALYST" "1" "December 8, 2005" "Catalyst 2.0" "Catalyst" - -.SH NAME -catalyst \- The Gentoo Linux Release Engineering meta-tool - -.SH SYNOPSIS -.TP - -.BR catalyst -[\fIoptions\fR] [\fI\-f file\fR | \fI\-C keys\fR | \fI\-s version_stamp\fR] ... -.TP - -.BR catalyst -\fI\-\-help \-h\fR -.TP - -.BR catalyst -\fI\-\-version \-V\fR - -.SH DESCRIPTION -\fBcatalyst\fR is the tool that the Gentoo Release Engineering team -utilizes to build all Gentoo Linux releases. It is capable of building -installation stages, bootable LiveCDs, netboot images, and Gentoo Reference -Platform (GRP) sets. \fBcatalyst\fR is also capable of providing a simple -tinderbox environment for ebuild/package testing. - -For more information, please visit the \fBcatalyst\fR project page -on the web at <http://www.gentoo.org/proj/en/releng/catalyst>. - -.SH OPTIONS -.TP - -.BR "\-\-clear\-autoresume " (\fB\-a\fR) -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. -.TP - -.BR "\-\-cli " (\fB\-C\fR) -This option is to be used in place of a specfile. All options are passed -to \fBcatalyst\fR on the commandline. Please note that this option must -be the last option passed to \fBcatalyst\fR for everything to work correctly. -.TP - -.BR "\-\-config " (\fB\-c\fR) -Tell \fBcatalyst\fR to use a user-defined configuration file. A sample -configuration file is installed at /etc/catalyst/catalyst.conf. -.TP - -.BR "\-\-debug " (\fB\-d\fR) -Enable debugging mode -.TP - -.BR "\-\-fetchonly " (\fB\-F\fR) -This tells \fBcatalyst\fR to only fetch distfiles for the given packages without -performing any building. -.TP - -.BR "\-\-file " (\fB\-f\fR) -Tell \fBcatalyst\fR to use the user supplied specfile. -.TP - -.BR "\-\-help " (\fB\-h\fR) -Print the help message and exit -.TP - -.BR "\-\-purge " (\fB\-p\fR) -Tell \fBcatalyst\fR to clear all temporary directories, package caches, and -autoresume flags for the given target. -.TP - -.BR "\-\-snapshot " (\fB\-s\fR) -Create a Portage snapshot using the specified identifier stamp. -.TP - -.BR "\-\-verbose " (\fB\-v\fR) -Enable verbose mode. - -.BR "\-\-version " (\fB\-V\fR) -Print the version information and exit -.TP - -.SH EXAMPLES -.TP -Using the commandline option (\-C, \-\-cli) to build a Portage snapshot: -catalyst \-C target=snapshot version_stamp=my_date -.TP -Using the specfile option (\-f, \-\-file) to build a stage target: -catalyst \-f stage1\-specfile.spec -.TP -Using the snapshot option (\-s, \-\-snapshot) to package a Portage snapshot -using the datestamp 20051208: -catalyst \-s 20051208 - -.SH FILES -.TP -Example specfiles can be found in /usr/share/doc/catalyst-<version>/examples. -An example configuration file can be found at /etc/catalyst/catalyst.conf. - -.SH BUGS -.TP -An up-to-date list of Catalyst bugs can always be found listed on the Gentoo -Linux bug-tracking system at <http://bugs.gentoo.org>. - -.SH SEE ALSO -.TP -A more in-depth examination of Catalyst options and procedures can be found -linked from the \fBcatalyst\fR project page, which is located at -<http://www.gentoo.org/proj/en/releng/catalyst>. - -.SH NOTES -.TP -\fBCatalyst\fR is conceptually derived from the Gentoo livecd-ng and Gentoo -stager projects, both of which were used to create pre-1.4 Gentoo releases. -.LP -\fBCatalyst\fR was originally conceived and coded by both Daniel Robbins and -John Davis. It is currently maintained by Chris Gianelloni and Eric Edgar and -hass been mostly re-written. - -.SH AUTHOR -John Davis <zhen@gentoo.org> -Chris Gianelloni <wolf31o2@gentoo.org> - -.SH "CVS HEADER" -$Id: catalyst.1,v 1.5 2005/12/08 14:48:58 wolf31o2 Exp $ diff --git a/src/catalyst/files/catalyst.conf b/src/catalyst/files/catalyst.conf deleted file mode 100644 index abc90190fb..0000000000 --- a/src/catalyst/files/catalyst.conf +++ /dev/null @@ -1,65 +0,0 @@ -# /etc/catalyst/catalyst.conf -# $Header: /var/cvsroot/gentoo/src/catalyst/files/Attic/catalyst.conf,v 1.22 2006/10/02 20:41:53 wolf31o2 Exp $ - -# Simple desriptions of catalyst settings. Please refer to the online -# documentation for more information. - -# distdir specifies where your distfiles are located. This setting should -# work fine for most default installations. -distdir="/usr/portage/distfiles" - -# options set different build-time options for catalyst. Some examples are: -# autoresume = Attempt to resume a failed build, clear the autoresume flags with -# the -a option to the catalyst cmdline. -p will clear the autoresume flags -# as well as your pkgcache and kerncache -# ( This option is not fully tested, bug reports welcome ) -# ccache = enables build time ccache support (highly recommended) -# distcc = enable distcc support for building. You have to set distcc_hosts in -# your spec file. -# pkgcache = keeps a tbz2 of every built package (useful if your build stops -# prematurely) -# kerncache = keeps a tbz2 of your built kernel and modules (useful if your -# build stops in livecd-stage2) -# seedcache = use the build output of a previous target if it exists to speed up -# the copy -# snapcache = cache the snapshot so that it can be bind-mounted into the chroot. -# WARNING: moving parts of the portage tree from within fsscript *will* break -# your cache. The cache is unlinked before any empty or rm processing, though. -# -# (These options can be used together) -options="autoresume kerncache pkgcache seedcache snapcache" - -# sharedir specifies where all of the catalyst runtime executables are. Most -# users do not need to change this. -sharedir="/usr/lib/catalyst" - -# storedir specifies where catalyst will store everything that it builds, and -# also where it will put its temporary files and caches. -storedir="/var/tmp/catalyst" - -# portdir specifies the source portage tree used by the snapshot target. -# portdir="/usr/portage" - -# snapshot_cache specifies where the snapshots will be cached to if snapcache is -# enabled in the options. -# snapshot_cache="<path_to_new_cache_dir>" - -# Internal hash function catalyst should use for things like autoresume, -# seedcache, etc. The default and fastest is crc32. You should not ever need -# to change this unless your OS does not support it. -# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32, -# ripemd256, sha256, sha512, ripemd160, md5 -hash_function="crc32" - -# Creates a .digests file containing the hash output from any of the supported -# options below. Adding them all may take a long time. -# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32, -# ripemd256, sha256, sha512, ripemd160, md5 -digests="md5 sha1" - -# envscript allows users to set options such as http proxies, MAKEOPTS, -# GENTOO_MIRRORS, or any other environment variables needed for building. -# The envscript file sets environment variables like so: -# export FOO="bar" - -#envscript="/root/.catalystrc" diff --git a/src/catalyst/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index bc7988380b..0000000000 --- a/src/catalyst/livecd/cdtar/aboot-0.9-r1-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/arcload-0.43-r1.tbz2 b/src/catalyst/livecd/cdtar/arcload-0.43-r1.tbz2 Binary files differdeleted file mode 100644 index 77ce2cb427..0000000000 --- a/src/catalyst/livecd/cdtar/arcload-0.43-r1.tbz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/elilo-3.6-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/elilo-3.6-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index 958b129a73..0000000000 --- a/src/catalyst/livecd/cdtar/elilo-3.6-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index 2f44963e00..0000000000 --- a/src/catalyst/livecd/cdtar/grub-memtest86+-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/isolinux-3.09-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/isolinux-3.09-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index ff6e277a52..0000000000 --- a/src/catalyst/livecd/cdtar/isolinux-3.09-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index fcc92e705b..0000000000 --- a/src/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index 7f8536013a..0000000000 --- a/src/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index cec72ce55f..0000000000 --- a/src/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index 169cf99b88..0000000000 --- a/src/catalyst/livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 b/src/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 Binary files differdeleted file mode 100644 index 13f2d33cae..0000000000 --- a/src/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 +++ /dev/null diff --git a/src/catalyst/livecd/files/Getting_Online.txt b/src/catalyst/livecd/files/Getting_Online.txt deleted file mode 100644 index 1cee6d4b54..0000000000 --- a/src/catalyst/livecd/files/Getting_Online.txt +++ /dev/null @@ -1,437 +0,0 @@ - Configuring your Network - - Content: - * Automatic Network Detection - * Automatic Network Configuration - * Manual Network Configuration - - a. Automatic Network Detection - - Maybe it just works? - - If your system is plugged into an Ethernet network with a DHCP server, it - is very likely that your networking configuration has already been set up - automatically for you. If so, you should be able to take advantage of the - many included network-aware commands on the Installation CD such as ssh, - scp, ping, irssi, wget and links, among others. - - If networking has been configured for you, the /sbin/ifconfig command - should list some network interfaces besides lo, such as eth0: - - Code Listing 1: /sbin/ifconfig for a working network configuration - # /sbin/ifconfig - (...) - eth0 Link encap:Ethernet HWaddr 00:50:BA:8F:61:7A - inet addr:192.168.0.2 Bcast:192.168.0.255 Mask:255.255.255.0 - inet6 addr: fe80::50:ba8f:617a/10 Scope:Link - UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 - RX packets:1498792 errors:0 dropped:0 overruns:0 frame:0 - TX packets:1284980 errors:0 dropped:0 overruns:0 carrier:0 - collisions:1984 txqueuelen:100 - RX bytes:485691215 (463.1 Mb) TX bytes:123951388 (118.2 Mb) - Interrupt:11 Base address:0xe800 - - Optional: Configure any Proxies - - If you access the Internet through a proxy, you might need to set up proxy - information during the installation. It is very easy to define a proxy: - you just need to define a variable which contains the proxy server - information. - - In most cases, you can just define the variables using the server - hostname. As an example, we assume the proxy is called proxy.gentoo.org - and the port is 8080. - - Code Listing 2: Defining proxy servers - (If the proxy filters HTTP traffic) - # export http_proxy="http://proxy.gentoo.org:8080" - (If the proxy filters FTP traffic) - # export ftp_proxy="ftp://proxy.gentoo.org:8080" - (If the proxy filters RSYNC traffic) - # export RSYNC_PROXY="proxy.gentoo.org:8080" - - If your proxy requires a username and password, you should use the - following syntax for the variable: - - Code Listing 3: Adding username/password to the proxy variable - http://username:password@proxy.gentoo.org:8080 - - Testing the Network - - You may want to try pinging your ISP's DNS server (found in - /etc/resolv.conf) and a Web site of your choice, just to make sure that - your packets are reaching the net, DNS name resolution is working - correctly, etc. - - Code Listing 4: Further network testing - # ping -c 3 www.yahoo.com - - If you are now able to use your network, you can skip the rest of this - document. If not, read on. - - b. Automatic Network Configuration - - If the network doesn't work immediately, some installation media allow you - to use net-setup (for regular or wireless networks), adsl-setup (for - ADSL-users) or pptp (for PPTP-users - only available on x86). - - If your installation medium does not contain any of these tools or your - network doesn't function yet, continue with Manual Network Configuration. - - * Regular Ethernet users should continue with Default: Using net-setup - * ADSL users should continue with Alternative: Using RP-PPPoE - * PPTP users should continue with Alternative: Using PPTP - * Speedtouch USB users should continue with Alternative: Using Speedtouch - USB - - Default: Using net-setup - - The simplest way to set up networking if it didn't get configured - automatically is to run the net-setup script: - - Code Listing 5: Running the net-setup script - # net-setup eth0 - - net-setup will ask you some questions about your network environment. When - all is done, you should have a working network connection. Test your - network connection as stated before. If the tests are positive, - congratulations! You are now ready to install Gentoo and can skip the - rest of this document. - - If your network still doesn't work, continue with Manual Network - Configuration. - - Alternative: Using RP-PPPoE - - Assuming you need PPPoE to connect to the internet, the Installation CD - (any version) has made things easy for you by including rp-pppoe. Use the - provided adsl-setup script to configure your connection. You will be - prompted for the ethernet device that is connected to your adsl modem, - your username and password, the IPs of your DNS servers and if you need a - basic firewall or not. - - Code Listing 6: Using rp-pppoe - # adsl-setup - # adsl-start - - If something goes wrong, double-check that you correctly typed your - username and password by looking at /etc/ppp/pap-secrets or - /etc/ppp/chap-secrets and make sure you are using the right ethernet - device. If your ethernet device doesn't exist, you will have to load the - appropriate network modules. In that case you should continue with Manual - Network Configuration as we explain how to load the appropriate network - modules there. - - If everything worked, continue with Preparing the Disks. - - Alternative: Using PPTP - - Note: PPTP support is only available for x86 - - If you need PPTP support, you can use pptpclient which is provided by our - Installation CDs. But first you need to make sure that your configuration - is correct. Edit /etc/ppp/pap-secrets or /etc/ppp/chap-secrets so it - contains the correct username/password combination: - - Code Listing 7: Editing /etc/ppp/chap-secrets - # nano -w /etc/ppp/chap-secrets - - Then adjust /etc/ppp/options.pptp if necessary: - - Code Listing 8: Editing /etc/ppp/options.pptp - # nano -w /etc/ppp/options.pptp - - When all that is done, just run pptp (along with the options you couldn't - set in options.pptp) to connect the server: - - Code Listing 9: Connection to a dial-in server - # pptp <server ip> - - Now continue with Preparing the Disks. - - Alternative: Using Speedtouch USB - - First, you need to help hotplug in finding the Alcatel Speedtouch USB - modem. Add the following line to /etc/hotplug/usb.usermap: - - Code Listing 10: Adding Alcatel Speedtouch support - speedtouch 0x0003 0x06b9 0x4061 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 "Alcatel SpeedTouch USB" - - Next, create /etc/ppp/peers/adsl and enter the following information: - - Code Listing 11: Editing /etc/ppp/peers/adsl - noipdefault - defaultroute - # Change this to the login for your ISP. - user "user@provider.com" - passive - persist - holdoff 4 - maxfail 25 - plugin pppoatm.so - # Changes by country - http://www.linux-usb.org/SpeedTouch/faq/index.html#q12 - 0.38 - - If your ISP provides the name servers, add "usepeerdns" to it as well. - - Now add your login and password to the /etc/ppp/chap-secrets file: - - Code Listing 12: Setting the user name and password - "user@provider.com" * "yourpassword" - - Now you are all set: start up your internet connection using pppd: - - Code Listing 13: Starting the Internet connection - # pppd call adsl - - c. Manual Network Configuration - - Loading the Appropriate Network Modules - - When the Installation CD boots, it tries to detect all your hardware - devices and loads the appropriate kernel modules (drivers) to support your - hardware. In the vast majority of cases, it does a very good job. However, - in some cases, it may not auto-load the kernel modules you need. - - If net-setup or adsl-setup failed, then it is possible that your network - card wasn't found immediately. This means you may have to load the - appropriate kernel modules manually. - - To find out what kernel modules we provide for networking, use ls: - - Code Listing 14: Searching for provided modules - # ls /lib/modules/`uname -r`/kernel/drivers/net - - If you find a driver for your network card, use modprobe to load the - kernel module: - - Code Listing 15: Using modprobe to load a kernel module - (As an example, we load the pcnet32 module) - # modprobe pcnet32 - - To check if your network card is now detected, use ifconfig. A detected - network card would result in something like this: - - Code Listing 16: Testing availability of your network card, successful - # ifconfig eth0 - eth0 Link encap:Ethernet HWaddr FE:FD:00:00:00:00 - BROADCAST NOARP MULTICAST MTU:1500 Metric:1 - RX packets:0 errors:0 dropped:0 overruns:0 frame:0 - TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 - collisions:0 txqueuelen:0 - RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) - - If however you receive the following error, the network card is not - detected: - - Code Listing 17: Testing availability of your network card, failed - # ifconfig eth0 - eth0: error fetching interface information: Device not found - - If you have multiple network cards in your system they are named eth0, - eth1, etc. Make sure that the network card you want to use works well and - remember to use the correct naming throughout this document. We will - assume that the network card eth0 is used. - - Assuming that you now have a detected network card, you can retry - net-setup or adsl-setup again (which should work now), but for the - hardcore people amongst you we explain how to configure your network - manually. - - Select one of the following sections based on your network setup: - - * Using DHCP for automatic IP retrieval - * Preparing for Wireless Access if you have a wireless card - * Understanding Network Terminology explains what you need to know about - networking - * Using ifconfig and route explains how to set up your networking - manually - - Using DHCP - - DHCP (Dynamic Host Configuration Protocol) makes it possible to - automatically receive networking information (IP address, netmask, - broadcast address, gateway, nameservers etc.). This only works if you have - a DHCP server in your network (or if your provider provides a DHCP - service). To have a network interface receive this information - automatically, use dhcpcd: - - Code Listing 18: Using dhcpcd - # dhcpcd eth0 - Some network admins require that you use the - hostname and domainname provided by the DHCP server. - In that case, use - # dhcpcd -HD eth0 - - If this works (try pinging some internet server, like Google), then you - are all set and ready to continue. Skip the rest of this section and - continue with Preparing the Disks. - - Preparing for Wireless Access - - Note: Support for the iwconfig command is only available on x86, amd64 and - ppc Installation CDs. You can still get the extensions working otherwise - by following the instructions of the linux-wlan-ng project. - - If you are using a wireless (802.11) card, you may need to configure your - wireless settings before going any further. To see the current wireless - settings on your card, you can use iwconfig. Running iwconfig might show - something like: - -Code Listing 19: Showing the current wireless settings -# iwconfig eth0 -eth0 IEEE 802.11-DS ESSID:"GentooNode" - Mode:Managed Frequency:2.442GHz Access Point: 00:09:5B:11:CC:F2 - Bit Rate:11Mb/s Tx-Power=20 dBm Sensitivity=0/65535 - Retry limit:16 RTS thr:off Fragment thr:off - Power Management:off - Link Quality:25/10 Signal level:-51 dBm Noise level:-102 dBm - Rx invalid nwid:5901 Rx invalid crypt:0 Rx invalid frag:0 Tx - excessive retries:237 Invalid misc:350282 Missed beacon:84 - - Note: Some wireless cards may have a device name of wlan0 or ra0 instead - of eth0. Run iwconfig without any command-line parameters to determine the - correct device name. - - For most users, there are only two settings that might be important to - change, the ESSID (aka wireless network name) or the WEP key. If the ESSID - and Access Point address listed are already that of your access point and - you are not using WEP, then your wireless is working. If you need to - change your ESSID, or add a WEP key, you can issue the following commands: - - Code Listing 20: Changing ESSID and/or adding WEP key - (This sets the network name to "GentooNode") - # iwconfig eth0 essid GentooNode - - (This sets a hex WEP key) - # iwconfig eth0 key 1234123412341234abcd - - (This sets an ASCII key - prefix it with "s:") - # iwconfig eth0 key s:some-password - - You can then confirm your wireless settings again by using iwconfig. Once - you have wireless working, you can continue configuring the IP level - networking options as described in the next section (Understanding Network - Terminology) or use the net-setup tool as described previously. - - Understanding Network Terminology - - Note: If you know your IP address, broadcast address, netmask and - nameservers, then you can skip this subsection and continue with Using - ifconfig and route. - - If all of the above fails, you will have to configure your network - manually. This is not difficult at all. However, you need to be familiar - with some network terminology, as you will need it to be able to configure - your network to your satisfaction. After reading this, you will know what - a gateway is, what a netmask serves for, how a broadcast address is formed - and why you need nameservers. - - In a network, hosts are identified by their IP address (Internet Protocol - address). Such an address is a combination of four numbers between 0 and - 255. Well, at least that is how we perceive it. In reality, such an IP - address consists of 32 bits (ones and zeros). Let's view an example: - - Code Listing 21: Example of an IP address - IP Address (numbers): 192.168.0.2 - IP Address (bits): 11000000 10101000 00000000 00000010 - -------- -------- -------- -------- - 192 168 0 2 - - Such an IP address is unique to a host as far as all accessible networks - are concerned (i.e. every host that you are able to reach must have a - unique IP address). In order to distinguish between hosts inside and - outside a network, the IP address is divided in two parts: the network - part and the host part. - - The separation is written down with the netmask, a collection of ones - followed by a collection of zeros. The part of the IP that can be mapped - on the ones is the network-part, the other one is the host-part. As usual, - the netmask can be written down as an IP-address. - - Code Listing 22: Example of network/host separation - IP-address: 192 168 0 2 - 11000000 10101000 00000000 00000010 - Netmask: 11111111 11111111 11111111 00000000 - 255 255 255 0 - +--------------------------+--------+ - Network Host - - In other words, 192.168.0.14 is still part of our example network, but - 192.168.1.2 is not. - - The broadcast address is an IP-address with the same network-part as your - network, but with only ones as host-part. Every host on your network - listens to this IP address. It is truly meant for broadcasting packets. - - Code Listing 23: Broadcast address - IP-address: 192 168 0 2 - 11000000 10101000 00000000 00000010 - Broadcast: 11000000 10101000 00000000 11111111 - 192 168 0 255 - +--------------------------+--------+ - Network Host - - To be able to surf on the internet, you must know which host shares the - Internet connection. This host is called the gateway. Since it is a - regular host, it has a regular IP address (for instance 192.168.0.1). - - We previously stated that every host has its own IP address. To be able to - reach this host by a name (instead of an IP address) you need a service - that translates a name (such as dev.gentoo.org) to an IP address (such as - 64.5.62.82). Such a service is called a name service. To use such a - service, you must define the necessary name servers in /etc/resolv.conf. - - In some cases, your gateway also serves as nameserver. Otherwise you will - have to enter the nameservers provided by your ISP. - - To summarise, you will need the following information before continuing: - - Network Item Example - Your IP address 192.168.0.2 - Netmask 255.255.255.0 - Broadcast 192.168.0.255 - Gateway 192.168.0.1 - Nameserver(s) 195.130.130.5, 195.130.130.133 - - Using ifconfig and route - - Setting up your network consists of three steps. First we assign ourselves - an IP address using ifconfig. Then we set up routing to the gateway using - route. Then we finish up by placing the nameserver IPs in - /etc/resolv.conf. - - To assign an IP address, you will need your IP address, broadcast address - and netmask. Then execute the following command, substituting ${IP_ADDR} - with your IP address, ${BROADCAST} with your broadcast address and - ${NETMASK} with your netmask: - - Code Listing 24: Using ifconfig - # ifconfig eth0 ${IP_ADDR} broadcast ${BROADCAST} netmask ${NETMASK} up - - Now set up routing using route. Substitute ${GATEWAY} with your gateway IP - address: - - Code Listing 25: Using route - # route add default gw ${GATEWAY} - - Now open /etc/resolv.conf with your favorite editor (in our example, we - use nano): - - Code Listing 26: Creating /etc/resolv.conf - # nano -w /etc/resolv.conf - - Now fill in your nameserver(s) using the following as a template. Make - sure you substitute ${NAMESERVER1} and ${NAMESERVER2} with the appropriate - nameserver addresses: - - Code Listing 27: /etc/resolv.conf template - nameserver ${NAMESERVER1} - nameserver ${NAMESERVER2} - - That's it. Now test your network by pinging some Internet server (like - Google). If this works, congratulations then. You are now ready to install - Gentoo. - - The contents of this document are licensed under the Creative Commons - - Attribution / Share Alike license. diff --git a/src/catalyst/livecd/files/README.txt b/src/catalyst/livecd/files/README.txt deleted file mode 100644 index 4ddf8bd9ad..0000000000 --- a/src/catalyst/livecd/files/README.txt +++ /dev/null @@ -1,117 +0,0 @@ - -This file lists the possible command line options that can be used to tweak -the boot process of this CD. This lists the Gentoo-specific options, along -with a few options that are built-in to the kernel, but that have been proven -very useful to our users. Also, all options that start with "do" have a "no" -inverse, that does the opposite. For example, "doscsi" enables SCSI support -in the initial ramdisk boot, while "noscsi" disables it. - -Hardware options: - -acpi=on This loads support for ACPI and also causes the acpid daemon to - be started by the CD on boot. This is only needed if your - system requires ACPI to function properly. This is not required - for Hyperthreading support. -acpi=off Completely disables ACPI. This is useful on some older systems, - and is also a requirement for using APM. This will disable any - Hyperthreading support of your processor. -console=X This sets up serial console access for the CD. The first - option is the device, usually ttyS0 on x86, followed by any - connection options, which are comma separated. The default - options are 9600,8,n,1. -dmraid=X This allows for passing options to the device-mapper RAID - subsystem. Options should be encapsulated in quotes. -doapm This loads APM driver support. This requires you to also use - acpi=off. -dobladecenter This adds some extra pauses into the boot process for the slow - USB CDROM of the IBM BladeCenter. -dopcmcia This loads support for PCMCIA and Cardbus hardware and also - causes the pcmcia cardmgr to be started by the CD on boot. - This is only required when booting from a PCMCIA/Cardbus device. -doscsi This loads support for most SCSI controllers. This is also a - requirement for booting most USB devices, as they use the SCSI - subsystem of the kernel. -hda=stroke This allows you to partition the whole hard disk even when your - BIOS is unable to handle large disks. This option is only used - on machines with an older BIOS. Replace hda with the device - that is requiring this option. -ide=nodma This forces the disabling of DMA in the kernel and is required - by some IDE chipsets and also by some CDROM drives. If your - system is having trouble reading from your IDE CDROM, try this - option. This also disables the default hdparm settings from - being executed. -noapic This disables the Advanced Programmable Interrupt Controller - that is present on newer motherboards. It has been known to - cause some problems on older hardware. -nodetect This disables all of the autodetection done by the CD, including - device autodetection and DHCP probing. This is useful for doing - debugging of a failing CD or driver. -nodhcp This disables DHCP probing on detected network cards. This is - useful on networks with only static addresses. -nodmraid Disables support for device-mapper RAID, such as that used for - on-board IDE/SATA RAID controllers. -nofirewire This disables the loading of Firewire modules. This should only - be necessary if your Firewire hardware is causing a problem with - booting the CD. -nogpm This diables gpm console mouse support. -nohotplug This disables the loading of the hotplug and coldplug init - scripts at boot. This is useful for doing debugging of a - failing CD or driver. -nokeymap This disables the keymap selection used to select non-US - keyboard layouts. -nolapic This disables the local APIC on Uniprocessor kernels. -nosata This disables the loading of Serial ATA modules. This is useful - if your system is having problems with the SATA subsystem. -nosmp This disables SMP, or Symmetric Multiprocessing, on SMP-enabled - kernels. This is useful for debugging SMP-related issues with - certain drivers and motherboards. -nosound This disables sound support and volume setting. This is useful - for systems where sound support causes problems. -nousb This disables the autoloading of USB modules. This is useful - for debugging USB issues. - -Volume/Device Management: - -dodevfs This enables the deprecated device filesystem on 2.6 systems. - You will also need to use noudev for this to take effect. - Since devfs is the only option with a 2.4 kernel, this option - has no effect if booting a 2.4 kernel. -doevms2 This enables support for IBM's pluggable EVMS, or Enterprise - Volume Management System. This is not safe to use with lvm2. -dolvm2 This enables support for Linux's Logical Volume Management. - This is not safe to use with evms2. -noudev This disables udev support on 2.6 kernels. This option requires - that dodevfs is used. Since udev is not an option for 2.4 - kernels, this options has no effect if booting a 2.4 kernel. -unionfs Enables support for Unionfs on supported CD images. This will - create a writable Unionfs overlay in a tmpfs, allowing you to - change any file on the CD. -unionfs=X Enables support for Unionfs on supported CD images. This will - create a writable Unionfs overlay on the device you specify. - The device must be formatted with a filesystem recognized and - writable by the kernel. - -Other options: - -debug Enables debugging code. This might get messy, as it displays - a lot of data to the screen. -docache This caches the entire runtime portion of the CD into RAM, which - allows you to umount /mnt/cdrom and mount another CDROM. This - option requires that you have at least twice as much available - RAM as the size of the CD. -doload=X This causes the initial ramdisk to load any module listed, as - well as dependencies. Replace X with the module name. Multiple - modules can be specified by a comma-separated list. -noload=X This causes the initial ramdisk to skip the loading of a - specific module that may be causing a problem. Syntax matches - that of doload. -nox This causes an X-enabled LiveCD to not automatically start X, - but rather, to drop to the command line instead. -scandelay This causes the CD to pause for 10 seconds during certain - portions the boot process to allow for devices that are slow to - initialize to be ready for use. -scandelay=X This allows you to specify a given delay, in seconds, to be - added to certain portions of the boot process to allow for - devices that are slow to initialize to be ready for use. - Replace X with the number of seconds to pause. - diff --git a/src/catalyst/livecd/files/gamecd.motd.txt b/src/catalyst/livecd/files/gamecd.motd.txt deleted file mode 100644 index 498490e978..0000000000 --- a/src/catalyst/livecd/files/gamecd.motd.txt +++ /dev/null @@ -1,8 +0,0 @@ - -To (re)start ##GAME_NAME, please type "startx" at the prompt below. - -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include -detailed information about how to reproduce the bug you are reporting. - -Thank you for using Gentoo Linux! - diff --git a/src/catalyst/livecd/files/generic.motd.txt b/src/catalyst/livecd/files/generic.motd.txt deleted file mode 100644 index fb931d6c78..0000000000 --- a/src/catalyst/livecd/files/generic.motd.txt +++ /dev/null @@ -1,9 +0,0 @@ -##GREETING - -The root password on this system has been auto-scrambled for security. - -If any ethernet adapters were detected at boot, they should be auto-configured -if DHCP is available on your network. Type "net-setup eth0" to specify eth0 IP -address settings by hand. - -Check /etc/kernels/kernel-config-* for kernel configuration(s). diff --git a/src/catalyst/livecd/files/livecd-bash_profile b/src/catalyst/livecd/files/livecd-bash_profile deleted file mode 100644 index cebe8ca2cf..0000000000 --- a/src/catalyst/livecd/files/livecd-bash_profile +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -#This file is sourced by bash when you log in interactively. -[[ -f ~/.bashrc ]] && source ~/.bashrc diff --git a/src/catalyst/livecd/files/livecd-bashrc b/src/catalyst/livecd/files/livecd-bashrc deleted file mode 100644 index 983e657d13..0000000000 --- a/src/catalyst/livecd/files/livecd-bashrc +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -if [ ! "$(grep nox /proc/cmdline)" ] -then - if [ -x /usr/bin/X ] - then - if [ -e /etc/startx ] - then - rm -f /etc/startx - ##STARTX - [ -f /etc/motd ] && cat /etc/motd - fi - fi -fi diff --git a/src/catalyst/livecd/files/livecd-local.start b/src/catalyst/livecd/files/livecd-local.start deleted file mode 100644 index d4d7fe55e8..0000000000 --- a/src/catalyst/livecd/files/livecd-local.start +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# /etc/conf.d/local.start - -# This is a good place to load any misc. -# programs on startup ( 1>&2 ) - -if [ -d /usr/livecd/gconf ] -then - ln -sf /usr/livecd/gconf /etc/gconf -fi - -if [ -d /usr/livecd/db ] -then - ln -sf /usr/livecd/db /var/db -fi - -if [ -d /usr/livecd/profiles ] -then - ln -sf /usr/livecd/profiles /usr/portage/profiles -fi - -if [ -d /usr/livecd/eclass ] -then - ln -sf /usr/livecd/eclass /usr/portage/eclass -fi diff --git a/src/catalyst/livecd/files/livecd.motd.txt b/src/catalyst/livecd/files/livecd.motd.txt deleted file mode 100644 index 0fb391e27e..0000000000 --- a/src/catalyst/livecd/files/livecd.motd.txt +++ /dev/null @@ -1,10 +0,0 @@ -To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below. -There is also a rescue session for X using twm if you simply use "startx". - -You can start the installer by typing "installer" at the prompt below. - -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include -detailed information about how to reproduce the bug you are reporting. - -Thank you for using Gentoo Linux! - diff --git a/src/catalyst/livecd/files/minimal.motd.txt b/src/catalyst/livecd/files/minimal.motd.txt deleted file mode 100644 index 1f702fcf3d..0000000000 --- a/src/catalyst/livecd/files/minimal.motd.txt +++ /dev/null @@ -1,11 +0,0 @@ -The latest version of the Handbook is always available from the Gentoo web -site by typing "links http://www.gentoo.org/doc/en/handbook/handbook.xml". - -To start an ssh server on this system, type "/etc/init.d/sshd start". If you -need to log in remotely as root, type "passwd root" to reset root's password -to a known value. - -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include -detailed information about how to reproduce the bug you are reporting. -Thank you for using Gentoo Linux! - diff --git a/src/catalyst/livecd/files/universal.motd.txt b/src/catalyst/livecd/files/universal.motd.txt deleted file mode 100644 index 403b872987..0000000000 --- a/src/catalyst/livecd/files/universal.motd.txt +++ /dev/null @@ -1,5 +0,0 @@ - -Stage tarball(s), distfiles and packages can be found in /mnt/cdrom/. - -You can view the networkless installation instructions for this release by -typing "links /mnt/cdrom/docs/handbook/html". diff --git a/src/catalyst/livecd/files/x86-F2.msg b/src/catalyst/livecd/files/x86-F2.msg deleted file mode 100644 index eb1638b831..0000000000 --- a/src/catalyst/livecd/files/x86-F2.msg +++ /dev/null @@ -1,22 +0,0 @@ -Gentoo Linux LiveCD boot options - [F1 to display available kernels] - -Please hit F1 to see the available kernels on this livecd. Please note that -the -nofb counterparts to each kernel disable the framebuffer -and splash images. Additionally, the memtest86 boot option is available -to test local RAM for errors. To use memtest86, just type 'memtest86'. - -This lists the possible command line options that can be used to tweak the boot -process of this CD. This lists the Gentoo-specific options, along with a few -options that are built-in to the kernel, but that have been proven very useful -to our users. Also, all options that start with "do" have a "no" inverse, that -does the opposite. For example, "doscsi" enables SCSI support in the initial -ramdisk boot, while "noscsi" disables it. - -To list the options, please press keys from F3 through F7. - -F3: Hardware (Page 1) -F4: Hardware (Page 2) -F5: Hardware (Page 3) -F6: Volume Management -F7: Misc. - diff --git a/src/catalyst/livecd/files/x86-F3.msg b/src/catalyst/livecd/files/x86-F3.msg deleted file mode 100644 index 50594ce0a9..0000000000 --- a/src/catalyst/livecd/files/x86-F3.msg +++ /dev/null @@ -1,21 +0,0 @@ -Hardware options (Page 1): -acpi=on This loads support for ACPI and also causes the acpid daemon to - be started by the CD on boot. This is only needed if your - system requires ACPI to function properly. This is not - required for Hyperthreading support. -acpi=off Completely disables ACPI. This is useful on some older systems - and is also a requirement for using APM. This will disable any - Hyperthreading support of your processor. -console=X This sets up serial console access for the CD. The first - option is the device, usually ttyS0 on x86, followed by any - connection options, which are comma separated. The default - options are 9600,8,n,1. -dmraid=X This allows for passing options to the device-mapper RAID - subsystem. Options should be encapsulated in quotes. -doapm This loads APM driver support. This requires you to also use - acpi=off. -dobladecenter This adds some extra pauses into the boot process for the slow - USB CDROM of the IBM BladeCenter. -dopcmcia This loads support for PCMCIA and Cardbus hardware and also - causes the pcmcia cardmgr to be started by the CD on boot. - This is only required when booting from PCMCIA/Cardbus devices. diff --git a/src/catalyst/livecd/files/x86-F4.msg b/src/catalyst/livecd/files/x86-F4.msg deleted file mode 100644 index ae18c853de..0000000000 --- a/src/catalyst/livecd/files/x86-F4.msg +++ /dev/null @@ -1,23 +0,0 @@ -Hardware options (Page 2): -doscsi This loads support for most SCSI controllers. This is also a - requirement for booting most USB devices, as they use the SCSI - subsystem of the kernel. -hda=stroke This allows you to partition the whole hard disk even when your - BIOS is unable to handle large disks. This option is only used - on machines with an older BIOS. Replace hda with the device - that is requiring this option. -ide=nodma This forces the disabling of DMA in the kernel and is required - by some IDE chipsets and also by some CDROM drives. If your - system is having trouble reading from your IDE CDROM, try this - option. This also disables the default hdparm settings from - being executed. -noapic This disables the Advanced Programmable Interrupt Controller - that is present on newer motherboards. It has been known to - cause some problems on older hardware. -nodetect This disables all of the autodetection done by the CD, - including device autodetection and DHCP probing. This is - useful for doing debugging of a failing CD or driver. -nodhcp This disables DHCP probing on detected network cards. This is - useful on networks with only static addresses. -nodmraid Disables support for device-mapper RAID, such as that used for - on-board IDE/SATA RAID controllers. diff --git a/src/catalyst/livecd/files/x86-F5.msg b/src/catalyst/livecd/files/x86-F5.msg deleted file mode 100644 index 5e54850e49..0000000000 --- a/src/catalyst/livecd/files/x86-F5.msg +++ /dev/null @@ -1,20 +0,0 @@ -Hardware options (Page 3): -nofirewire This disables the loading of Firewire modules. This should - only be necessary if your Firewire hardware is causing - a problem with booting the CD. -nogpm This diables gpm console mouse support. -nohotplug This disables the loading of the hotplug and coldplug init - scripts at boot. This is useful for doing debugging of a - failing CD or driver. -nokeymap This disables the keymap selection used to select non-US - keyboard layouts. -nolapic This disables the local APIC on Uniprocessor kernels. -nosata This disables the loading of Serial ATA modules. This is used - if your system is having problems with the SATA subsystem. -nosmp This disables SMP, or Symmetric Multiprocessing, on SMP-enabled - kernels. This is useful for debugging SMP-related issues with - certain drivers and motherboards. -nosound This disables sound support and volume setting. This is useful - for systems where sound support causes problems. -nousb This disables the autoloading of USB modules. This is useful - for debugging USB issues. diff --git a/src/catalyst/livecd/files/x86-F6.msg b/src/catalyst/livecd/files/x86-F6.msg deleted file mode 100644 index c9f7722434..0000000000 --- a/src/catalyst/livecd/files/x86-F6.msg +++ /dev/null @@ -1,19 +0,0 @@ -Volume/Device Management: -dodevfs This enables the deprecated device filesystem on 2.6 systems. - You will also need to use noudev for this to take effect. - Since devfs is the only option with a 2.4 kernel, this option - has no effect if booting a 2.4 kernel. -doevms2 This enables support for IBM's pluggable EVMS, or Enterprise - Volume Management System. This is not safe to use with lvm2. -dolvm2 This enables support for Linux's Logical Volume Management. - This is not safe to use with evms2. -noudev This disables udev support on 2.6 kernels. This option - requires that dodevfs is used. Since udev is not an option for - 2.4 kernels, this options has no effect if booting 2.4 kernels. -unionfs Enables support for Unionfs on supported CD images. This will - create a writable Unionfs overlay in a tmpfs, allowing you to - change any file on the CD. -unionfs=X Enables support for Unionfs on supported CD images. This will - create a writable Unionfs overlay on the device you specify. - The device must be formatted with a filesystem recognized and - writable by the kernel. diff --git a/src/catalyst/livecd/files/x86-F7.msg b/src/catalyst/livecd/files/x86-F7.msg deleted file mode 100644 index 82306245ae..0000000000 --- a/src/catalyst/livecd/files/x86-F7.msg +++ /dev/null @@ -1,22 +0,0 @@ -Other options: -debug Enables debugging code. This might get messy, as it displays - a lot of data to the screen. -docache This caches the entire runtime portion of the CD into RAM, - which allows you to umount /mnt/cdrom and mount another CDROM. - This option requires that you have at least twice as much - available RAM as the size of the CD. -doload=X This causes the initial ramdisk to load any module listed, as - well as dependencies. Replace X with the module name. - Multiple modules can be specified by a comma-separated list. -noload=X This causes the initial ramdisk to skip the loading of a - specific module that may be causing a problem. Syntax matches - that of doload. -nox This causes an X-enabled LiveCD to not automatically start X, - but rather, to drop to the command line instead. -scandelay This causes the CD to pause for 10 seconds during certain - portions the boot process to allow for devices that are slow to - initialize to be ready for use. -scandelay=X This allows you to specify a given delay, in seconds, to be - added to certain portions of the boot process to allow for - devices that are slow to initialize to be ready for use. - Replace X with the number of seconds to pause. diff --git a/src/catalyst/modules/builder.py b/src/catalyst/modules/builder.py deleted file mode 100644 index 20d0a27ff1..0000000000 --- a/src/catalyst/modules/builder.py +++ /dev/null @@ -1,16 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/builder.py,v 1.9 2006/10/02 20:41:53 wolf31o2 Exp $ - -class generic: - def __init__(self,myspec): - self.settings=myspec - def mount_safety_check(self): - """make sure that no bind mounts exist in chrootdir (to use before - cleaning the directory, to make sure we don't wipe the contents of - a bind mount""" - pass - def mount_all(self): - """do all bind mounts""" - pass - def umount_all(self): - """unmount all bind mounts""" - pass diff --git a/src/catalyst/modules/catalyst_lock.py b/src/catalyst/modules/catalyst_lock.py deleted file mode 100644 index dac77ca0e3..0000000000 --- a/src/catalyst/modules/catalyst_lock.py +++ /dev/null @@ -1,466 +0,0 @@ -#!/usr/bin/python -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_lock.py,v 1.9 2006/10/02 20:41:53 wolf31o2 Exp $ -import os -import fcntl -import errno -import sys -import string -import time -from catalyst_support import * - -def writemsg(mystr): - sys.stderr.write(mystr) - sys.stderr.flush() - -class LockDir: - locking_method=fcntl.flock - lock_dirs_in_use=[] - die_on_faile_lock=True - def __del__(self): - self.clean_my_hardlocks() - self.delete_lock_from_path_list() - if self.islocked(): - self.fcntl_unlock() - def __init__(self,lockdir): - self.locked=False - self.myfd=None - self.set_gid(250) - self.locking_method=LockDir.locking_method - self.set_lockdir(lockdir) - self.set_lockfilename(".catalyst_lock") - self.set_lockfile() - - if LockDir.lock_dirs_in_use.count(lockdir)>0: - raise "This directory already associated with a lock object" - else: - LockDir.lock_dirs_in_use.append(lockdir) - - self.hardlock_paths={} - - - - def delete_lock_from_path_list(self): - i=0 - try: - if LockDir.lock_dirs_in_use: - for x in LockDir.lock_dirs_in_use: - if LockDir.lock_dirs_in_use[i] == self.lockdir: - del LockDir.lock_dirs_in_use[i] - break - i=i+1 - except AttributeError: - pass - - def islocked(self): - if self.locked: - return True - else: - return False - - def set_gid(self,gid): - if not self.islocked(): - #print "setting gid to", gid - self.gid=gid - - def set_lockdir(self,lockdir): - if not os.path.exists(lockdir): - os.makedirs(lockdir) - if os.path.isdir(lockdir): - if not self.islocked(): - if lockdir[-1] == "/": - lockdir=lockdir[:-1] - self.lockdir=normpath(lockdir) - #print "setting lockdir to", self.lockdir - else: - raise "the lock object needs a path to a dir" - - def set_lockfilename(self,lockfilename): - if not self.islocked(): - self.lockfilename=lockfilename - #print "setting lockfilename to", self.lockfilename - - def set_lockfile(self): - if not self.islocked(): - self.lockfile=normpath(self.lockdir+'/'+self.lockfilename) - #print "setting lockfile to", self.lockfile - - def read_lock(self): - if not self.locking_method == "HARDLOCK": - self.fcntl_lock("read") - else: - print "HARDLOCKING doesnt support shared-read locks" - print "using exclusive write locks" - self.hard_lock() - - def write_lock(self): - if not self.locking_method == "HARDLOCK": - self.fcntl_lock("write") - else: - self.hard_lock() - - def unlock(self): - if not self.locking_method == "HARDLOCK": - self.fcntl_unlock() - else: - self.hard_unlock() - - def fcntl_lock(self,locktype): - if self.myfd==None: - if not os.path.exists(os.path.dirname(self.lockdir)): - raise DirectoryNotFound, os.path.dirname(self.lockdir) - if not os.path.exists(self.lockfile): - old_mask=os.umask(000) - self.myfd = os.open(self.lockfile, os.O_CREAT|os.O_RDWR,0660) - try: - if os.stat(self.lockfile).st_gid != self.gid: - os.chown(self.lockfile,os.getuid(),self.gid) - except SystemExit, e: - raise - except OSError, e: - if e[0] == 2: #XXX: No such file or directory - return self.fcntl_locking(locktype) - else: - writemsg("Cannot chown a lockfile. This could cause inconvenience later.\n") - - os.umask(old_mask) - else: - self.myfd = os.open(self.lockfile, os.O_CREAT|os.O_RDWR,0660) - - try: - if locktype == "read": - self.locking_method(self.myfd,fcntl.LOCK_SH|fcntl.LOCK_NB) - else: - self.locking_method(self.myfd,fcntl.LOCK_EX|fcntl.LOCK_NB) - except IOError, e: - if "errno" not in dir(e): - raise - if e.errno == errno.EAGAIN: - if not LockDir.die_on_failed_lock: - # resource temp unavailable; eg, someone beat us to the lock. - writemsg("waiting for lock on %s\n" % self.lockfile) - - # try for the exclusive or shared lock again. - if locktype == "read": - self.locking_method(self.myfd,fcntl.LOCK_SH) - else: - self.locking_method(self.myfd,fcntl.LOCK_EX) - else: - raise LockInUse,self.lockfile - elif e.errno == errno.ENOLCK: - pass - else: - raise - if not os.path.exists(self.lockfile): - os.close(self.myfd) - self.myfd=None - #writemsg("lockfile recurse\n") - self.fcntl_lock(locktype) - else: - self.locked=True - #writemsg("Lockfile obtained\n") - - - def fcntl_unlock(self): - import fcntl - unlinkfile = 1 - if not os.path.exists(self.lockfile): - print "lockfile does not exist '%s'" % self.lockfile - if (self.myfd != None): - try: - os.close(myfd) - self.myfd=None - except: - pass - return False - - try: - if self.myfd == None: - self.myfd = os.open(self.lockfile, os.O_WRONLY,0660) - unlinkfile = 1 - self.locking_method(self.myfd,fcntl.LOCK_UN) - except SystemExit, e: - raise - except Exception, e: - os.close(self.myfd) - self.myfd=None - raise IOError, "Failed to unlock file '%s'\n" % self.lockfile - try: - # This sleep call was added to allow other processes that are - # waiting for a lock to be able to grab it before it is deleted. - # lockfile() already accounts for this situation, however, and - # the sleep here adds more time than is saved overall, so am - # commenting until it is proved necessary. - #time.sleep(0.0001) - if unlinkfile: - InUse=False - try: - self.locking_method(self.myfd,fcntl.LOCK_EX|fcntl.LOCK_NB) - except: - print "Read lock may be in effect. skipping lockfile delete..." - InUse=True - ### We won the lock, so there isn't competition for it. - ### We can safely delete the file. - ###writemsg("Got the lockfile...\n") - ###writemsg("Unlinking...\n") - self.locking_method(self.myfd,fcntl.LOCK_UN) - if not InUse: - os.unlink(self.lockfile) - os.close(self.myfd) - self.myfd=None - #print "Unlinked lockfile..." - except SystemExit, e: - raise - except Exception, e: - # We really don't care... Someone else has the lock. - # So it is their problem now. - print "Failed to get lock... someone took it." - print str(e) - - # why test lockfilename? because we may have been handed an - # fd originally, and the caller might not like having their - # open fd closed automatically on them. - #if type(lockfilename) == types.StringType: - # os.close(myfd) - - if (self.myfd != None): - os.close(self.myfd) - self.myfd=None - self.locked=False - time.sleep(.0001) - - def hard_lock(self,max_wait=14400): - """Does the NFS, hardlink shuffle to ensure locking on the disk. - We create a PRIVATE lockfile, that is just a placeholder on the disk. - Then we HARDLINK the real lockfile to that private file. - If our file can 2 references, then we have the lock. :) - Otherwise we lather, rise, and repeat. - We default to a 4 hour timeout. - """ - - self.myhardlock = self.hardlock_name(self.lockdir) - - start_time = time.time() - reported_waiting = False - - while(time.time() < (start_time + max_wait)): - # We only need it to exist. - self.myfd = os.open(self.myhardlock, os.O_CREAT|os.O_RDWR,0660) - os.close(self.myfd) - - self.add_hardlock_file_to_cleanup() - if not os.path.exists(self.myhardlock): - raise FileNotFound, "Created lockfile is missing: %(filename)s" % {"filename":self.myhardlock} - try: - res = os.link(self.myhardlock, self.lockfile) - except SystemExit, e: - raise - except Exception, e: - #print "lockfile(): Hardlink: Link failed." - #print "Exception: ",e - pass - - if self.hardlink_is_mine(self.myhardlock, self.lockfile): - # We have the lock. - if reported_waiting: - print - return True - - if reported_waiting: - writemsg(".") - else: - reported_waiting = True - print - print "Waiting on (hardlink) lockfile: (one '.' per 3 seconds)" - print "Lockfile: " + self.lockfile - time.sleep(3) - - os.unlink(self.myhardlock) - return False - - def hard_unlock(self): - try: - if os.path.exists(self.myhardlock): - os.unlink(self.myhardlock) - if os.path.exists(self.lockfile): - os.unlink(self.lockfile) - except SystemExit, e: - raise - except: - writemsg("Something strange happened to our hardlink locks.\n") - - def add_hardlock_file_to_cleanup(self): - #mypath = self.normpath(path) - if os.path.isdir(self.lockdir) and os.path.isfile(self.myhardlock): - self.hardlock_paths[self.lockdir]=self.myhardlock - - def remove_hardlock_file_from_cleanup(self): - if self.hardlock_paths.has_key(self.lockdir): - del self.hardlock_paths[self.lockdir] - print self.hardlock_paths - - def hardlock_name(self, path): - mypath=path+"/.hardlock-"+os.uname()[1]+"-"+str(os.getpid()) - newpath = os.path.normpath(mypath) - if len(newpath) > 1: - if newpath[1] == "/": - newpath = "/"+newpath.lstrip("/") - return newpath - - - def hardlink_is_mine(self,link,lock): - import stat - try: - myhls = os.stat(link) - mylfs = os.stat(lock) - except SystemExit, e: - raise - except: - myhls = None - mylfs = None - - if myhls: - if myhls[stat.ST_NLINK] == 2: - return True - if mylfs: - if mylfs[stat.ST_INO] == myhls[stat.ST_INO]: - return True - return False - - def hardlink_active(lock): - if not os.path.exists(lock): - return False - - def clean_my_hardlocks(self): - try: - for x in self.hardlock_paths.keys(): - self.hardlock_cleanup(x) - except AttributeError: - pass - - def hardlock_cleanup(self,path): - mypid = str(os.getpid()) - myhost = os.uname()[1] - mydl = os.listdir(path) - results = [] - mycount = 0 - - mylist = {} - for x in mydl: - filepath=path+"/"+x - if os.path.isfile(filepath): - parts = filepath.split(".hardlock-") - if len(parts) == 2: - filename = parts[0] - hostpid = parts[1].split("-") - host = "-".join(hostpid[:-1]) - pid = hostpid[-1] - if not mylist.has_key(filename): - mylist[filename] = {} - - if not mylist[filename].has_key(host): - mylist[filename][host] = [] - mylist[filename][host].append(pid) - mycount += 1 - else: - mylist[filename][host].append(pid) - mycount += 1 - - - results.append("Found %(count)s locks" % {"count":mycount}) - for x in mylist.keys(): - if mylist[x].has_key(myhost): - mylockname = self.hardlock_name(x) - if self.hardlink_is_mine(mylockname, self.lockfile) or \ - not os.path.exists(self.lockfile): - for y in mylist[x].keys(): - for z in mylist[x][y]: - filename = x+".hardlock-"+y+"-"+z - if filename == mylockname: - self.hard_unlock() - continue - try: - # We're sweeping through, unlinking everyone's locks. - os.unlink(filename) - results.append("Unlinked: " + filename) - except SystemExit, e: - raise - except Exception,e: - pass - try: - os.unlink(x) - results.append("Unlinked: " + x) - os.unlink(mylockname) - results.append("Unlinked: " + mylockname) - except SystemExit, e: - raise - except Exception,e: - pass - else: - try: - os.unlink(mylockname) - results.append("Unlinked: " + mylockname) - except SystemExit, e: - raise - except Exception,e: - pass - return results - - -if __name__ == "__main__": - - def lock_work(): - print - for i in range(1,6): - print i,time.time() - time.sleep(1) - print - def normpath(mypath): - newpath = os.path.normpath(mypath) - if len(newpath) > 1: - if newpath[1] == "/": - newpath = "/"+newpath.lstrip("/") - return newpath - - print "Lock 5 starting" - import time - Lock1=LockDir("/tmp/lock_path") - Lock1.write_lock() - print "Lock1 write lock" - - lock_work() - - Lock1.unlock() - print "Lock1 unlock" - - Lock1.read_lock() - print "Lock1 read lock" - - lock_work() - - Lock1.unlock() - print "Lock1 unlock" - - Lock1.read_lock() - print "Lock1 read lock" - - Lock1.write_lock() - print "Lock1 write lock" - - lock_work() - - Lock1.unlock() - print "Lock1 unlock" - - Lock1.read_lock() - print "Lock1 read lock" - - lock_work() - - Lock1.unlock() - print "Lock1 unlock" -#Lock1.write_lock() -#time.sleep(2) -#Lock1.unlock() - ##Lock1.write_lock() - #time.sleep(2) - #Lock1.unlock() diff --git a/src/catalyst/modules/catalyst_support.py b/src/catalyst/modules/catalyst_support.py deleted file mode 100644 index bcc5dd6b3f..0000000000 --- a/src/catalyst/modules/catalyst_support.py +++ /dev/null @@ -1,734 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_support.py,v 1.76 2006/10/02 20:41:53 wolf31o2 Exp $ - -import sys,string,os,types,re,signal,traceback,time -#import md5,sha -selinux_capable = False -#userpriv_capable = (os.getuid() == 0) -#fakeroot_capable = False -BASH_BINARY = "/bin/bash" - -try: - import resource - max_fd_limit=resource.getrlimit(RLIMIT_NOFILE) -except SystemExit, e: - raise -except: - # hokay, no resource module. - max_fd_limit=256 - -# pids this process knows of. -spawned_pids = [] - -try: - import urllib -except SystemExit, e: - raise - -def cleanup(pids,block_exceptions=True): - """function to go through and reap the list of pids passed to it""" - global spawned_pids - if type(pids) == int: - pids = [pids] - for x in pids: - try: - os.kill(x,signal.SIGTERM) - if os.waitpid(x,os.WNOHANG)[1] == 0: - # feisty bugger, still alive. - os.kill(x,signal.SIGKILL) - os.waitpid(x,0) - - except OSError, oe: - if block_exceptions: - pass - if oe.errno not in (10,3): - raise oe - except SystemExit: - raise - except Exception: - if block_exceptions: - pass - try: spawned_pids.remove(x) - except IndexError: pass - - - -# a function to turn a string of non-printable characters into a string of -# hex characters -def hexify(str): - hexStr = string.hexdigits - r = '' - for ch in str: - i = ord(ch) - r = r + hexStr[(i >> 4) & 0xF] + hexStr[i & 0xF] - return r -# hexify() - -def generate_hash(file,hash_function="crc32",verbose=False): - try: - return hash_map[hash_function][0](file,hash_map[hash_function][1],hash_map[hash_function][2],\ - hash_map[hash_function][3],verbose) - except: - raise CatalystError,"Error generating hash, is appropriate utility installed on your system?" - -def calc_hash(file,cmd,cmd_args,id_string="MD5",verbose=False): - a=os.popen(cmd+" "+cmd_args+" "+file) - mylines=a.readlines() - a.close() - mylines=mylines[0].split() - result=mylines[0] - if verbose: - print id_string+" (%s) = %s" % (file, result) - return result - -def calc_hash2(file,cmd,cmd_args,id_string="MD5",verbose=False): - a=os.popen(cmd+" "+cmd_args+" "+file) - header=a.readline() - mylines=a.readline().split() - hash=mylines[0] - short_file=os.path.split(mylines[1])[1] - a.close() - result=header+hash+" "+short_file+"\n" - if verbose: - print header+" (%s) = %s" % (short_file, result) - return result - -#This has map must be defined after the function calc_hash -#It is possible to call different functions from this but they must be defined before hash_map -# Key,function,cmd,cmd_args,Print string -hash_map={ - "adler32":[calc_hash2,"shash","-a ADLER32","ADLER32"],\ - "crc32":[calc_hash2,"shash","-a CRC32","CRC32"],\ - "crc32b":[calc_hash2,"shash","-a CRC32B","CRC32B"],\ - "gost":[calc_hash2,"shash","-a GOST","GOST"],\ - "haval128":[calc_hash2,"shash","-a HAVAL128","HAVAL128"],\ - "haval160":[calc_hash2,"shash","-a HAVAL160","HAVAL160"],\ - "haval192":[calc_hash2,"shash","-a HAVAL192","HAVAL192"],\ - "haval224":[calc_hash2,"shash","-a HAVAL224","HAVAL224"],\ - "haval256":[calc_hash2,"shash","-a HAVAL256","HAVAL256"],\ - "md2":[calc_hash2,"shash","-a MD2","MD2"],\ - "md4":[calc_hash2,"shash","-a MD4","MD4"],\ - "md5":[calc_hash2,"shash","-a MD5","MD5"],\ - "ripemd128":[calc_hash2,"shash","-a RIPEMD128","RIPEMD128"],\ - "ripemd160":[calc_hash2,"shash","-a RIPEMD160","RIPEMD160"],\ - "ripemd256":[calc_hash2,"shash","-a RIPEMD256","RIPEMD256"],\ - "ripemd320":[calc_hash2,"shash","-a RIPEMD320","RIPEMD320"],\ - "sha1":[calc_hash2,"shash","-a SHA1","SHA1"],\ - "sha224":[calc_hash2,"shash","-a SHA224","SHA224"],\ - "sha256":[calc_hash2,"shash","-a SHA256","SHA256"],\ - "sha384":[calc_hash2,"shash","-a SHA384","SHA384"],\ - "sha512":[calc_hash2,"shash","-a SHA512","SHA512"],\ - "snefru128":[calc_hash2,"shash","-a SNEFRU128","SNEFRU128"],\ - "snefru256":[calc_hash2,"shash","-a SNEFRU256","SNEFRU256"],\ - "tiger":[calc_hash2,"shash","-a TIGER","TIGER"],\ - "tiger128":[calc_hash2,"shash","-a TIGER128","TIGER128"],\ - "tiger160":[calc_hash2,"shash","-a TIGER160","TIGER160"],\ - "whirlpool":[calc_hash2,"shash","-a WHIRLPOOL","WHIRLPOOL"],\ - } - -def read_from_clst(file): - line = '' - myline = '' - try: - myf=open(file,"r") - except: - return -1 - #raise CatalystError, "Could not open file "+file - for line in myf.readlines(): - #line = string.replace(line, "\n", "") # drop newline - myline = myline + line - myf.close() - return myline -# read_from_clst - -# these should never be touched -required_build_targets=["generic_target","generic_stage_target"] - -# new build types should be added here -valid_build_targets=["stage1_target","stage2_target","stage3_target","stage4_target","grp_target", - "livecd_stage1_target","livecd_stage2_target","embedded_target", - "tinderbox_target","snapshot_target","netboot_target","netboot2_target"] - -required_config_file_values=["storedir","sharedir","distdir","portdir"] -valid_config_file_values=required_config_file_values[:] -valid_config_file_values.append("PKGCACHE") -valid_config_file_values.append("KERNCACHE") -valid_config_file_values.append("CCACHE") -valid_config_file_values.append("DISTCC") -valid_config_file_values.append("ENVSCRIPT") -valid_config_file_values.append("AUTORESUME") -valid_config_file_values.append("FETCH") -valid_config_file_values.append("CLEAR_AUTORESUME") -valid_config_file_values.append("options") -valid_config_file_values.append("DEBUG") -valid_config_file_values.append("VERBOSE") -valid_config_file_values.append("PURGE") -valid_config_file_values.append("SNAPCACHE") -valid_config_file_values.append("snapshot_cache") -valid_config_file_values.append("hash_function") -valid_config_file_values.append("digests") -valid_config_file_values.append("SEEDCACHE") - -verbosity=1 - -def list_bashify(mylist): - if type(mylist)==types.StringType: - mypack=[mylist] - else: - mypack=mylist[:] - for x in range(0,len(mypack)): - # surround args with quotes for passing to bash, - # allows things like "<" to remain intact - mypack[x]="'"+mypack[x]+"'" - mypack=string.join(mypack) - return mypack - -def list_to_string(mylist): - if type(mylist)==types.StringType: - mypack=[mylist] - else: - mypack=mylist[:] - for x in range(0,len(mypack)): - # surround args with quotes for passing to bash, - # allows things like "<" to remain intact - mypack[x]=mypack[x] - mypack=string.join(mypack) - return mypack - -class CatalystError(Exception): - def __init__(self, message): - if message: - (type,value)=sys.exc_info()[:2] - if value!=None: - print - print traceback.print_exc(file=sys.stdout) - print - print "!!! catalyst: "+message - print - -class LockInUse(Exception): - def __init__(self, message): - if message: - #(type,value)=sys.exc_info()[:2] - #if value!=None: - #print - #kprint traceback.print_exc(file=sys.stdout) - print - print "!!! catalyst lock file in use: "+message - print - -def die(msg=None): - warn(msg) - sys.exit(1) - -def warn(msg): - print "!!! catalyst: "+msg - - -def find_binary(myc): - """look through the environmental path for an executable file named whatever myc is""" - # this sucks. badly. - p=os.getenv("PATH") - if p == None: - return None - for x in p.split(":"): - #if it exists, and is executable - if os.path.exists("%s/%s" % (x,myc)) and os.stat("%s/%s" % (x,myc))[0] & 0x0248: - return "%s/%s" % (x,myc) - return None - - -def spawn_bash(mycommand,env={},debug=False,opt_name=None,**keywords): - """spawn mycommand as an arguement to bash""" - args=[BASH_BINARY] - if not opt_name: - opt_name=mycommand.split()[0] - if not env.has_key("BASH_ENV"): - env["BASH_ENV"] = "/etc/spork/is/not/valid/profile.env" - if debug: - args.append("-x") - args.append("-c") - args.append(mycommand) - return spawn(args,env=env,opt_name=opt_name,**keywords) - -#def spawn_get_output(mycommand,spawn_type=spawn,raw_exit_code=False,emulate_gso=True, \ -# collect_fds=[1],fd_pipes=None,**keywords): -def spawn_get_output(mycommand,raw_exit_code=False,emulate_gso=True, \ - collect_fds=[1],fd_pipes=None,**keywords): - """call spawn, collecting the output to fd's specified in collect_fds list - emulate_gso is a compatability hack to emulate commands.getstatusoutput's return, minus the - requirement it always be a bash call (spawn_type controls the actual spawn call), and minus the - 'lets let log only stdin and let stderr slide by'. - - emulate_gso was deprecated from the day it was added, so convert your code over. - spawn_type is the passed in function to call- typically spawn_bash, spawn, spawn_sandbox, or spawn_fakeroot""" - global selinux_capable - pr,pw=os.pipe() - - #if type(spawn_type) not in [types.FunctionType, types.MethodType]: - # s="spawn_type must be passed a function, not",type(spawn_type),spawn_type - # raise Exception,s - - if fd_pipes==None: - fd_pipes={} - fd_pipes[0] = 0 - - for x in collect_fds: - fd_pipes[x] = pw - keywords["returnpid"]=True - - mypid=spawn_bash(mycommand,fd_pipes=fd_pipes,**keywords) - os.close(pw) - if type(mypid) != types.ListType: - os.close(pr) - return [mypid, "%s: No such file or directory" % mycommand.split()[0]] - - fd=os.fdopen(pr,"r") - mydata=fd.readlines() - fd.close() - if emulate_gso: - mydata=string.join(mydata) - if len(mydata) and mydata[-1] == "\n": - mydata=mydata[:-1] - retval=os.waitpid(mypid[0],0)[1] - cleanup(mypid) - if raw_exit_code: - return [retval,mydata] - retval=process_exit_code(retval) - return [retval, mydata] - - -# base spawn function -def spawn(mycommand,env={},raw_exit_code=False,opt_name=None,fd_pipes=None,returnpid=False,\ - uid=None,gid=None,groups=None,umask=None,logfile=None,path_lookup=True,\ - selinux_context=None, raise_signals=False, func_call=False): - """base fork/execve function. - mycommand is the desired command- if you need a command to execute in a bash/sandbox/fakeroot - environment, use the appropriate spawn call. This is a straight fork/exec code path. - Can either have a tuple, or a string passed in. If uid/gid/groups/umask specified, it changes - the forked process to said value. If path_lookup is on, a non-absolute command will be converted - to an absolute command, otherwise it returns None. - - selinux_context is the desired context, dependant on selinux being available. - opt_name controls the name the processor goes by. - fd_pipes controls which file descriptor numbers are left open in the forked process- it's a dict of - current fd's raw fd #, desired #. - - func_call is a boolean for specifying to execute a python function- use spawn_func instead. - raise_signals is questionable. Basically throw an exception if signal'd. No exception is thrown - if raw_input is on. - - logfile overloads the specified fd's to write to a tee process which logs to logfile - returnpid returns the relevant pids (a list, including the logging process if logfile is on). - - non-returnpid calls to spawn will block till the process has exited, returning the exitcode/signal - raw_exit_code controls whether the actual waitpid result is returned, or intrepretted.""" - - - myc='' - if not func_call: - if type(mycommand)==types.StringType: - mycommand=mycommand.split() - myc = mycommand[0] - if not os.access(myc, os.X_OK): - if not path_lookup: - return None - myc = find_binary(myc) - if myc == None: - return None - mypid=[] - if logfile: - pr,pw=os.pipe() - mypid.extend(spawn(('tee','-i','-a',logfile),returnpid=True,fd_pipes={0:pr,1:1,2:2})) - retval=os.waitpid(mypid[-1],os.WNOHANG)[1] - if retval != 0: - # he's dead jim. - if raw_exit_code: - return retval - return process_exit_code(retval) - - if fd_pipes == None: - fd_pipes={} - fd_pipes[0] = 0 - fd_pipes[1]=pw - fd_pipes[2]=pw - - if not opt_name: - opt_name = mycommand[0] - myargs=[opt_name] - myargs.extend(mycommand[1:]) - global spawned_pids - mypid.append(os.fork()) - if mypid[-1] != 0: - #log the bugger. - spawned_pids.extend(mypid) - - if mypid[-1] == 0: - if func_call: - spawned_pids = [] - - # this may look ugly, but basically it moves file descriptors around to ensure no - # handles that are needed are accidentally closed during the final dup2 calls. - trg_fd=[] - if type(fd_pipes)==types.DictType: - src_fd=[] - k=fd_pipes.keys() - k.sort() - - #build list of which fds will be where, and where they are at currently - for x in k: - trg_fd.append(x) - src_fd.append(fd_pipes[x]) - - # run through said list dup'ing descriptors so that they won't be waxed - # by other dup calls. - for x in range(0,len(trg_fd)): - if trg_fd[x] == src_fd[x]: - continue - if trg_fd[x] in src_fd[x+1:]: - new=os.dup2(trg_fd[x],max(src_fd) + 1) - os.close(trg_fd[x]) - try: - while True: - src_fd[s.index(trg_fd[x])]=new - except SystemExit, e: - raise - except: - pass - - # transfer the fds to their final pre-exec position. - for x in range(0,len(trg_fd)): - if trg_fd[x] != src_fd[x]: - os.dup2(src_fd[x], trg_fd[x]) - else: - trg_fd=[0,1,2] - - # wax all open descriptors that weren't requested be left open. - for x in range(0,max_fd_limit): - if x not in trg_fd: - try: - os.close(x) - except SystemExit, e: - raise - except: - pass - - # note this order must be preserved- can't change gid/groups if you change uid first. - if selinux_capable and selinux_context: - import selinux - selinux.setexec(selinux_context) - if gid: - os.setgid(gid) - if groups: - os.setgroups(groups) - if uid: - os.setuid(uid) - if umask: - os.umask(umask) - - try: - #print "execing", myc, myargs - if func_call: - # either use a passed in func for interpretting the results, or return if no exception. - # note the passed in list, and dict are expanded. - if len(mycommand) == 4: - os._exit(mycommand[3](mycommand[0](*mycommand[1],**mycommand[2]))) - try: - mycommand[0](*mycommand[1],**mycommand[2]) - except Exception,e: - print "caught exception",e," in forked func",mycommand[0] - sys.exit(0) - - #os.execvp(myc,myargs) - os.execve(myc,myargs,env) - except SystemExit, e: - raise - except Exception, e: - if not func_call: - raise str(e)+":\n "+myc+" "+string.join(myargs) - print "func call failed" - - # If the execve fails, we need to report it, and exit - # *carefully* --- report error here - os._exit(1) - sys.exit(1) - return # should never get reached - - # if we were logging, kill the pipes. - if logfile: - os.close(pr) - os.close(pw) - - if returnpid: - return mypid - - # loop through pids (typically one, unless logging), either waiting on their death, or waxing them - # if the main pid (mycommand) returned badly. - while len(mypid): - retval=os.waitpid(mypid[-1],0)[1] - if retval != 0: - cleanup(mypid[0:-1],block_exceptions=False) - # at this point we've killed all other kid pids generated via this call. - # return now. - if raw_exit_code: - return retval - return process_exit_code(retval,throw_signals=raise_signals) - else: - mypid.pop(-1) - cleanup(mypid) - return 0 - -def cmd(mycmd,myexc="",env={}): - try: - sys.stdout.flush() - retval=spawn_bash(mycmd,env) - if retval != 0: - raise CatalystError,myexc - except: - raise - -def process_exit_code(retval,throw_signals=False): - """process a waitpid returned exit code, returning exit code if it exit'd, or the - signal if it died from signalling - if throw_signals is on, it raises a SystemExit if the process was signaled. - This is intended for usage with threads, although at the moment you can't signal individual - threads in python, only the master thread, so it's a questionable option.""" - if (retval & 0xff)==0: - return retval >> 8 # return exit code - else: - if throw_signals: - #use systemexit, since portage is stupid about exception catching. - raise SystemExit() - return (retval & 0xff) << 8 # interrupted by signal - - -def file_locate(settings,filelist,expand=1): - #if expand=1, non-absolute paths will be accepted and - # expanded to os.getcwd()+"/"+localpath if file exists - for myfile in filelist: - if not settings.has_key(myfile): - #filenames such as cdtar are optional, so we don't assume the variable is defined. - pass - else: - if len(settings[myfile])==0: - raise CatalystError, "File variable \""+myfile+"\" has a length of zero (not specified.)" - if settings[myfile][0]=="/": - if not os.path.exists(settings[myfile]): - raise CatalystError, "Cannot locate specified "+myfile+": "+settings[myfile] - elif expand and os.path.exists(os.getcwd()+"/"+settings[myfile]): - settings[myfile]=os.getcwd()+"/"+settings[myfile] - else: - raise CatalystError, "Cannot locate specified "+myfile+": "+settings[myfile]+" (2nd try)" -""" -Spec file format: - -The spec file format is a very simple and easy-to-use format for storing data. Here's an example -file: - -item1: value1 -item2: foo bar oni -item3: - meep - bark - gleep moop - -This file would be interpreted as defining three items: item1, item2 and item3. item1 would contain -the string value "value1". Item2 would contain an ordered list [ "foo", "bar", "oni" ]. item3 -would contain an ordered list as well: [ "meep", "bark", "gleep", "moop" ]. It's important to note -that the order of multiple-value items is preserved, but the order that the items themselves are -defined are not preserved. In other words, "foo", "bar", "oni" ordering is preserved but "item1" -"item2" "item3" ordering is not, as the item strings are stored in a dictionary (hash). -""" - -def parse_spec(mylines): - myspec = {} - cur_array = [] - trailing_comment=re.compile("#.*$") - white_space=re.compile("\s+") - while len(mylines): - myline = mylines.pop(0).strip() - - # Force the line to be clean - # Remove Comments ( anything following # ) - myline = trailing_comment.sub("", myline) - - # Skip any blank lines - if not myline: continue - - # Look for colon - msearch = myline.find(':') - - # If semicolon found assume its a new key - # This may cause problems if : are used for key values but works for now - if msearch != -1: - # Split on the first semicolon creating two strings in the array mobjs - mobjs = myline.split(':', 1) - mobjs[1] = mobjs[1].strip() - # Start a new array using the first element of mobjs - cur_array = [mobjs[0]] - if mobjs[1]: - # split on white space creating additional array elements - subarray = white_space.split(mobjs[1]) - if subarray: - if len(subarray)==1: - # Store as a string if only one element is found. - # this is to keep with original catalyst behavior - # eventually this may go away if catalyst just works - # with arrays. - cur_array.append(subarray[0]) - else: - cur_array += subarray - - # Else add on to the last key we were working on - else: - mobjs = white_space.split(myline) - cur_array += mobjs - - # XXX: Do we really still need this "single value is a string" behavior? - if len(cur_array) == 2: - myspec[cur_array[0]] = cur_array[1] - else: - myspec[cur_array[0]] = cur_array[1:] - - for x in myspec.keys(): - # Delete empty key pairs - if not myspec[x]: - print "\n\tWARNING: No value set for key " + x + "...deleting" - del myspec[x] - return myspec - -def parse_makeconf(mylines): - mymakeconf={} - pos=0 - pat=re.compile("([a-zA-Z_]*)=(.*)") - while pos<len(mylines): - if len(mylines[pos])<=1: - #skip blanks - pos += 1 - continue - if mylines[pos][0] in ["#"," ","\t"]: - #skip indented lines, comments - pos += 1 - continue - else: - myline=mylines[pos] - mobj=pat.match(myline) - pos += 1 - if mobj.group(2): - clean_string = re.sub(r"\"",r"",mobj.group(2)) - mymakeconf[mobj.group(1)]=clean_string - return mymakeconf - -def read_spec(myspecfile): - try: - myf=open(myspecfile,"r") - except: - raise CatalystError, "Could not open spec file "+myspecfile - mylines=myf.readlines() - myf.close() - return parse_spec(mylines) - -def read_makeconf(mymakeconffile): - if os.path.exists(mymakeconffile): - try: - myf=open(mymakeconffile,"r") - mylines=myf.readlines() - myf.close() - return parse_makeconf(mylines) - except: - raise CatalystError, "Could not open make.conf file "+mymakeconffile - else: - makeconf={} - return makeconf - -def msg(mymsg,verblevel=1): - if verbosity>=verblevel: - print mymsg - -def pathcompare(path1,path2): - # Change double slashes to slash - path1 = re.sub(r"//",r"/",path1) - path2 = re.sub(r"//",r"/",path2) - # Removing ending slash - path1 = re.sub("/$","",path1) - path2 = re.sub("/$","",path2) - - if path1 == path2: - return 1 - return 0 - -def ismount(path): - "enhanced to handle bind mounts" - if os.path.ismount(path): - return 1 - a=os.popen("mount") - mylines=a.readlines() - a.close() - for line in mylines: - mysplit=line.split() - if pathcompare(path,mysplit[2]): - return 1 - return 0 - -def arg_parse(cmdline): - #global required_config_file_values - mydict={} - for x in cmdline: - foo=string.split(x,"=",1) - if len(foo)!=2: - raise CatalystError, "Invalid arg syntax: "+x - - else: - mydict[foo[0]]=foo[1] - - # if all is well, we should return (we should have bailed before here if not) - return mydict - -def addl_arg_parse(myspec,addlargs,requiredspec,validspec): - "helper function to help targets parse additional arguments" - global valid_config_file_values - - for x in addlargs.keys(): - if x not in validspec and x not in valid_config_file_values and x not in requiredspec: - raise CatalystError, "Argument \""+x+"\" not recognized." - else: - myspec[x]=addlargs[x] - - for x in requiredspec: - if not myspec.has_key(x): - raise CatalystError, "Required argument \""+x+"\" not specified." - -def spec_dump(myspec): - for x in myspec.keys(): - print x+": "+repr(myspec[x]) - -def touch(myfile): - try: - myf=open(myfile,"w") - myf.close() - except IOError: - raise CatalystError, "Could not touch "+myfile+"." - -def countdown(secs=5, doing="Starting"): - if secs: - print ">>> Waiting",secs,"seconds before starting..." - print ">>> (Control-C to abort)...\n"+doing+" in: ", - ticks=range(secs) - ticks.reverse() - for sec in ticks: - sys.stdout.write(str(sec+1)+" ") - sys.stdout.flush() - time.sleep(1) - print - -def normpath(mypath): - TrailingSlash=False - if mypath[-1] == "/": - TrailingSlash=True - newpath = os.path.normpath(mypath) - if len(newpath) > 1: - if newpath[:2] == "//": - newpath = newpath[1:] - if TrailingSlash: - newpath=newpath+'/' - return newpath - diff --git a/src/catalyst/modules/embedded_target.py b/src/catalyst/modules/embedded_target.py deleted file mode 100644 index ebbcdfdb71..0000000000 --- a/src/catalyst/modules/embedded_target.py +++ /dev/null @@ -1,49 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/embedded_target.py,v 1.21 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -This class works like a 'stage3'. A stage2 tarball is unpacked, but instead -of building a stage3, it emerges a 'system' into another directory -inside the 'stage2' system. This way we do not have to emerge gcc/portage -into the staged system. - -It sounds real complicated but basically it runs -ROOT=/tmp/submerge emerge --blahblah foo bar -""" - -import os,string,imp,types,shutil -from catalyst_support import * -from generic_stage_target import * -from stat import * - -class embedded_target(generic_stage_target): - - def __init__(self,spec,addlargs): - self.required_values=[] - self.valid_values=[] - self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel","embedded/linuxrc"]) - self.valid_values.extend(["embedded/use"]) - if addlargs.has_key("embedded/fs-type"): - self.valid_values.append("embedded/fs-ops") - - generic_stage_target.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) - - def set_action_sequence(self): - self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir",\ - "portage_overlay","bind","chroot_setup",\ - "setup_environment","build_kernel","build_packages",\ - "bootloader","root_overlay","fsscript","unmerge",\ - "unbind","remove","empty","clean","capture","clear_autoresume"] - - def set_stage_path(self): - self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot") - print "embedded stage path is "+self.settings["stage_path"] - - def set_root_path(self): - self.settings["root_path"]=normpath("/tmp/mergeroot") - print "embedded root path is "+self.settings["root_path"] - -def register(foo): - foo.update({"embedded":embedded_target}) - return foo diff --git a/src/catalyst/modules/generic_stage_target.py b/src/catalyst/modules/generic_stage_target.py deleted file mode 100644 index 1aa4e34f37..0000000000 --- a/src/catalyst/modules/generic_stage_target.py +++ /dev/null @@ -1,1373 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/generic_stage_target.py,v 1.141 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -This class does all of the chroot setup, copying of files, etc. It is -the driver class for pretty much everything that Catalyst does. -""" - -import os,string,imp,types,shutil -from catalyst_support import * -from generic_target import * -from stat import * -import catalyst_lock -class generic_stage_target(generic_target): - - def __init__(self,myspec,addlargs): - self.required_values.extend(["version_stamp","target","subarch","rel_type",\ - "profile","snapshot","source_subpath"]) - - self.valid_values.extend(["version_stamp","target","subarch","rel_type","profile",\ - "snapshot","source_subpath","portage_confdir","cflags","cxxflags",\ - "ldflags","chost","hostuse","portage_overlay","distcc_hosts","makeopts",\ - "pkgcache_path","kerncache_path"]) - - self.set_valid_build_kernel_vars(addlargs) - generic_target.__init__(self,myspec,addlargs) - # map the mainarch we are running under to the mainarches we support for - # building stages and LiveCDs. (for example, on amd64, we can build - # stages for x86 or amd64. - targetmap={ - "x86" : ["x86"], - "amd64" : ["x86","amd64"], - "sparc64" : ["sparc","sparc64"], - "ia64" : ["ia64"], - "alpha" : ["alpha"], - "sparc" : ["sparc"], - "sh" : ["sh"], - "s390" : ["s390"], - "ppc" : ["ppc"], - "ppc64" : ["ppc","ppc64"], - "hppa" : ["hppa"], - "mips" : ["mips"], - "arm" : ["arm"] - } - - machinemap={ - "i386" : "x86", - "i486" : "x86", - "i586" : "x86", - "i686" : "x86", - "x86_64" : "amd64", - "sparc64" : "sparc64", - "ia64" : "ia64", - "alpha" : "alpha", - "sparc" : "sparc", - "sh2" : "sh", - "sh3" : "sh", - "sh4" : "sh", - "sh2eb" : "sh", - "sh3eb" : "sh", - "sh4eb" : "sh", - "s390" : "s390", - "ppc" : "ppc", - "ppc64" : "ppc64", - "parisc" : "hppa", - "parisc64" : "hppa", - "mips" : "mips", - "mips64" : "mips", - "arm" : "arm", - "armv4l" : "arm", - "armeb" : "arm", - "armv5b" : "arm" - } - - mymachine=os.uname()[4] - if not machinemap.has_key(mymachine): - raise CatalystError, "Unknown machine type "+mymachine - - self.settings["hostarch"]=machinemap[mymachine] - self.archmap={} - self.subarchmap={} - - for x in targetmap[self.settings["hostarch"]]: - try: - fh=open(self.settings["sharedir"]+"/arch/"+x+".py") - # this next line loads the plugin as a module and assigns it to archmap[x] - self.archmap[x]=imp.load_module(x,fh,"arch/"+x+".py",(".py","r",imp.PY_SOURCE)) - # this next line registers all the subarches supported in the plugin - self.archmap[x].register(self.subarchmap) - fh.close() - - except IOError: - msg("Can't find "+x+".py plugin in "+self.settings["sharedir"]+"/arch/") - # call arch constructor, pass our settings - try: - self.arch=self.subarchmap[self.settings["subarch"]](self.settings) - except: - print "Invalid subarch: "+self.settings["subarch"] - print "Choose one of the following:", - for x in self.subarchmap: - print x, - print - sys.exit(2) - - print "Using target:",self.settings["target"] - # self.settings["mainarch"] should now be set by our arch constructor, - # so we print a nice informational message: - if self.settings["mainarch"]==self.settings["hostarch"]: - print "Building natively for",self.settings["hostarch"] - - else: - print "Building on",self.settings["hostarch"],"for alternate machine type",\ - self.settings["mainarch"] - # This should be first to be set as other set_ options depend on this - self.set_spec_prefix() - - # define all of our core variables - self.set_target_profile() - self.set_target_subpath() - self.set_source_subpath() - - # set paths - self.set_snapshot_path() - self.set_root_path() - self.set_source_path() - self.set_snapcache_path() - self.set_chroot_path() - self.set_autoresume_path() - self.set_dest_path() - self.set_stage_path() - self.set_target_path() - - self.set_controller_file() - self.set_action_sequence() - self.set_use() - self.set_cleanables() - self.set_iso_volume_id() - self.set_build_kernel_vars() - self.set_fsscript() - self.set_archscript() - self.set_runscript() - self.set_install_mask() - self.set_rcadd() - self.set_rcdel() - self.set_cdtar() - self.set_fstype() - self.set_fsops() - self.set_iso() - self.set_packages() - self.set_rm() - self.set_linuxrc() - self.set_overlay() - self.set_portage_overlay() - self.set_root_overlay() - - # This next line checks to make sure that the specified variables exist - # on disk. - #pdb.set_trace() - file_locate(self.settings,["source_path","snapshot_path","distdir"],expand=0) - # If we are using portage_confdir, check that as well. - if self.settings.has_key("portage_confdir"): - file_locate(self.settings,["portage_confdir"],expand=0) - - # setup our mount points - if self.settings.has_key("SNAPCACHE"): - self.mounts=[ "/proc","/dev","/dev/pts","/usr/portage","/usr/portage/distfiles" ] - self.mountmap={"/proc":"/proc", "/dev":"/dev", "/dev/pts":"/dev/pts",\ - "/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\ - "/usr/portage/distfiles":self.settings["distdir"]} - else: - self.mounts=[ "/proc","/dev","/dev/pts","/usr/portage/distfiles" ] - self.mountmap={"/proc":"/proc", "/dev":"/dev", "/dev/pts":"/dev/pts",\ - "/usr/portage/distfiles":self.settings["distdir"]} - - self.set_mounts() - - # Configure any user specified options (either in catalyst.conf or on - # the command line). - if self.settings.has_key("PKGCACHE"): - self.set_pkgcache_path() - print "Location of the package cache is " + self.settings["pkgcache_path"] - self.mounts.append("/usr/portage/packages") - self.mountmap["/usr/portage/packages"]=self.settings["pkgcache_path"] - - if self.settings.has_key("KERNCACHE"): - self.set_kerncache_path() - print "Location of the kerncache is " + self.settings["kerncache_path"] - self.mounts.append("/tmp/kerncache") - self.mountmap["/tmp/kerncache"]=self.settings["kerncache_path"] - - if self.settings.has_key("CCACHE"): - if os.environ.has_key("CCACHE_DIR"): - ccdir=os.environ["CCACHE_DIR"] - del os.environ["CCACHE_DIR"] - else: - ccdir="/root/.ccache" - if not os.path.isdir(ccdir): - raise CatalystError,\ - "Compiler cache support can't be enabled (can't find "+ccdir+")" - self.mounts.append("/var/tmp/ccache") - self.mountmap["/var/tmp/ccache"]=ccdir - # for the chroot: - self.env["CCACHE_DIR"]="/var/tmp/ccache" - - def override_chost(self): - if self.makeconf.has_key("CHOST"): - self.settings["CHOST"]=self.makeconf["CHOST"] - - def override_cflags(self): - if self.makeconf.has_key("CFLAGS"): - self.settings["CFLAGS"]=self.makeconf["CFLAGS"] - - def override_cxxflags(self): - if self.makeconf.has_key("CXXFLAGS"): - self.settings["CXXFLAGS"]=self.makeconf["CXXFLAGS"] - - def override_ldflags(self): - if self.makeconf.has_key("LDFLAGS"): - self.settings["LDFLAGS"]=self.makeconf["LDFLAGS"] - - def set_install_mask(self): - if self.settings.has_key("install_mask"): - if type(self.settings["install_mask"]) != types.StringType: - self.settings["install_mask"]=string.join(self.settings["install_mask"]) - - def set_spec_prefix(self): - self.settings["spec_prefix"]=self.settings["target"] - - def set_target_profile(self): - self.settings["target_profile"]=self.settings["profile"] - - def set_target_subpath(self): - self.settings["target_subpath"]=self.settings["rel_type"]+"/"+self.settings["target"]+\ - "-"+self.settings["subarch"]+"-"+self.settings["version_stamp"] - - def set_source_subpath(self): - if type(self.settings["source_subpath"]) != types.StringType: - raise CatalystError, "source_subpath should have been a string. Perhaps you have something wrong in your spec file?" - - def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): - if type(self.settings["pkgcache_path"]) != types.StringType: - self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: - self.settings["pkgcache_path"]=normpath(self.settings["storedir"]+"/packages/"+\ - self.settings["target_subpath"]+"/") - - def set_kerncache_path(self): - if self.settings.has_key("kerncache_path"): - if type(self.settings["kerncache_path"]) != types.StringType: - self.settings["kerncache_path"]=normpath(string.join(self.settings["kerncache_path"])) - else: - self.settings["kerncache_path"]=normpath(self.settings["storedir"]+"/kerncache/"+\ - self.settings["target_subpath"]+"/") - - def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+\ - self.settings["target_subpath"]+".tar.bz2") - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): - print "Resume point detected, skipping target path setup operation..." - else: - # first clean up any existing target stuff - if os.path.isfile(self.settings["target_path"]): - cmd("rm -f "+self.settings["target_path"], \ - "Could not remove existing file: "+self.settings["target_path"],env=self.env) - touch(self.settings["autoresume_path"]+"setup_target_path") - - if not os.path.exists(self.settings["storedir"]+"/builds/"): - os.makedirs(self.settings["storedir"]+"/builds/") - - def set_archscript(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/archscript"): - print "\nWarning!!! " - print "\t"+self.settings["spec_prefix"]+"/archscript" + " is deprecated and no longer used.\n" - def set_runscript(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/runscript"): - print "\nWarning!!! " - print "\t"+self.settings["spec_prefix"]+"/runscript" + " is deprecated and no longer used.\n" - - def set_fsscript(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/fsscript"): - self.settings["fsscript"]=self.settings[self.settings["spec_prefix"]+"/fsscript"] - del self.settings[self.settings["spec_prefix"]+"/fsscript"] - - def set_rcadd(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/rcadd"): - self.settings["rcadd"]=self.settings[self.settings["spec_prefix"]+"/rcadd"] - del self.settings[self.settings["spec_prefix"]+"/rcadd"] - - def set_rcdel(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/rcdel"): - self.settings["rcdel"]=self.settings[self.settings["spec_prefix"]+"/rcdel"] - del self.settings[self.settings["spec_prefix"]+"/rcdel"] - - def set_cdtar(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/cdtar"): - self.settings["cdtar"]=normpath(self.settings[self.settings["spec_prefix"]+"/cdtar"]) - del self.settings[self.settings["spec_prefix"]+"/cdtar"] - - def set_iso(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/iso"): - self.settings["iso"]=normpath(self.settings[self.settings["spec_prefix"]+"/iso"]) - del self.settings[self.settings["spec_prefix"]+"/iso"] - - def set_fstype(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/cdfstype"): - print "\nWarning!!! " - print self.settings["spec_prefix"]+"/cdfstype" + " is deprecated and may be removed." - print "\tUse "+self.settings["spec_prefix"]+"/fstype" + " instead." - print "\tConverting to "+self.settings["spec_prefix"]+"/fstype" + " internally." - print "\tContinuing ....\n" - self.settings["fstype"]=self.settings[self.settings["spec_prefix"]+"/cdfstype"] - del self.settings[self.settings["spec_prefix"]+"/cdfstype"] - - if self.settings.has_key(self.settings["spec_prefix"]+"/fstype"): - self.settings["fstype"]=self.settings[self.settings["spec_prefix"]+"/fstype"] - del self.settings[self.settings["spec_prefix"]+"/fstype"] - - if not self.settings.has_key("fstype"): - self.settings["fstype"]="normal" - for x in self.valid_values: - if x == self.settings["spec_prefix"]+"/fstype" or x == self.settings["spec_prefix"]+"/cdfstype": - print "\n"+self.settings["spec_prefix"]+"/fstype is being set to the default of \"normal\"\n" - - def set_fsops(self): - if self.settings.has_key("fstype"): - self.valid_values.append("fsops") - if self.settings.has_key(self.settings["spec_prefix"]+"/fsops"): - self.settings["fsops"]=self.settings[self.settings["spec_prefix"]+"/fsops"] - del self.settings[self.settings["spec_prefix"]+"/fsops"] - - def set_source_path(self): - if self.settings.has_key("SEEDCACHE") and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/")): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/") - else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") - - if os.path.isfile(self.settings["source_path"]): - if os.path.exists(self.settings["source_path"]): - self.settings["source_path_hash"]=generate_hash(self.settings["source_path"],\ - hash_function=self.settings["hash_function"],verbose=False) - if os.path.isdir(self.settings["source_path"]): - print "Source path set to "+self.settings["source_path"] - print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf" - print "\tthe source path with then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n") - else: - print "Source path set to "+self.settings["source_path"] - - - def set_dest_path(self): - if self.settings.has_key("root_path"): - self.settings["destpath"]=normpath(self.settings["chroot_path"]+self.settings["root_path"]) - else: - self.settings["destpath"]=normpath(self.settings["chroot_path"]) - - def set_cleanables(self): - self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/tmp/*","/root/*",\ - "/usr/portage"] - - def set_snapshot_path(self): - self.settings["snapshot_path"]=normpath(self.settings["storedir"]+"/snapshots/portage-"+self.settings["snapshot"]+".tar.bz2") - - if os.path.exists(self.settings["snapshot_path"]): - self.settings["snapshot_path_hash"]=generate_hash(self.settings["snapshot_path"],\ - hash_function=self.settings["hash_function"],verbose=False) - - def set_snapcache_path(self): - if self.settings.has_key("SNAPCACHE"): - self.settings["snapshot_cache_path"]=normpath(self.settings["snapshot_cache"]+"/"+self.settings["snapshot"]+"/") - self.snapcache_lock=catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) - print "Caching snapshot to " + self.settings["snapshot_cache_path"] - - def set_chroot_path(self): - # Note the trailing slash is very important and things would break without it - self.settings["chroot_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["target_subpath"]+"/") - self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) - - def set_autoresume_path(self): - self.settings["autoresume_path"]=normpath(self.settings["storedir"]+"/tmp/"+\ - self.settings["rel_type"]+"/"+".autoresume-"+self.settings["target"]+\ - "-"+self.settings["subarch"]+"-"+self.settings["version_stamp"]+"/") - if self.settings.has_key("AUTORESUME"): - print "The autoresume path is " + self.settings["autoresume_path"] - if not os.path.exists(self.settings["autoresume_path"]): - os.makedirs(self.settings["autoresume_path"],0755) - - def set_controller_file(self): - self.settings["controller_file"]=normpath(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+"-controller.sh") - - def set_iso_volume_id(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/volid"): - self.settings["iso_volume_id"] = string.join(self.settings[self.settings["spec_prefix"]+"/volid"]) - if len(self.settings["iso_volume_id"])>32: - raise CatalystError,"ISO VOLUME ID: volid must not exceed 32 characters." - else: - self.settings["iso_volume_id"] = "catalyst " + self.settings["snapshot"] - - def set_action_sequence(self): - #Default action sequence for run method - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay","bind","chroot_setup",\ - "setup_environment","run_local","preclean","unbind","clean","capture","clear_autoresume"] - - def set_use(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/use"): - self.settings["use"]=self.settings[self.settings["spec_prefix"]+"/use"] - del self.settings[self.settings["spec_prefix"]+"/use"] - if self.settings.has_key("use"): - if type(self.settings["use"])==types.StringType: - self.settings["use"]=self.settings["use"].split() - - def set_stage_path(self): - self.settings["stage_path"]=normpath(self.settings["chroot_path"]) - - def set_mounts(self): - pass - - def set_packages(self): - pass - - def set_rm(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/rm"): - if type(self.settings[self.settings["spec_prefix"]+"/rm"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/rm"]=self.settings[self.settings["spec_prefix"]+"/rm"].split() - - def set_linuxrc(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/linuxrc"): - if type(self.settings[self.settings["spec_prefix"]+"/linuxrc"])==types.StringType: - self.settings["linuxrc"]=self.settings[self.settings["spec_prefix"]+"/linuxrc"] - del self.settings[self.settings["spec_prefix"]+"/linuxrc"] - - def set_portage_overlay(self): - if self.settings.has_key("portage_overlay"): - if type(self.settings["portage_overlay"])==types.StringType: - self.settings["portage_overlay"]=self.settings["portage_overlay"].split() - print "portage_overlay directories are set to: \"" + string.join(self.settings["portage_overlay"])+"\"" - - def set_overlay(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/overlay"): - if type(self.settings[self.settings["spec_prefix"]+"/overlay"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/overlay"]=self.settings[self.settings["spec_prefix"]+"/overlay"].split() - - def set_root_overlay(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/root_overlay"): - if type(self.settings[self.settings["spec_prefix"]+"/root_overlay"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/root_overlay"]=self.settings[self.settings["spec_prefix"]+"/root_overlay"].split() - - - def set_root_path(self): - # ROOT= variable for emerges - self.settings["root_path"]="/" - - def set_valid_build_kernel_vars(self,addlargs): - if addlargs.has_key("boot/kernel"): - if type(addlargs["boot/kernel"]) == types.StringType: - loopy=[addlargs["boot/kernel"]] - else: - loopy=addlargs["boot/kernel"] - - for x in loopy: - self.required_values.append("boot/kernel/"+x+"/sources") - self.required_values.append("boot/kernel/"+x+"/config") - self.valid_values.append("boot/kernel/"+x+"/aliases") - self.valid_values.append("boot/kernel/"+x+"/extraversion") - self.valid_values.append("boot/kernel/"+x+"/packages") - if addlargs.has_key("boot/kernel/"+x+"/packages"): - if type(addlargs["boot/kernel/"+x+"/packages"]) == types.StringType: - addlargs["boot/kernel/"+x+"/packages"]=[addlargs["boot/kernel/"+x+"/packages"]] - self.valid_values.append("boot/kernel/"+x+"/use") - self.valid_values.append("boot/kernel/"+x+"/gk_kernargs") - self.valid_values.append("boot/kernel/"+x+"/gk_action") - self.valid_values.append("boot/kernel/"+x+"/initramfs_overlay") - self.valid_values.append("boot/kernel/"+x+"/softlevel") - self.valid_values.append("boot/kernel/"+x+"/console") - self.valid_values.append("boot/kernel/"+x+"/machine_type") - self.valid_values.append("boot/kernel/"+x+"/postconf") - if addlargs.has_key("boot/kernel/"+x+"/postconf"): - print "boot/kernel/"+x+"/postconf is deprecated" - print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages" - print "\tPlease move them to boot/kernel/"+x+"/packages in your specfile" - if type(addlargs["boot/kernel/"+x+"/postconf"]) == types.StringType: - loop2=[addlargs["boot/kernel/"+x+"/postconf"]] - else: - loop2=addlargs["boot/kernel/"+x+"/postconf"] - - for y in loop2: - if not addlargs.has_key("boot/kernel/"+x+"/packages"): - addlargs["boot/kernel/"+x+"/packages"]=[y] - else: - addlargs["boot/kernel/"+x+"/packages"].append(y) - - def set_build_kernel_vars(self): - if self.settings.has_key(self.settings["spec_prefix"]+"/devmanager"): - self.settings["devmanager"]=self.settings[self.settings["spec_prefix"]+"/devmanager"] - del self.settings[self.settings["spec_prefix"]+"/devmanager"] - - if self.settings.has_key(self.settings["spec_prefix"]+"/splashtype"): - self.settings["splashtype"]=self.settings[self.settings["spec_prefix"]+"/splashtype"] - del self.settings[self.settings["spec_prefix"]+"/splashtype"] - - if self.settings.has_key(self.settings["spec_prefix"]+"/gk_mainargs"): - self.settings["gk_mainargs"]=self.settings[self.settings["spec_prefix"]+"/gk_mainargs"] - del self.settings[self.settings["spec_prefix"]+"/gk_mainargs"] - - def kill_chroot_pids(self): - print "Checking for processes running in chroot and killing them." - - # Force environment variables to be exported so script can see them - self.setup_environment() - - if os.path.exists(self.settings["sharedir"]+"/targets/support/kill-chroot-pids.sh"): - cmd("/bin/bash "+self.settings["sharedir"]+"/targets/support/kill-chroot-pids.sh",\ - "kill-chroot-pids script failed.",env=self.env) - - def mount_safety_check(self): - mypath=self.settings["chroot_path"] - - """ - check and verify that none of our paths in mypath are mounted. We don't want to clean - up with things still mounted, and this allows us to check. - returns 1 on ok, 0 on "something is still mounted" case. - """ - if not os.path.exists(mypath): - return - - for x in self.mounts: - if not os.path.exists(mypath+x): - continue - - if ismount(mypath+x): - #something is still mounted - try: - print x+" is still mounted; performing auto-bind-umount...", - # try to umount stuff ourselves - self.unbind() - if ismount(mypath+x): - raise CatalystError, "Auto-unbind failed for "+x - - else: - print "Auto-unbind successful..." - - except CatalystError: - raise CatalystError, "Unable to auto-unbind "+x - - def unpack(self): - unpack=True - - clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack") - - if self.settings.has_key("SEEDCACHE"): - if os.path.isdir(self.settings["source_path"]): - # SEEDCACHE Is a directory, use Rsync - unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] - display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." - else: - # SEEDCACHE is a not a directory, try untar'ing - print "Referenced SEEDCACHE does not appear to be a directory, trying to untar..." - display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"] - error_msg="Tarball extraction of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." - else: - # No SEEDCACHE, use tar - display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"] - error_msg="Tarball extraction of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." - - - if self.settings.has_key("AUTORESUME"): - # Autoresume is Valid, SeedCache is Valid - if os.path.isdir(self.settings["source_path"]) and os.path.exists(self.settings["autoresume_path"]+"unpack"): - unpack=False - invalid_snapshot=False - - # Autoresume is Valid, Tarball is Valid - elif os.path.isfile(self.settings["source_path"]) and self.settings["source_path_hash"] == clst_unpack_hash: - unpack=False - invalid_snapshot=True - - # Autoresume is InValid, SeedCache - elif os.path.isdir(self.settings["source_path"]) and not os.path.exists(self.settings["autoresume_path"]+"unpack"): - unpack=True - invalid_snapshot=False - - # Autoresume is InValid, Tarball - elif os.path.isfile(self.settings["source_path"]) and self.settings["source_path_hash"] != clst_unpack_hash: - unpack=True - invalid_snapshot=True - else: - # No Autoresume,SeedCache - if self.settings.has_key("SEEDCACHE"): - - # Seed cache so lets run rsync and rsync can clean up extra junk - if os.path.isdir(self.settings["source_path"]): - unpack=True - invalid_snapshot=False - - # Tarball so we better unpack and remove anything already there - elif os.path.isfile(self.settings["source_path"]): - unpack=True - invalid_snapshot=True - - # No Autoresume,No SeedCache - else: - - # Tarball so we better unpack and remove anything already there - if os.path.isfile(self.settings["source_path"]): - unpack=True - invalid_snapshot=True - # Should never reach this if so something is very wrong - elif os.path.isdir(self.settings["source_path"]): - raise CatalystError,"source path is a dir but seedcache is not enabled" - - if unpack: - self.mount_safety_check() - - if invalid_snapshot: - if self.settings.has_key("AUTORESUME"): - print "No Valid Resume point detected, cleaning up ..." - - self.clear_autoresume() - self.clear_chroot() - - if not os.path.exists(self.settings["chroot_path"]): - os.makedirs(self.settings["chroot_path"]) - - if not os.path.exists(self.settings["chroot_path"]+"/tmp"): - os.makedirs(self.settings["chroot_path"]+"/tmp",1777) - - if self.settings.has_key("PKGCACHE"): - if not os.path.exists(self.settings["pkgcache_path"]): - os.makedirs(self.settings["pkgcache_path"],0755) - - if self.settings.has_key("KERNCACHE"): - if not os.path.exists(self.settings["kerncache_path"]): - os.makedirs(self.settings["kerncache_path"],0755) - - print display_msg - cmd(unpack_cmd,error_msg,env=self.env) - - if self.settings.has_key("source_path_hash"): - myf=open(self.settings["autoresume_path"]+"unpack","w") - myf.write(self.settings["source_path_hash"]) - myf.close() - else: - touch(self.settings["autoresume_path"]+"unpack") - else: - print "Resume point detected, skipping unpack operation..." - - - def unpack_snapshot(self): - unpack=True - snapshot_hash=read_from_clst(self.settings["autoresume_path"]+"unpack_portage") - - if self.settings.has_key("SNAPCACHE"): - snapshot_cache_hash=read_from_clst(self.settings["snapshot_cache_path"]+"catalyst-hash") - destdir=self.settings["snapshot_cache_path"] - unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+destdir - unpack_errmsg="Error unpacking snapshot" - cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+self.settings["snapshot_cache_path"]+" (This can take a long time)..." - cleanup_errmsg="Error removing existing snapshot cache directory." - self.snapshot_lock_object=self.snapcache_lock - - if self.settings["snapshot_path_hash"] == snapshot_cache_hash: - print "Valid snapshot cache, skipping unpack of portage tree ..." - unpack=False - - else: - destdir=normpath(self.settings["chroot_path"]+"/usr/portage") - cleanup_errmsg="Error removing existing snapshot directory." - cleanup_msg="Cleaning up existing portage tree (This can take a long time) ..." - unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+self.settings["chroot_path"]+"/usr" - unpack_errmsg="Error unpacking snapshot" - - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["chroot_path"]+"/usr/portage/") \ - and os.path.exists(self.settings["autoresume_path"]+"unpack_portage") \ - and self.settings["snapshot_path_hash"] == snapshot_hash: - print "Valid Resume point detected, skipping unpack of portage tree..." - unpack=False - - - - if unpack: - if self.settings.has_key("SNAPCACHE"): - self.snapshot_lock_object.write_lock() - if os.path.exists(destdir): - print cleanup_msg - cleanup_cmd="rm -rf "+destdir - cmd(cleanup_cmd,cleanup_errmsg,env=self.env) - if not os.path.exists(destdir): - os.makedirs(destdir,0755) - - print "Unpacking portage tree (This can take a long time) ..." - cmd(unpack_cmd,unpack_errmsg,env=self.env) - - if self.settings.has_key("SNAPCACHE"): - myf=open(self.settings["snapshot_cache_path"]+"catalyst-hash","w") - myf.write(self.settings["snapshot_path_hash"]) - myf.close() - - else: - print "Setting snapshot autoresume point" - myf=open(self.settings["autoresume_path"]+"unpack_portage","w") - myf.write(self.settings["snapshot_path_hash"]) - myf.close() - - if self.settings.has_key("SNAPCACHE"): - self.snapshot_lock_object.unlock() - - def config_profile_link(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"config_profile_link"): - print "Resume point detected, skipping config_profile_link operation..." - else: - print "Configuring profile link..." - cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.profile",\ - "Error zapping profile link",env=self.env) - cmd("ln -sf ../usr/portage/profiles/"+self.settings["target_profile"]+\ - " "+self.settings["chroot_path"]+"/etc/make.profile","Error creating profile link",env=self.env) - touch(self.settings["autoresume_path"]+"config_profile_link") - - def setup_confdir(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_confdir"): - print "Resume point detected, skipping setup_confdir operation..." - else: - if self.settings.has_key("portage_confdir"): - print "Configuring /etc/portage..." - cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage","Error zapping /etc/portage",env=self.env) - cmd("cp -R "+self.settings["portage_confdir"]+"/ "+self.settings["chroot_path"]+\ - "/etc/portage","Error copying /etc/portage",env=self.env) - touch(self.settings["autoresume_path"]+"setup_confdir") - - def portage_overlay(self): - # copy over the portage overlays - # Always copy over the overlay incase it has changed - if self.settings.has_key("portage_overlay"): - for x in self.settings["portage_overlay"]: - if os.path.exists(x): - print "Copying overlay dir " +x - cmd("mkdir -p "+self.settings["chroot_path"]+x,"Could not make portage_overlay dir",env=self.env) - #cmd("rsync -a --delete "+x+"/* "+self.settings["chroot_path"]+x,\ - cmd("rsync -a --delete "+x+"/ "+self.settings["chroot_path"]+x,\ - "Could not copy portage_overlay",env=self.env) - #cmd("cp -R "+x+"/* "+self.settings["chroot_path"]+x,"Could not copy portage_overlay",env=self.env) - - def root_overlay(self): - # copy over the root_overlay - # Always copy over the overlay incase it has changed - if self.settings.has_key(self.settings["spec_prefix"]+"/root_overlay"): - for x in self.settings[self.settings["spec_prefix"]+"/root_overlay"]: - if os.path.exists(x): - print "Copying root_overlay: "+x - cmd("rsync -a "+x+"/ "+\ - self.settings["chroot_path"], self.settings["spec_prefix"]+"/root_overlay: "+x+" copy failed.",env=self.env) - - def bind(self): - for x in self.mounts: - if not os.path.exists(self.settings["chroot_path"]+x): - os.makedirs(self.settings["chroot_path"]+x,0755) - - if not os.path.exists(self.mountmap[x]): - os.makedirs(self.mountmap[x],0755) - - src=self.mountmap[x] - if self.settings.has_key("SNAPCACHE") and x == "/usr/portage": - self.snapshot_lock_object.read_lock() - retval=os.system("mount --bind "+src+" "+self.settings["chroot_path"]+x) - if retval!=0: - self.unbind() - raise CatalystError,"Couldn't bind mount "+src - - - def unbind(self): - ouch=0 - mypath=self.settings["chroot_path"] - myrevmounts=self.mounts[:] - myrevmounts.reverse() - # unmount in reverse order for nested bind-mounts - for x in myrevmounts: - if not os.path.exists(mypath+x): - continue - - if not ismount(mypath+x): - # it's not mounted, continue - continue - - retval=os.system("umount "+mypath+x) - - if retval!=0: - warn("First attempt to unmount: "+mypath+x+" failed.") - warn("Killing any pids still running in the chroot") - - self.kill_chroot_pids() - - retval2=os.system("umount "+mypath+x) - if retval2!=0: - ouch=1 - warn("Couldn't umount bind mount: "+mypath+x) - # keep trying to umount the others, to minimize damage if developer makes a mistake - - if self.settings.has_key("SNAPCACHE") and x == "/usr/portage": - try: - # Its possible the snapshot lock object isnt created yet - # this is because mount safety check calls unbind before the target is fully initialized - self.snapshot_lock_object.unlock() - except: - pass - if ouch: - """ - if any bind mounts really failed, then we need to raise - this to potentially prevent an upcoming bash stage cleanup script - from wiping our bind mounts. - """ - raise CatalystError,"Couldn't umount one or more bind-mounts; aborting for safety." - - def chroot_setup(self): - self.makeconf=read_makeconf(self.settings["chroot_path"]+"/etc/make.conf") - self.override_chost() - self.override_cflags() - self.override_cxxflags() - self.override_ldflags() - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"chroot_setup"): - print "Resume point detected, skipping chroot_setup operation..." - else: - print "Setting up chroot..." - - #self.makeconf=read_makeconf(self.settings["chroot_path"]+"/etc/make.conf") - - cmd("cp /etc/resolv.conf "+self.settings["chroot_path"]+"/etc",\ - "Could not copy resolv.conf into place.",env=self.env) - - # copy over the envscript, if applicable - if self.settings.has_key("ENVSCRIPT"): - if not os.path.exists(self.settings["ENVSCRIPT"]): - raise CatalystError, "Can't find envscript "+self.settings["ENVSCRIPT"] - - print "\nWarning!!!!" - print "\tOverriding certain env variables may cause catastrophic failure." - print "\tIf your build fails look here first as the possible problem." - print "\tCatalyst assumes you know what you are doing when setting" - print "\t\tthese variables." - print "\tCatalyst Maintainers use VERY minimal envscripts if used at all" - print "\tYou have been warned\n" - - cmd("cp "+self.settings["ENVSCRIPT"]+" "+self.settings["chroot_path"]+"/tmp/envscript",\ - "Could not copy envscript into place.",env=self.env) - - # Copy over /etc/hosts from the host in case there are any - # specialties in there - if os.path.exists(self.settings["chroot_path"]+"/etc/hosts"): - cmd("mv "+self.settings["chroot_path"]+"/etc/hosts "+self.settings["chroot_path"]+\ - "/etc/hosts.bck", "Could not backup /etc/hosts",env=self.env) - cmd("cp /etc/hosts "+self.settings["chroot_path"]+"/etc/hosts", "Could not copy /etc/hosts",env=self.env) - #self.override_chost() - #self.override_cflags() - #self.override_cxxflags() - #self.override_ldflags() - # Modify and write out make.conf (for the chroot) - cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.conf","Could not remove "+self.settings["chroot_path"]+"/etc/make.conf",\ - env=self.env) - myf=open(self.settings["chroot_path"]+"/etc/make.conf","w") - myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") - myf.write("# Please consult /etc/make.conf.example for a more detailed example.\n") - myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') - myf.write('CHOST="'+self.settings["CHOST"]+'"\n') - - if self.settings.has_key("CXXFLAGS"): - myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - - if self.settings.has_key("LDFLAGS"): - myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n') - - # Figure out what our USE vars are for building - myusevars=[] - if self.settings.has_key("HOSTUSE"): - myusevars.extend(self.settings["HOSTUSE"]) - - if self.settings.has_key("use"): - myusevars.extend(self.settings["use"]) - myf.write('USE="'+string.join(myusevars)+'"\n') - - # Setup the portage overlay - if self.settings.has_key("portage_overlay"): - myf.write('PORTDIR_OVERLAY="'+string.join(self.settings["portage_overlay"])+'"\n') - - myf.close() - touch(self.settings["autoresume_path"]+"chroot_setup") - - def fsscript(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"fsscript"): - print "Resume point detected, skipping fsscript operation..." - else: - if self.settings.has_key("fsscript"): - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" fsscript","fsscript script failed.",env=self.env) - touch(self.settings["autoresume_path"]+"fsscript") - - def rcupdate(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"rcupdate"): - print "Resume point detected, skipping rcupdate operation..." - else: - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" rc-update","rc-update script failed.",env=self.env) - touch(self.settings["autoresume_path"]+"rcupdate") - - def clean(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"clean"): - print "Resume point detected, skipping clean operation..." - else: - for x in self.settings["cleanables"]: - print "Cleaning chroot: "+x+"... " - cmd("rm -rf "+self.settings["destpath"]+x,"Couldn't clean "+x,env=self.env) - - # put /etc/hosts back into place - if os.path.exists(self.settings["chroot_path"]+"/etc/hosts.bck"): - cmd("mv -f "+self.settings["chroot_path"]+"/etc/hosts.bck "+self.settings["chroot_path"]+\ - "/etc/hosts", "Could not replace /etc/hosts",env=self.env) - - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" clean","clean script failed.",env=self.env) - touch(self.settings["autoresume_path"]+"clean") - - def empty(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"empty"): - print "Resume point detected, skipping empty operation..." - else: - if self.settings.has_key(self.settings["spec_prefix"]+"/empty"): - if type(self.settings[self.settings["spec_prefix"]+"/empty"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/empty"]=self.settings[self.settings["spec_prefix"]+"/empty"].split() - for x in self.settings[self.settings["spec_prefix"]+"/empty"]: - myemp=self.settings["destpath"]+x - if not os.path.isdir(myemp): - print x,"not a directory or does not exist, skipping 'empty' operation." - continue - print "Emptying directory",x - # stat the dir, delete the dir, recreate the dir and set - # the proper perms and ownership - mystat=os.stat(myemp) - shutil.rmtree(myemp) - os.makedirs(myemp,0755) - os.chown(myemp,mystat[ST_UID],mystat[ST_GID]) - os.chmod(myemp,mystat[ST_MODE]) - touch(self.settings["autoresume_path"]+"empty") - - def remove(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"remove"): - print "Resume point detected, skipping remove operation..." - else: - if self.settings.has_key(self.settings["spec_prefix"]+"/rm"): - for x in self.settings[self.settings["spec_prefix"]+"/rm"]: - # we're going to shell out for all these cleaning operations, - # so we get easy glob handling - print "livecd: removing "+x - os.system("rm -rf "+self.settings["chroot_path"]+x) - try: - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" clean",\ - "Clean failed.",env=self.env) - touch(self.settings["autoresume_path"]+"remove") - except: - self.unbind() - raise - - - def preclean(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"preclean"): - print "Resume point detected, skipping preclean operation..." - else: - try: - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" preclean","preclean script failed.",env=self.env) - touch(self.settings["autoresume_path"]+"preclean") - - except: - self.unbind() - raise CatalystError, "Build failed, could not execute preclean" - - def capture(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"capture"): - print "Resume point detected, skipping capture operation..." - else: - """capture target in a tarball""" - mypath=self.settings["target_path"].split("/") - # remove filename from path - mypath=string.join(mypath[:-1],"/") - - # now make sure path exists - if not os.path.exists(mypath): - os.makedirs(mypath) - - print "Creating stage tarball..." - - cmd("tar cjpf "+self.settings["target_path"]+" -C "+self.settings["stage_path"]+\ - " .","Couldn't create stage tarball",env=self.env) - - self.gen_digest_file(self.settings["target_path"]) - - touch(self.settings["autoresume_path"]+"capture") - - def run_local(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"run_local"): - print "Resume point detected, skipping run_local operation..." - else: - try: - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" run","run script failed.",env=self.env) - touch(self.settings["autoresume_path"]+"run_local") - - except CatalystError: - self.unbind() - raise CatalystError,"Stage build aborting due to error." - - def setup_environment(self): - # Modify the current environment. This is an ugly hack that should be - # fixed. We need this to use the os.system() call since we can't - # specify our own environ: - for x in self.settings.keys(): - # "/" is replaced with "_", "-" is replaced with "_", and "." is - # replaced with "_" - varname="clst_"+string.replace(x,"/","_") - varname=string.replace(varname,"-","_") - varname=string.replace(varname,".","_") - if type(self.settings[x])==types.StringType: - # prefix to prevent namespace clashes: - #os.environ[varname]=self.settings[x] - self.env[varname]=self.settings[x] - elif type(self.settings[x])==types.ListType: - #os.environ[varname]=string.join(self.settings[x]) - self.env[varname]=string.join(self.settings[x]) - if self.settings.has_key("makeopts"): - self.env["MAKEOPTS"]=self.settings["makeopts"] - - def run(self): - self.chroot_lock.write_lock() - - # Kill any pids in the chroot - self.kill_chroot_pids() - - # Check for mounts right away and abort if we cannot unmount them. - self.mount_safety_check() - - if self.settings.has_key("CLEAR_AUTORESUME"): - self.clear_autoresume() - if self.settings.has_key("PURGE"): - self.purge() - - for x in self.settings["action_sequence"]: - print "Running action sequence: "+x - sys.stdout.flush() - try: - apply(getattr(self,x)) - except: - self.mount_safety_check() - raise - - self.chroot_lock.unlock() - - def unmerge(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"unmerge"): - print "Resume point detected, skipping unmerge operation..." - else: - if self.settings.has_key(self.settings["spec_prefix"]+"/unmerge"): - if type(self.settings[self.settings["spec_prefix"]+"/unmerge"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/unmerge"]=[self.settings[self.settings["spec_prefix"]+"/unmerge"]] - myunmerge=self.settings[self.settings["spec_prefix"]+"/unmerge"][:] - - for x in range(0,len(myunmerge)): - #surround args with quotes for passing to bash, - #allows things like "<" to remain intact - myunmerge[x]="'"+myunmerge[x]+"'" - myunmerge=string.join(myunmerge) - - #before cleaning, unmerge stuff: - try: - cmd("/bin/bash "+self.settings["controller_file"]+" unmerge "+ myunmerge,\ - "Unmerge script failed.",env=self.env) - #cmd("/bin/bash "+self.settings["sharedir"]+"/targets/" \ - # +self.settings["target"]+"/unmerge.sh "+myunmerge,"Unmerge script failed.",env=self.env) - print "unmerge shell script" - except CatalystError: - self.unbind() - raise - - touch(self.settings["autoresume_path"]+"unmerge") - - def target_setup(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"target_setup"): - print "Resume point detected, skipping target_setup operation..." - else: - print "Setting up filesystems per filesystem type" - cmd("/bin/bash "+self.settings["controller_file"]+" target_image_setup "+ self.settings["target_path"],\ - "target_image_setup script failed.",env=self.env) - touch(self.settings["autoresume_path"]+"target_setup") - - def setup_overlay(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_overlay"): - print "Resume point detected, skipping setup_overlay operation..." - else: - if self.settings.has_key(self.settings["spec_prefix"]+"/overlay"): - for x in self.settings[self.settings["spec_prefix"]+"/overlay"]: - if os.path.exists(x): - cmd("rsync -a "+x+"/ "+\ - self.settings["target_path"], self.settings["spec_prefix"]+"overlay: "+x+" copy failed.",env=self.env) - touch(self.settings["autoresume_path"]+"setup_overlay") - - def create_iso(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"create_iso"): - print "Resume point detected, skipping create_iso operation..." - else: - # create the ISO - this is the preferred method (the iso scripts do not always work) - if self.settings.has_key("iso"): - cmd("/bin/bash "+self.settings["controller_file"]+" iso "+\ - self.settings["iso"],"ISO creation script failed.",env=self.env) - self.gen_digest_file(self.settings["iso"]) - touch(self.settings["autoresume_path"]+"create_iso") - - - else: - print "WARNING livecd/iso was not defined." - print "A CD Image will not be created, skipping create-iso.sh..." - - - def build_packages(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"build_packages"): - print "Resume point detected, skipping build_packages operation..." - else: - if self.settings.has_key(self.settings["spec_prefix"]+"/packages"): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"build_packages"): - print "Resume point detected, skipping build_packages operation..." - else: - mypack=list_bashify(self.settings[self.settings["spec_prefix"]+"/packages"]) - try: - cmd("/bin/bash "+self.settings["controller_file"]+\ - " build_packages "+mypack,"Error in attempt to build packages",env=self.env) - touch(self.settings["autoresume_path"]+"build_packages") - except CatalystError: - self.unbind() - raise CatalystError,self.settings["spec_prefix"] + "build aborting due to error." - - def build_kernel(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"build_kernel"): - print "Resume point detected, skipping build_kernel operation..." - else: - if self.settings.has_key("boot/kernel"): - try: - mynames=self.settings["boot/kernel"] - if type(mynames)==types.StringType: - mynames=[mynames] - # execute the script that sets up the kernel build environment - cmd("/bin/bash "+self.settings["controller_file"]+" pre-kmerge ",\ - "Runscript pre-kmerge failed",env=self.env) - - for kname in mynames: - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"build_kernel_"+kname): - print "Resume point detected, skipping build_kernel for "+kname+" operation..." - else: - try: - if not os.path.exists(self.settings["boot/kernel/"+kname+"/config"]): - self.unbind() - raise CatalystError, "Can't find kernel config: " \ - +self.settings["boot/kernel/"+kname+"/config"] - - except TypeError: - raise CatalystError, "Required value boot/kernel/config not specified" - - try: - cmd("cp "+self.settings["boot/kernel/"+kname+"/config"]+" "+ \ - self.settings["chroot_path"]+"/var/tmp/"+kname+".config", \ - "Couldn't copy kernel config: "+self.settings["boot/kernel/"+kname+"/config"],\ - env=self.env) - - except CatalystError: - self.unbind() - - # If we need to pass special options to the bootloader - # for this kernel put them into the environment. - if self.settings.has_key("boot/kernel/"+kname+"/kernelopts"): - myopts=self.settings["boot/kernel/"+kname+"/kernelopts"] - - if type(myopts) != types.StringType: - myopts = string.join(myopts) - self.env[kname+"_kernelopts"]=myopts - - else: - self.env[kname+"_kernelopts"]="" - - if not self.settings.has_key("boot/kernel/"+kname+"/extraversion"): - self.settings["boot/kernel/"+kname+"/extraversion"]="" - - self.env["clst_kextraversion"]=self.settings["boot/kernel/"+kname+"/extraversion"] - - if self.settings.has_key("boot/kernel/"+kname+"/initramfs_overlay"): - if os.path.exists(self.settings["boot/kernel/"+kname+"/initramfs_overlay"]): - print "Copying initramfs_overlay dir " +self.settings["boot/kernel/"+kname+"/initramfs_overlay"] - - cmd("mkdir -p "+self.settings["chroot_path"]+"/tmp/initramfs_overlay/" + \ - self.settings["boot/kernel/"+kname+"/initramfs_overlay"],env=self.env) - - cmd("cp -R "+self.settings["boot/kernel/"+kname+"/initramfs_overlay"]+"/* " + \ - self.settings["chroot_path"] + "/tmp/initramfs_overlay/" + \ - self.settings["boot/kernel/"+kname+"/initramfs_overlay"],\ - env=self.env) - - - # execute the script that builds the kernel - cmd("/bin/bash "+self.settings["controller_file"]+" kernel "+kname,\ - "Runscript kernel build failed",env=self.env) - - if self.settings.has_key("boot/kernel/"+kname+"/initramfs_overlay"): - if os.path.exists(self.settings["chroot_path"]+"/tmp/initramfs_overlay/"): - print "Cleaning up temporary overlay dir" - cmd("rm -R "+self.settings["chroot_path"]+"/tmp/initramfs_overlay/",env=self.env) - - touch(self.settings["autoresume_path"]+"build_kernel_"+kname) - - # execute the script that cleans up the kernel build environment - cmd("/bin/bash "+self.settings["controller_file"]+" post-kmerge ",\ - "Runscript post-kmerge failed",env=self.env) - - touch(self.settings["autoresume_path"]+"build_kernel") - - except CatalystError: - self.unbind() - raise CatalystError,"build aborting due to kernel build error." - - def bootloader(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"bootloader"): - print "Resume point detected, skipping bootloader operation..." - else: - try: - cmd("/bin/bash "+self.settings["controller_file"]+" bootloader " + self.settings["target_path"],\ - "Bootloader runscript failed.",env=self.env) - touch(self.settings["autoresume_path"]+"bootloader") - except CatalystError: - self.unbind() - raise CatalystError,"Runscript aborting due to error." - - def livecd_update(self): - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"livecd_update"): - print "Resume point detected, skipping build_packages operation..." - else: - try: - cmd("/bin/bash "+self.settings["controller_file"]+" livecd-update",\ - "livecd-update failed.",env=self.env) - touch(self.settings["autoresume_path"]+"livecd_update") - - except CatalystError: - self.unbind() - raise CatalystError,"build aborting due to livecd_update error." - - def clear_chroot(self): - myemp=self.settings["chroot_path"] - if os.path.isdir(myemp): - print "Emptying directory",myemp - # stat the dir, delete the dir, recreate the dir and set - # the proper perms and ownership - mystat=os.stat(myemp) - #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env=self.env) - shutil.rmtree(myemp) - os.makedirs(myemp,0755) - os.chown(myemp,mystat[ST_UID],mystat[ST_GID]) - os.chmod(myemp,mystat[ST_MODE]) - - def clear_packages(self): - if self.settings.has_key("PKGCACHE"): - print "purging the pkgcache ..." - - myemp=self.settings["pkgcache_path"] - if os.path.isdir(myemp): - print "Emptying directory",myemp - # stat the dir, delete the dir, recreate the dir and set - # the proper perms and ownership - mystat=os.stat(myemp) - #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env=self.env) - shutil.rmtree(myemp) - os.makedirs(myemp,0755) - os.chown(myemp,mystat[ST_UID],mystat[ST_GID]) - os.chmod(myemp,mystat[ST_MODE]) - - def clear_kerncache(self): - if self.settings.has_key("KERNCACHE"): - print "purging the kerncache ..." - - myemp=self.settings["kerncache_path"] - if os.path.isdir(myemp): - print "Emptying directory",myemp - # stat the dir, delete the dir, recreate the dir and set - # the proper perms and ownership - mystat=os.stat(myemp) - #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env=self.env) - shutil.rmtree(myemp) - os.makedirs(myemp,0755) - os.chown(myemp,mystat[ST_UID],mystat[ST_GID]) - os.chmod(myemp,mystat[ST_MODE]) - - def clear_autoresume(self): - # clean resume points since they are no longer needed - if self.settings.has_key("AUTORESUME"): - print "Removing AutoResume Points: ..." - myemp=self.settings["autoresume_path"] - if os.path.isdir(myemp): - if self.settings.has_key("AUTORESUME"): - print "Emptying directory",myemp - # stat the dir, delete the dir, recreate the dir and set - # the proper perms and ownership - mystat=os.stat(myemp) - #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env-self.env) - shutil.rmtree(myemp) - os.makedirs(myemp,0755) - os.chown(myemp,mystat[ST_UID],mystat[ST_GID]) - os.chmod(myemp,mystat[ST_MODE]) - - def gen_digest_file(self,file): - if os.path.exists(file+".DIGESTS"): - os.remove(file+".DIGESTS") - if self.settings.has_key("digests"): - if os.path.exists(file): - myf=open(file+".DIGESTS","w") - keys={} - for i in self.settings["digests"].split(): - keys[i]=1 - array=keys.keys() - array.sort() - for j in array: - if self.settings.has_key("VERBOSE"): - hash=generate_hash(file,hash_function=j,verbose=True) - else: - hash=generate_hash(file,hash_function=j) - myf.write(hash) - myf.close() - - def purge(self): - countdown(10,"Purging Caches ...") - if self.settings.has_key("PURGE"): - print "clearing autoresume ..." - self.clear_autoresume() - - print "clearing chroot ..." - self.clear_chroot() - - print "clearing package cache ..." - self.clear_packages() - - print "clearing kerncache ..." - self.clear_kerncache() - -#vim: ts=4 sw=4 sta et sts=4 ai diff --git a/src/catalyst/modules/generic_target.py b/src/catalyst/modules/generic_target.py deleted file mode 100644 index 2f951d2c34..0000000000 --- a/src/catalyst/modules/generic_target.py +++ /dev/null @@ -1,15 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/generic_target.py,v 1.7 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -The toplevel class for generic_stage_target. This is about as generic as we get. -""" - -from catalyst_support import * - -class generic_target: - - def __init__(self,myspec,addlargs): - addl_arg_parse(myspec,addlargs,self.required_values,self.valid_values) - self.settings=myspec - self.env={} - self.env["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin" diff --git a/src/catalyst/modules/grp_target.py b/src/catalyst/modules/grp_target.py deleted file mode 100644 index 1f1c76da8e..0000000000 --- a/src/catalyst/modules/grp_target.py +++ /dev/null @@ -1,121 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/grp_target.py,v 1.25 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -The builder class for GRP (Gentoo Reference Platform) builds. -""" - -import os,types,glob -from catalyst_support import * -from generic_stage_target import * - -class grp_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=["version_stamp","target","subarch",\ - "rel_type","profile","snapshot","source_subpath"] - - self.valid_values=self.required_values[:] - self.valid_values.extend(["grp/use"]) - if not addlargs.has_key("grp"): - raise CatalystError,"Required value \"grp\" not specified in spec." - - self.required_values.extend(["grp"]) - if type(addlargs["grp"])==types.StringType: - addlargs["grp"]=[addlargs["grp"]] - - if addlargs.has_key("grp/use"): - if type(addlargs["grp/use"])==types.StringType: - addlargs["grp/use"]=[addlargs["grp/use"]] - - for x in addlargs["grp"]: - self.required_values.append("grp/"+x+"/packages") - self.required_values.append("grp/"+x+"/type") - - generic_stage_target.__init__(self,spec,addlargs) - - def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): - print "Resume point detected, skipping target path setup operation..." - else: - # first clean up any existing target stuff - #if os.path.isdir(self.settings["target_path"]): - #cmd("rm -rf "+self.settings["target_path"], - #"Could not remove existing directory: "+self.settings["target_path"],env=self.env) - if not os.path.exists(self.settings["target_path"]): - os.makedirs(self.settings["target_path"]) - - touch(self.settings["autoresume_path"]+"setup_target_path") - - def run_local(self): - for pkgset in self.settings["grp"]: - # example call: "grp.sh run pkgset cd1 xmms vim sys-apps/gleep" - mypackages=list_bashify(self.settings["grp/"+pkgset+"/packages"]) - try: - cmd("/bin/bash "+self.settings["controller_file"]+" run "+self.settings["grp/"+pkgset+"/type"]\ - +" "+pkgset+" "+mypackages,env=self.env) - - except CatalystError: - self.unbind() - raise CatalystError,"GRP build aborting due to error." - - def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): - if type(self.settings["pkgcache_path"]) != types.StringType: - self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: - generic_stage_target.set_pkgcache_path(self) - - def set_use(self): - generic_stage_target.set_use(self) - if self.settings.has_key("use"): - self.settings["use"].append("bindist") - else: - self.settings["use"]=["bindist"] - - def set_mounts(self): - self.mounts.append("/tmp/grp") - self.mountmap["/tmp/grp"]=self.settings["target_path"] - - def generate_digests(self): - for pkgset in self.settings["grp"]: - if self.settings["grp/"+pkgset+"/type"] == "pkgset": - destdir=normpath(self.settings["target_path"]+"/"+pkgset+"/All") - print "Digesting files in the pkgset....." - digests=glob.glob(destdir+'/*.DIGESTS') - for i in digests: - if os.path.exists(i): - os.remove(i) - - files=os.listdir(destdir) - #ignore files starting with '.' using list comprehension - files=[filename for filename in files if filename[0] != '.'] - for i in files: - if os.path.isfile(normpath(destdir+"/"+i)): - self.gen_digest_file(normpath(destdir+"/"+i)) - else: - destdir=normpath(self.settings["target_path"]+"/"+pkgset) - print "Digesting files in the srcset....." - - digests=glob.glob(destdir+'/*.DIGESTS') - for i in digests: - if os.path.exists(i): - os.remove(i) - - files=os.listdir(destdir) - #ignore files starting with '.' using list comprehension - files=[filename for filename in files if filename[0] != '.'] - for i in files: - if os.path.isfile(normpath(destdir+"/"+i)): - self.gen_digest_file(normpath(destdir+"/"+i)) - - - def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","run_local","unbind",\ - "generate_digests","clear_autoresume"] - -def register(foo): - foo.update({"grp":grp_target}) - return foo diff --git a/src/catalyst/modules/livecd_stage1_target.py b/src/catalyst/modules/livecd_stage1_target.py deleted file mode 100644 index 0e5fe2a025..0000000000 --- a/src/catalyst/modules/livecd_stage1_target.py +++ /dev/null @@ -1,68 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/livecd_stage1_target.py,v 1.29 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for LiveCD stage1. -""" - -from catalyst_support import * -from generic_stage_target import * - -class livecd_stage1_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=["livecd/packages"] - self.valid_values=self.required_values[:] - - self.valid_values.extend(["livecd/use"]) - generic_stage_target.__init__(self,spec,addlargs) - - def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","build_packages",\ - "unbind", "clean","clear_autoresume"] - def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): - print "Resume point detected, skipping target path setup operation..." - else: - # first clean up any existing target stuff - if os.path.exists(self.settings["target_path"]): - cmd("rm -rf "+self.settings["target_path"],\ - "Could not remove existing directory: "+self.settings["target_path"],env=self.env) - touch(self.settings["autoresume_path"]+"setup_target_path") - - if not os.path.exists(self.settings["target_path"]): - os.makedirs(self.settings["target_path"]) - - - def set_target_path(self): - pass - def set_spec_prefix(self): - self.settings["spec_prefix"]="livecd" - - def set_use(self): - generic_stage_target.set_use(self) - if self.settings.has_key("use"): - self.settings["use"].append("livecd") - else: - self.settings["use"]=["livecd"] - - def set_packages(self): - generic_stage_target.set_packages(self) - if self.settings.has_key(self.settings["spec_prefix"]+"/packages"): - if type(self.settings[self.settings["spec_prefix"]+"/packages"]) == types.StringType: - self.settings[self.settings["spec_prefix"]+"/packages"] = \ - self.settings[self.settings["spec_prefix"]+"/packages"].split() - self.settings[self.settings["spec_prefix"]+"/packages"].append("app-misc/livecd-tools") - - def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): - if type(self.settings["pkgcache_path"]) != types.StringType: - self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: - generic_stage_target.set_pkgcache_path(self) - -def register(foo): - foo.update({"livecd-stage1":livecd_stage1_target}) - return foo diff --git a/src/catalyst/modules/livecd_stage2_target.py b/src/catalyst/modules/livecd_stage2_target.py deleted file mode 100644 index 8def5709f0..0000000000 --- a/src/catalyst/modules/livecd_stage2_target.py +++ /dev/null @@ -1,136 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/livecd_stage2_target.py,v 1.62 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for a LiveCD stage2 build. -""" - -import os,string,types,stat,shutil -from catalyst_support import * -from generic_stage_target import * - -class livecd_stage2_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=["boot/kernel"] - - self.valid_values=[] - - self.valid_values.extend(self.required_values) - self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm",\ - "livecd/unmerge","livecd/iso","livecd/gk_mainargs","livecd/type",\ - "livecd/readme","livecd/motd","livecd/overlay",\ - "livecd/modblacklist","livecd/splash_theme","livecd/splash_type",\ - "livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\ - "livecd/root_overlay","livecd/devmanager","livecd/users",\ - "portage_overlay","livecd/cdfstype","livecd/fstype","livecd/fsops",\ - "livecd/linuxrc","livecd/bootargs","gamecd/conf","livecd/xdm",\ - "livecd/xsession","livecd/volid"]) - - generic_stage_target.__init__(self,spec,addlargs) - if not self.settings.has_key("livecd/type"): - self.settings["livecd/type"] = "generic-livecd" - - file_locate(self.settings, ["cdtar","controller_file"]) - - def set_source_path(self): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") - if os.path.isfile(self.settings["source_path"]): - self.settings["source_path_hash"]=generate_hash(self.settings["source_path"]) - else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/") - if not os.path.exists(self.settings["source_path"]): - raise CatalystError,"Source Path: "+self.settings["source_path"]+" does not exist." - - def set_spec_prefix(self): - self.settings["spec_prefix"]="livecd" - - def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): - print "Resume point detected, skipping target path setup operation..." - else: - # first clean up any existing target stuff - if os.path.isdir(self.settings["target_path"]): - cmd("rm -rf "+self.settings["target_path"], - "Could not remove existing directory: "+self.settings["target_path"],env=self.env) - touch(self.settings["autoresume_path"]+"setup_target_path") - if not os.path.exists(self.settings["target_path"]): - os.makedirs(self.settings["target_path"]) - - def run_local(self): - # what modules do we want to blacklist? - if self.settings.has_key("livecd/modblacklist"): - try: - myf=open(self.settings["chroot_path"]+"/etc/hotplug/blacklist","a") - except: - self.unbind() - raise CatalystError,"Couldn't open "+self.settings["chroot_path"]+"/etc/hotplug/blacklist." - - myf.write("\n#Added by Catalyst:") - for x in self.settings["livecd/modblacklist"]: - myf.write("\n"+x) - myf.close() - - def unpack(self): - unpack=True - - clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack") - - if os.path.isdir(self.settings["source_path"]): - unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] - display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." - invalid_snapshot=False - - if self.settings.has_key("AUTORESUME"): - if os.path.isdir(self.settings["source_path"]) and \ - os.path.exists(self.settings["autoresume_path"]+"unpack"): - print "Resume point detected, skipping unpack operation..." - unpack=False - elif self.settings.has_key("source_path_hash"): - if self.settings["source_path_hash"] != clst_unpack_hash: - invalid_snapshot=True - - if unpack: - self.mount_safety_check() - if invalid_snapshot: - print "No Valid Resume point detected, cleaning up ..." - #os.remove(self.settings["autoresume_path"]+"dir_setup") - self.clear_autoresume() - self.clear_chroot() - #self.dir_setup() - - if not os.path.exists(self.settings["chroot_path"]): - os.makedirs(self.settings["chroot_path"]) - - if not os.path.exists(self.settings["chroot_path"]+"/tmp"): - os.makedirs(self.settings["chroot_path"]+"/tmp",1777) - - if self.settings.has_key("PKGCACHE"): - if not os.path.exists(self.settings["pkgcache_path"]): - os.makedirs(self.settings["pkgcache_path"],0755) - - print display_msg - cmd(unpack_cmd,error_msg,env=self.env) - - if self.settings.has_key("source_path_hash"): - myf=open(self.settings["autoresume_path"]+"unpack","w") - myf.write(self.settings["source_path_hash"]) - myf.close() - else: - touch(self.settings["autoresume_path"]+"unpack") - - - def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","run_local",\ - "build_kernel","bootloader","preclean","livecd_update", - "root_overlay","fsscript","rcupdate","unmerge",\ - "unbind","remove","empty","target_setup",\ - "setup_overlay","create_iso","clear_autoresume"] - -def register(foo): - foo.update({"livecd-stage2":livecd_stage2_target}) - return foo diff --git a/src/catalyst/modules/netboot2_target.py b/src/catalyst/modules/netboot2_target.py deleted file mode 100644 index e6b49ee97e..0000000000 --- a/src/catalyst/modules/netboot2_target.py +++ /dev/null @@ -1,126 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/netboot2_target.py,v 1.4 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for a netboot build, version 2 -""" - -import os,string,types -from catalyst_support import * -from generic_stage_target import * - -class netboot2_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=[ - "boot/kernel", - "netboot2/builddate", - "netboot2/packages", - "netboot2/use" - ] - self.valid_values=self.required_values[:] - self.valid_values.extend(self.required_values) - self.valid_values.extend(["netboot2/extra_files"]) - - try: - if addlargs.has_key("netboot2/packages"): - if type(addlargs["netboot2/packages"]) == types.StringType: - loopy=[addlargs["netboot2/packages"]] - else: - loopy=addlargs["netboot2/packages"] - - for x in loopy: - self.valid_values.append("netboot2/packages/"+x+"/files") - except: - raise CatalystError,"configuration error in netboot2/packages." - - - - generic_stage_target.__init__(self,spec,addlargs) - self.set_build_kernel_vars() - - # Merge packages into the buildroot, and pick out certain files to place in - # /tmp/image - self.settings["merge_path"]=normpath("/tmp/image") - - def set_dest_path(self): - if self.settings.has_key("merge_path"): - self.settings["destpath"]=normpath(self.settings["chroot_path"]+self.settings["merge_path"]) - else: - self.settings["destpath"]=normpath(self.settings["chroot_path"]) - - def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+\ - self.settings["target_subpath"]+"/") - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): - print "Resume point detected, skipping target path setup operation..." - else: - # first clean up any existing target stuff - if os.path.isfile(self.settings["target_path"]): - cmd("rm -f "+self.settings["target_path"], \ - "Could not remove existing file: "+self.settings["target_path"],env=self.env) - touch(self.settings["autoresume_path"]+"setup_target_path") - - if not os.path.exists(self.settings["storedir"]+"/builds/"): - os.makedirs(self.settings["storedir"]+"/builds/") - - def copy_files_to_image(self): - # copies specific files from the buildroot to merge_path - myfiles=[] - - # check for autoresume point - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"copy_files_to_image"): - print "Resume point detected, skipping target path setup operation..." - else: - if self.settings.has_key("netboot2/packages"): - if type(self.settings["netboot2/packages"]) == types.StringType: - loopy=[self.settings["netboot2/packages"]] - else: - loopy=self.settings["netboot2/packages"] - - for x in loopy: - if self.settings.has_key("netboot2/packages/"+x+"/files"): - if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType: - myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) - else: - myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) - - if self.settings.has_key("netboot2/extra_files"): - if type(self.settings["netboot2/extra_files"]) == types.ListType: - myfiles.extend(self.settings["netboot2/extra_files"]) - else: - myfiles.append(self.settings["netboot2/extra_files"]) - - try: - cmd("/bin/bash "+self.settings["controller_file"]+\ - " image " + list_bashify(myfiles),env=self.env) - except CatalystError: - self.unbind() - raise CatalystError,"Failed to copy files to image!" - - touch(self.settings["autoresume_path"]+"copy_files_to_image") - - - def move_kernels(self): - # we're done, move the kernels to builds/* - # no auto resume here as we always want the - # freshest images moved - try: - cmd("/bin/bash "+self.settings["controller_file"]+\ - " final",env=self.env) - print ">>> Netboot Build Finished!" - except CatalystError: - self.unbind() - raise CatalystError,"Failed to move kernel images!" - - - def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", - "setup_confdir","bind","chroot_setup",\ - "setup_environment","build_packages","root_overlay",\ - "copy_files_to_image","build_kernel","move_kernels",\ - "unbind","clean","clear_autoresume"] - -def register(foo): - foo.update({"netboot2":netboot2_target}) - return foo diff --git a/src/catalyst/modules/netboot_target.py b/src/catalyst/modules/netboot_target.py deleted file mode 100644 index eb977f6bef..0000000000 --- a/src/catalyst/modules/netboot_target.py +++ /dev/null @@ -1,133 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/netboot_target.py,v 1.13 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for a netboot build. -""" - -import os,string,types -from catalyst_support import * -from generic_stage_target import * - -class netboot_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.valid_values = [ - "netboot/kernel/sources", - "netboot/kernel/config", - "netboot/kernel/prebuilt", - - "netboot/busybox_config", - - "netboot/extra_files", - "netboot/packages" - ] - self.required_values=[] - - try: - if addlargs.has_key("netboot/packages"): - if type(addlargs["netboot/packages"]) == types.StringType: - loopy=[addlargs["netboot/packages"]] - else: - loopy=addlargs["netboot/packages"] - - # for x in loopy: - # self.required_values.append("netboot/packages/"+x+"/files") - except: - raise CatalystError,"configuration error in netboot/packages." - - - - - generic_stage_target.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) - if addlargs.has_key("netboot/busybox_config"): - file_locate(self.settings, ["netboot/busybox_config"]) - - # Custom Kernel Tarball --- use that instead ... - - # unless the user wants specific CFLAGS/CXXFLAGS, let's use -Os - - for envvar in "CFLAGS", "CXXFLAGS": - if not os.environ.has_key(envvar) and not addlargs.has_key(envvar): - self.settings[envvar] = "-Os -pipe" - - - def set_root_path(self): - # ROOT= variable for emerges - self.settings["root_path"]=normpath("/tmp/image") - print "netboot root path is "+self.settings["root_path"] - -# def build_packages(self): -# # build packages -# if self.settings.has_key("netboot/packages"): -# mypack=list_bashify(self.settings["netboot/packages"]) -# try: -# cmd("/bin/bash "+self.settings["controller_file"]+" packages "+mypack,env=self.env) -# except CatalystError: -# self.unbind() -# raise CatalystError,"netboot build aborting due to error." - - def build_busybox(self): - # build busybox - if self.settings.has_key("netboot/busybox_config"): - mycmd = self.settings["netboot/busybox_config"] - else: - mycmd = "" - try: - cmd("/bin/bash "+self.settings["controller_file"]+" busybox "+ mycmd,env=self.env) - except CatalystError: - self.unbind() - raise CatalystError,"netboot build aborting due to error." - - - def copy_files_to_image(self): - # create image - myfiles=[] - if self.settings.has_key("netboot/packages"): - if type(self.settings["netboot/packages"]) == types.StringType: - loopy=[self.settings["netboot/packages"]] - else: - loopy=self.settings["netboot/packages"] - - for x in loopy: - if self.settings.has_key("netboot/packages/"+x+"/files"): - if type(self.settings["netboot/packages/"+x+"/files"]) == types.ListType: - myfiles.extend(self.settings["netboot/packages/"+x+"/files"]) - else: - myfiles.append(self.settings["netboot/packages/"+x+"/files"]) - - if self.settings.has_key("netboot/extra_files"): - if type(self.settings["netboot/extra_files"]) == types.ListType: - myfiles.extend(self.settings["netboot/extra_files"]) - else: - myfiles.append(self.settings["netboot/extra_files"]) - - try: - cmd("/bin/bash "+self.settings["controller_file"]+\ - " image " + list_bashify(myfiles),env=self.env) - except CatalystError: - self.unbind() - raise CatalystError,"netboot build aborting due to error." - - - def create_netboot_files(self): - # finish it all up - try: - cmd("/bin/bash "+self.settings["controller_file"]+" finish",env=self.env) - except CatalystError: - self.unbind() - raise CatalystError,"netboot build aborting due to error." - - # end - print "netboot: build finished !" - - - def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot", - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","build_packages","build_busybox",\ - "build_kernel","copy_files_to_image",\ - "clean","create_netboot_files","unbind","clear_autoresume"] - -def register(foo): - foo.update({"netboot":netboot_target}) - return foo diff --git a/src/catalyst/modules/snapshot_target.py b/src/catalyst/modules/snapshot_target.py deleted file mode 100644 index aac82b0ac3..0000000000 --- a/src/catalyst/modules/snapshot_target.py +++ /dev/null @@ -1,74 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/snapshot_target.py,v 1.18 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for snapshots. -""" - -import os -from catalyst_support import * -from generic_stage_target import * - -class snapshot_target(generic_stage_target): - def __init__(self,myspec,addlargs): - self.required_values=["version_stamp","target"] - self.valid_values=["version_stamp","target","portdir_overlay"] - - generic_target.__init__(self,myspec,addlargs) - self.settings=myspec - self.settings["target_subpath"]="portage" - st=self.settings["storedir"] - self.settings["snapshot_path"]=normpath(st+"/snapshots/portage-"+self.settings["version_stamp"]\ - +".tar.bz2") - self.settings["tmp_path"]=normpath(st+"/tmp/"+self.settings["target_subpath"]) - if self.settings.has_key("portdir_overlay"): - print "\nWarning!!!!" - print "\tThis feature is deprecated no overlay will be added to the snapshot." - print "\tIf you need an overlay feature please use portage_overlay in the other spec files" - print "\tOtherwise add your files to the normal snapshot and redigest .. you should know what" - print "\t\tto do." - print "\tThis was removed due to digesting issues that are incompatible with portage." - - def setup(self): - x=normpath(self.settings["storedir"]+"/snapshots") - if not os.path.exists(x): - os.makedirs(x) - - def mount_safety_check(self): - pass - - def run(self): - self.setup() - print "Creating Portage tree snapshot "+self.settings["version_stamp"]+\ - " from "+self.settings["portdir"]+"..." - - mytmp=self.settings["tmp_path"] - if not os.path.exists(mytmp): - os.makedirs(mytmp) - - cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ "+\ - self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env) - - #if self.settings.has_key("portdir_overlay"): - #print "Adding Portage overlay to the snapshot..." - #cmd("rsync -a --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ "+\ - # self.settings["portdir_overlay"]+"/ "+mytmp+"/portage/","Snapshot/ overlay addition failure",\ - # env=self.env) - - print "Compressing Portage snapshot tarball..." - cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\ - "Snapshot creation failure",env=self.env) - - self.gen_digest_file(self.settings["snapshot_path"]) - - self.cleanup() - print "snapshot: complete!" - - def kill_chroot_pids(self): - pass - - def cleanup(self): - print "Cleaning up..." - -def register(foo): - foo.update({"snapshot":snapshot_target}) - return foo diff --git a/src/catalyst/modules/stage1_target.py b/src/catalyst/modules/stage1_target.py deleted file mode 100644 index c807c2a5c1..0000000000 --- a/src/catalyst/modules/stage1_target.py +++ /dev/null @@ -1,72 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/stage1_target.py,v 1.25 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for a stage1 installation tarball build. -""" - -from catalyst_support import * -from generic_stage_target import * - -class stage1_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=[] - self.valid_values=[] - generic_stage_target.__init__(self,spec,addlargs) - - def set_stage_path(self): - self.settings["stage_path"]=normpath(self.settings["chroot_path"]+self.settings["root_path"]) - print "stage1 stage path is "+self.settings["stage_path"] - - def set_root_path(self): - # sets the root path, relative to 'chroot_path', of the stage1 root - self.settings["root_path"]=normpath("/tmp/stage1root") - print "stage1 root path is "+self.settings["root_path"] - - def set_cleanables(self): - generic_stage_target.set_cleanables(self) - self.settings["cleanables"].extend(["/usr/share/gettext",\ - "/usr/lib/python2.2/test", "/usr/lib/python2.2/encodings",\ - "/usr/lib/python2.2/email", "/usr/lib/python2.2/lib-tk",\ - "/usr/lib/python2.3/test", "/usr/lib/python2.3/encodings",\ - "/usr/lib/python2.3/email", "/usr/lib/python2.3/lib-tk",\ - "/usr/lib/python2.4/test", "/usr/lib/python2.4/encodings",\ - "/usr/lib/python2.4/email", "/usr/lib/python2.4/lib-tk",\ - "/usr/share/zoneinfo"]) - - def override_chost(self): - if self.settings.has_key("chost"): - self.settings["CHOST"]=list_to_string(self.settings["chost"]) - - def override_cflags(self): - if self.settings.has_key("cflags"): - self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) - - def override_cxxflags(self): - if self.settings.has_key("cxxflags"): - self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) - - def override_ldflags(self): - if self.settings.has_key("ldflags"): - self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) - - def set_portage_overlay(self): - generic_stage_target.set_portage_overlay(self) - if self.settings.has_key("portage_overlay"): - print "\nWARNING !!!!!" - print "\tUsing an portage overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" - - def set_mounts(self): - # stage_path/proc probably doesn't exist yet, so create it - if not os.path.exists(self.settings["stage_path"]+"/proc"): - os.makedirs(self.settings["stage_path"]+"/proc") - - # alter the mount mappings to bind mount proc onto it - self.mounts.append("/tmp/stage1root/proc") - self.mountmap["/tmp/stage1root/proc"]="/proc" - - -def register(foo): - foo.update({"stage1":stage1_target}) - return foo diff --git a/src/catalyst/modules/stage2_target.py b/src/catalyst/modules/stage2_target.py deleted file mode 100644 index 241964e81c..0000000000 --- a/src/catalyst/modules/stage2_target.py +++ /dev/null @@ -1,61 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/stage2_target.py,v 1.15 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for a stage2 installation tarball build. -""" - -from catalyst_support import * -from generic_stage_target import * - -class stage2_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=[] - self.valid_values=[] - generic_stage_target.__init__(self,spec,addlargs) - def set_root_path(self): - # ROOT= variable for emerges - self.settings["root_path"]=normpath("/tmp/stage1root") - - def set_source_path(self): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/"+self.settings["root_path"]+"/") - - # reset the root path so the preclean doesnt fail - generic_stage_target.set_root_path(self) - - if os.path.isdir(self.settings["source_path"]): - print "\nUsing seed-stage from "+self.settings["source_path"] - print "Delete this folder if you wish to use a seed stage tarball instead\n" - else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") - if os.path.isfile(self.settings["source_path"]): - if os.path.exists(self.settings["source_path"]): - self.settings["source_path_hash"]=generate_hash(self.settings["source_path"]) - - def override_chost(self): - if self.settings.has_key("chost"): - self.settings["CHOST"]=list_to_string(self.settings["chost"]) - - def override_cflags(self): - if self.settings.has_key("cflags"): - self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) - - def override_cxxflags(self): - if self.settings.has_key("cxxflags"): - self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) - - def override_ldflags(self): - if self.settings.has_key("ldflags"): - self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) - - def set_portage_overlay(self): - generic_stage_target.set_portage_overlay(self) - if self.settings.has_key("portage_overlay"): - print "\nWARNING !!!!!" - print "\tUsing an portage overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" - - -def register(foo): - foo.update({"stage2":stage2_target}) - return foo diff --git a/src/catalyst/modules/stage3_target.py b/src/catalyst/modules/stage3_target.py deleted file mode 100644 index 7124c06519..0000000000 --- a/src/catalyst/modules/stage3_target.py +++ /dev/null @@ -1,26 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/stage3_target.py,v 1.7 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for a stage3 installation tarball build. -""" - -from catalyst_support import * -from generic_stage_target import * - -class stage3_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=[] - self.valid_values=[] - generic_stage_target.__init__(self,spec,addlargs) - - def set_portage_overlay(self): - generic_stage_target.set_portage_overlay(self) - if self.settings.has_key("portage_overlay"): - print "\nWARNING !!!!!" - print "\tUsing an overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" - -def register(foo): - foo.update({"stage3":stage3_target}) - return foo diff --git a/src/catalyst/modules/stage4_target.py b/src/catalyst/modules/stage4_target.py deleted file mode 100644 index 9600468b05..0000000000 --- a/src/catalyst/modules/stage4_target.py +++ /dev/null @@ -1,35 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/stage4_target.py,v 1.21 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -Builder class for stage4. -""" - -from catalyst_support import * -from generic_stage_target import * - -class stage4_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=["stage4/packages"] - self.valid_values=self.required_values[:] - self.valid_values.extend(["stage4/use","boot/kernel",\ - "stage4/root_overlay","stage4/fsscript",\ - "stage4/gk_mainargs","splash_theme","splash_type",\ - "portage_overlay","stage4/rcadd","stage4/rcdel",\ - "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) - generic_stage_target.__init__(self,spec,addlargs) - - def set_cleanables(self): - self.settings["cleanables"]=["/var/tmp/*","/tmp/*"] - - def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","build_packages",\ - "build_kernel","bootloader","root_overlay","fsscript",\ - "preclean","rcupdate","unmerge","unbind","remove","empty",\ - "clean","capture", "clear_autoresume"] - -def register(foo): - foo.update({"stage4":stage4_target}) - return foo - diff --git a/src/catalyst/modules/tinderbox_target.py b/src/catalyst/modules/tinderbox_target.py deleted file mode 100644 index 630d31e90d..0000000000 --- a/src/catalyst/modules/tinderbox_target.py +++ /dev/null @@ -1,48 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/tinderbox_target.py,v 1.19 2006/10/02 20:41:54 wolf31o2 Exp $ - -""" -builder class for the tinderbox target -""" - -from catalyst_support import * -from generic_stage_target import * - -class tinderbox_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=["tinderbox/packages"] - self.valid_values=self.required_values[:] - self.valid_values.extend(["tinderbox/use"]) - generic_stage_target.__init__(self,spec,addlargs) - - def run_local(self): - # tinderbox - # example call: "grp.sh run xmms vim sys-apps/gleep" - try: - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" run "+\ - list_bashify(self.settings["tinderbox/packages"]),"run script failed.",env=self.env) - - except CatalystError: - self.unbind() - raise CatalystError,"Tinderbox aborting due to error." - - def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): - if type(self.settings["pkgcache_path"]) != types.StringType: - self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: - generic_stage_target.set_pkgcache_path(self) - - def set_cleanables(self): - self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",\ - "/usr/portage"] - def set_action_sequence(self): - #Default action sequence for run method - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","run_local","preclean","unbind","clean",\ - "clear_autoresume"] - -def register(foo): - foo.update({"tinderbox":tinderbox_target}) - return foo diff --git a/src/catalyst/targets/embedded/embedded-chroot.sh b/src/catalyst/targets/embedded/embedded-chroot.sh deleted file mode 100644 index abb29758b4..0000000000 --- a/src/catalyst/targets/embedded/embedded-chroot.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded-chroot.sh,v 1.22 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup the environment -export FEATURES="${clst_myfeatures}" -#export clst_myemergeopts="${clst_myemergeopts} -O" -export USE="${clst_use}" -export DESTROOT=${clst_root_path} -export clst_root_path=/ - -run_emerge "${clst_myemergeopts}" -o "${clst_embedded_packages}" - -#export clst_myemergeopts="${clst_myemergeopts} -B" -#run_emerge "${clst_embedded_packages}" - -export clst_root_path=${DESTROOT} -export clst_myemergeopts="${clst_myemergeopts} -1 -O" -export INSTALL_MASK="${clst_install_mask}" - -run_emerge "${clst_embedded_packages}" diff --git a/src/catalyst/targets/embedded/embedded-controller.sh b/src/catalyst/targets/embedded/embedded-controller.sh deleted file mode 100644 index e5237bb0bd..0000000000 --- a/src/catalyst/targets/embedded/embedded-controller.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded-controller.sh,v 1.10 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -case ${1} in - enter) - ;; - - build_packages) - shift - export clst_packages="$*" - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - - preclean) - ;; - -# package) -# export root_fs_path="${clst_chroot_path}/tmp/mergeroot" -# install -d ${clst_image_path} - -# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \ -# ${clst_embedded_fs_type} || exit 1 -# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1` -# echo "Created ${clst_embedded_fs_type} image at \ -# ${clst_image_path}/root.img" -# echo "Image size: ${imagesize}k" -# ;; - - pre-kmerge) - # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - ;; - - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh - ;; - - kernel) - shift - export clst_kname="${1}" - # if we have our own linuxrc, copy it in - if [ -n "${clst_linuxrc}" ] - then - cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc - fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh - delete_from_chroot tmp/linuxrc - ;; - - target_image_setup) - shift - ${clst_sharedir}/targets/support/target_image_setup.sh ${1} - - ;; - livecd-update) - # Now, finalize and tweak the livecd fs (inside of the chroot) - exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh - ;; - - bootloader) - shift - # Here is where we poke in our identifier - touch ${1}/livecd - - ${clst_sharedir}/targets/support/bootloader-setup.sh ${1} - ;; - - iso) - shift - ${clst_sharedir}/targets/support/create-iso.sh ${1} - ;; - - clean) - ;; - - *) - ;; - -esac -exit $? diff --git a/src/catalyst/targets/embedded/embedded-fs-runscript.sh b/src/catalyst/targets/embedded/embedded-fs-runscript.sh deleted file mode 100644 index 8d5abab12a..0000000000 --- a/src/catalyst/targets/embedded/embedded-fs-runscript.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -die() { - echo "${1}" - exit 1 -} - -# 1 = mkfs path, 2 = fs name, 3 = pkg name -fs_check() { - if [ ! -e ${1} ]; then - die "You must install ${3} in order to produce ${2} images" - fi -} - -case ${1} in - jffs) - fs_check /usr/sbin/mkfs.jffs jffs sys-fs/mtd - mkfs.jffs -d ${root_fs_path} -o ${clst_image_path}/root.img \ - ${clst_embedded_fs_ops} || die "Could not create a jffs filesystem" - ;; - jffs2) - fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd - mkfs.jffs2 --root=${root_fs_path} --output=${clst_image_path}/root.img\ - ${clst_embedded_fs_ops} || die "Could not create a jffs2 filesystem" - ;; - - cramfs) - fs_check /sbin/mkcramfs cramfs sys-fs/cramfs - mkcramfs ${clst_embedded_fs_ops} ${root_fs_path} \ - ${clst_image_path}/root.img || \ - die "Could not create a cramfs filesystem" - ;; - - squashfs) - fs_check /usr/bin/mksquashfs squashfs sys-fs/squashfs-tools - mksquashfs ${root_fs_path} ${clst_image_path}/root.img \ - ${clst_embedded_fs_ops} || \ - die "Could not create a squashfs filesystem" - ;; - - *) - ;; -esac -exit $? diff --git a/src/catalyst/targets/embedded/embedded-preclean-chroot.sh b/src/catalyst/targets/embedded/embedded-preclean-chroot.sh deleted file mode 100644 index 99318c8198..0000000000 --- a/src/catalyst/targets/embedded/embedded-preclean-chroot.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded-preclean-chroot.sh,v 1.10 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh -update_env_settings - -cleanup_distcc diff --git a/src/catalyst/targets/embedded/unmerge.sh b/src/catalyst/targets/embedded/unmerge.sh deleted file mode 100644 index 4d55b81a8b..0000000000 --- a/src/catalyst/targets/embedded/unmerge.sh +++ /dev/null @@ -1,5 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/unmerge.sh,v 1.4 2006/10/02 20:41:54 wolf31o2 Exp $ - -${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF - ROOT=/tmp/mergeroot emerge -C $* || exit 1 -EOF diff --git a/src/catalyst/targets/grp/grp-chroot.sh b/src/catalyst/targets/grp/grp-chroot.sh deleted file mode 100644 index 3802340015..0000000000 --- a/src/catalyst/targets/grp/grp-chroot.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-chroot.sh,v 1.26 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -[ -f /tmp/envscript ] && source /tmp/envscript - -setup_myfeatures - -# Setup the environment -export FEATURES="${clst_myfeatures}" -## START BUILD -setup_portage - -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" - -unset DISTDIR - -# Don't grab MS core fonts, etc. -export USE="${USE} ${clst_use}" - -if [ "${clst_grp_type}" = "pkgset" ] -then - unset DISTDIR - export PKGDIR="/tmp/grp/${clst_grp_target}" - - if [ -n "${clst_FETCH}" ] - then - export clst_myemergeopts="${clst_myemergeopts} -f" - fi - - if [ -n "${clst_VERBOSE}" ] - then - emerge --usepkg --buildpkg --noreplace --newuse -vp \ - ${clst_myemergeopts} ${clst_grp_packages} || exit 1 - echo "Press any key within 15 seconds to pause the build..." - read -s -t 15 -n 1 - if [ $? -eq 0 ] - then - echo "Press any key to continue..." - read -s -n 1 - fi - fi - emerge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} \ - ${clst_grp_packages} || exit 1 -else - DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly \ - ${clst_grp_packages} || exit 1 - unset PKGDIR -fi diff --git a/src/catalyst/targets/grp/grp-controller.sh b/src/catalyst/targets/grp/grp-controller.sh deleted file mode 100644 index 8d8fe1358c..0000000000 --- a/src/catalyst/targets/grp/grp-controller.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-controller.sh,v 1.5 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -case $1 in - enter) - ${clst_CHROOT} ${clst_chroot_path} - ;; - run) - shift - export clst_grp_type=$1 - shift - export clst_grp_target=$1 - shift - - export clst_grp_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh - ;; - - preclean) - exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh - ;; - - clean) - exit 0 - ;; - - *) - exit 1 - ;; - -esac -exit $? diff --git a/src/catalyst/targets/grp/grp-preclean-chroot.sh b/src/catalyst/targets/grp/grp-preclean-chroot.sh deleted file mode 100644 index d332918a31..0000000000 --- a/src/catalyst/targets/grp/grp-preclean-chroot.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-preclean-chroot.sh,v 1.11 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh -update_env_settings -cleanup_distcc - -gconftool-2 --shutdown diff --git a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh b/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh deleted file mode 100644 index 7b1e94b843..0000000000 --- a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.24 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup the environment - -export FEATURES="${clst_myfeatures}" - -## START BUILD -setup_portage - -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" -export USE="${clst_use}" - -run_emerge "${clst_packages}" diff --git a/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh b/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh deleted file mode 100644 index 7ebb18db82..0000000000 --- a/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh +++ /dev/null @@ -1,20 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-controller.sh,v 1.12 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -## START RUNSCRIPT - -case $1 in - build_packages) - shift - export clst_packages="$*" - mkdir -p ${clst_chroot_path}/usr/livecd - echo "${clst_packages}" > ${clst_chroot_path}/usr/livecd/grppkgs.txt - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - clean) - find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \; - ;; -esac -exit $? diff --git a/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh deleted file mode 100644 index 2a6f8b0532..0000000000 --- a/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-preclean-chroot.sh,v 1.9 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh -update_env_settings -cleanup_distcc diff --git a/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh b/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh deleted file mode 100644 index ba93d01cb2..0000000000 --- a/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh +++ /dev/null @@ -1,141 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/livecd-stage2-controller.sh,v 1.24 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -case $1 in - pre-kmerge) - # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh - ;; - kernel) - shift - export clst_kname="$1" - - # if we have our own linuxrc, copy it in - if [ -n "${clst_linuxrc}" ] - then - cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc - fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh - delete_from_chroot tmp/linuxrc - - extract_modules ${clst_chroot_path} ${clst_kname} - #16:12 <@solar> kernel_name=foo - #16:13 <@solar> eval clst_boot_kernel_${kernel_name}_config=bar - #16:13 <@solar> eval echo \$clst_boot_kernel_${kernel_name}_config - ;; - - preclean) - # Move over the motd (if applicable) - if [ -n "${clst_livecd_motd}" ] - then - case ${clst_livecd_type} in - gentoo-*) - echo "Using livecd/motd is not supported with livecd/type" - echo "${clst_livecd_type}. You should switch to using" - echo "generic-livecd instead." - cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ - ${clst_sharedir}/livecd/files/universal.motd.txt \ - ${clst_sharedir}/livecd/files/minimal.motd.txt \ - ${clst_sharedir}/livecd/files/livecd.motd.txt \ - ${clst_sharedir}/livecd/files/gamecd.motd.txt \ - ${clst_chroot_path}/etc - ;; - *) - cp -pPR ${clst_livecd_motd} ${clst_chroot_path}/etc/motd - ;; - esac - elif [ "${clst_livecd_type}" != "generic-livecd" ] - then - cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ - ${clst_sharedir}/livecd/files/universal.motd.txt \ - ${clst_sharedir}/livecd/files/minimal.motd.txt \ - ${clst_sharedir}/livecd/files/livecd.motd.txt \ - ${clst_sharedir}/livecd/files/gamecd.motd.txt \ - ${clst_chroot_path}/etc - fi - - # move over the environment - cp -f ${clst_sharedir}/livecd/files/livecd-bashrc \ - ${clst_chroot_path}/root/.bashrc - cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \ - ${clst_chroot_path}/root/.bash_profile - cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ - ${clst_chroot_path}/etc/conf.d/local.start - - # execute copy gamecd.conf if we're a gamecd - if [ "${clst_livecd_type}" = "gentoo-gamecd" ] - then - if [ -n "${clst_gamecd_conf}" ] - then - cp -f ${clst_gamecd_conf} ${clst_chroot_path}/tmp/gamecd.conf - else - echo "gamecd/conf is required for a gamecd!" - exit 1 - fi - fi - ;; - livecd-update) - # Now, finalize and tweak the livecd fs (inside of the chroot) - exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh - - # Move over the xinitrc (if applicable) - # This is moved here, so we can override any default xinitrc - if [ -n "${clst_livecd_xinitrc}" ] - then - cp -f ${clst_livecd_xinitrc} \ - ${clst_chroot_path}/etc/X11/xinit/xinitrc - fi - ;; - rc-update) - exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh - ;; - fsscript) - exec_in_chroot ${clst_fsscript} - ;; - clean) - find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \; - ;; - bootloader) - shift - # Here is where we poke in our identifier - touch $1/livecd - - # Move over the readme (if applicable) - if [ -n "${clst_livecd_readme}" ] - then - cp -f ${clst_livecd_readme} $1/README.txt - else - cp -f ${clst_sharedir}/livecd/files/README.txt $1 - fi - - # Move over Getting_Online.txt for minimal/GameCD - if [ "${clst_livecd_type}" = "gentoo-gamecd" ] \ - || [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \ - || [ "${clst_livecd_type}" = "gentoo-release-livecd" ] - then - cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1 - fi - - ${clst_sharedir}/targets/support/bootloader-setup.sh $1 - ;; - unmerge) - shift - export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh - ;; - target_image_setup) - shift - ${clst_sharedir}/targets/support/target_image_setup.sh $1 - ;; - iso) - shift - ${clst_sharedir}/targets/support/create-iso.sh $1 - ;; -esac -exit $? diff --git a/src/catalyst/targets/netboot/netboot-chroot.sh b/src/catalyst/targets/netboot/netboot-chroot.sh deleted file mode 100644 index 3e0bf1c1ab..0000000000 --- a/src/catalyst/targets/netboot/netboot-chroot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-chroot.sh,v 1.6 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup our environment -export FEATURES="${clst_myfeatures}" -export USE_ORDER="env:pkg:conf:defaults" - -# START BUILD - -run_emerge ${clst_myemergeopts} ${clst_packages} diff --git a/src/catalyst/targets/netboot/netboot-combine.sh b/src/catalyst/targets/netboot/netboot-combine.sh deleted file mode 100644 index 163883571c..0000000000 --- a/src/catalyst/targets/netboot/netboot-combine.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-combine.sh,v 1.8 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/chroot-functions.sh -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Ssetup our environment -export FEATURES="${clst_myfeatures}" - -# First install the boot package that we need -booter="" -case ${clst_mainarch} in - alpha) - booter="" - ;; - arm) - booter="" - ;; - hppa) - booter=palo - ;; - sparc*) - booter=sparc-utils - ;; - x86|amd64) - booter=netboot - ;; - *) - exit 1 - ;; -esac - -#if [ ! -z "${booter}" ] ; then -# run_emerge ${booter} || exit 1 -#fi - -extract_kernels ${clst_chroot_path}/tmp - -# Then generate the netboot image ! :D -for kname in ${clst_boot_kernel} -do - mkdir -p ${clst_chroot_path}/tmp/staging/initrd-${kname} - cp -r ${clst_chroot_path}/tmp/image ${clst_chroot_path}/tmp/staging/initrd-${kname} - extract_modules ${clst_chroot_path}/tmp/staging/initrd-${kname} ${kname} - create_normal_loop ${clst_chroot_path}/tmp/staging/initrd-${kname} ${clst_target_path} initrd-${kname}.igz - rm -r ${clst_chroot_path}/tmp/staging/initrd-${kname} - - case ${clst_mainarch} in - alpha) - # Until aboot is patched this is broken currently. - # please use catalyst 1.1.5 or older - - #TEST TEST TEST TEST - #http://lists.debian.org/debian-alpha/2004/07/msg00094.html - #make \ - # -C /usr/src/linux \ - # INITRD=/initrd.gz \ - # HPATH="/usr/src/linux/include" \ - # vmlinux bootpfile \ - # || exit 1 - #cp /usr/src/linux/arch/alpha/boot/bootpfile /netboot.alpha || exit 1 - ;; - arm) - #TEST TEST TEST TEST - cp /${clst_chroot_path}/tmp/${kname} /netboot-${kname}.arm || exit 1 - cat /${clst_target_path}/initrd-${kname}.igz >> /${clst_target_path}/netboot-${kname}.arm || exit 1 - #make \ - # -C /usr/src/linux \ - # INITRD=/initrd.gz \ - # bootpImage \ - # || exit 1 - ;; - hppa) - # We have to remove the previous image because the file is - # considered as a tape by palo and then not truncated but rewritten. - #TEST TEST TEST TEST - rm -f /netboot-${kname}.hppa - - palo \ - -k /${clst_chroot_path}/tmp/${kname} \ - -r /${clst_target_path}/initrd-${kname}.igz \ - -s /${clst_target_path}/netboot-${kname}.hppa \ - -f foo \ - -b /usr/share/palo/iplboot \ - -c "0/vmlinux root=/dev/ram0 ${cmdline_opts}" \ - || exit 1 - ;; - sparc*) - #TEST TEST TEST TEST - #elftoaout -o /netboot-${kname}.${clst_mainarch} /usr/src/linux/vmlinux - #elftoaout -o /netboot-${kname}.${clst_mainarch} /${kname} - #piggy=${clst_mainarch/sparc/piggyback} - #${piggy} /netboot-${kname}.${clst_mainarch} /usr/src/linux/System.map /initrd-${kname}.igz - ;; - x86) - mknbi-linux \ - -k /${clst_chroot_path}/tmp/${kname} \ - -r /${clst_target_path}/initrd-${kname}.igz \ - -o /${clst_target_path}/netboot-${kname}.x86 \ - -x \ - -a "root=/dev/ram0 ${cmdline_opts}" \ - || exit 1 - ;; - *) - exit 1 - ;; - esac -done diff --git a/src/catalyst/targets/netboot/netboot-controller.sh b/src/catalyst/targets/netboot/netboot-controller.sh deleted file mode 100644 index 5a7944ce92..0000000000 --- a/src/catalyst/targets/netboot/netboot-controller.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-controller.sh,v 1.10 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - - -case ${1} in - #### Couldnt busybox step be in packages .... - build_packages) - shift - clst_root_path="/" \ - clst_packages="$*" \ - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - busybox) - # Custom busybox config support - if [ -f "${clst_netboot_busybox_config}" ] - then - mkdir -p ${clst_chroot_path}/etc/busybox/${clst_CHOST} - cp -v ${clst_netboot_busybox_config} \ - ${clst_chroot_path}/etc/busybox/${clst_CHOST}/busybox.config - clst_use="savedconfig" - fi - - # Main Busybox emerge - clst_root_path="/" \ - clst_use="${clst_use} netboot make-busybox-symlinks" \ - clst_myemergeopts="${clst_myemergeopts} -O" \ - clst_packages="busybox" \ - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - pre-kmerge) - # Sets up the build environment before any kernels are compiled - #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh - ;; - kernel) - shift - export clst_kname="$1" - export clst_root_path="/" - #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh - #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh - #extract_kernels kernels - ;; - image) - #Creates the base initrd image for the netboot - shift - # Could this step be a parameter in case there is a different - # baselayout to add??? - clst_myemergeopts="${clst_myemergeopts} --nodeps" \ - clst_packages="netboot-base" \ - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - - clst_files="${@}" \ - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh - ;; - finish) - ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh - ;; - clean) - exit 0;; - *) - exit 1;; -esac - -exit $? diff --git a/src/catalyst/targets/netboot/netboot-image.sh b/src/catalyst/targets/netboot/netboot-image.sh deleted file mode 100644 index aa211479cb..0000000000 --- a/src/catalyst/targets/netboot/netboot-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-image.sh,v 1.8 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -echo "Copying files to ${clst_root_path}" -clst_files="/bin/busybox ${clst_files} " -for f in ${clst_files} -do - copy_file ${f} -done -echo "Done copying files" diff --git a/src/catalyst/targets/netboot2/netboot2-controller.sh b/src/catalyst/targets/netboot2/netboot2-controller.sh deleted file mode 100644 index db99efabdc..0000000000 --- a/src/catalyst/targets/netboot2/netboot2-controller.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot2/Attic/netboot2-controller.sh,v 1.2 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -case ${1} in - build_packages) - echo ">>> Building packages ..." - shift - clst_root_path="/" \ - clst_packages="$*" \ - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh - ;; - pre-kmerge) - # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh - ;; - kernel) - shift - export clst_kname="$1" - - # if we have our own linuxrc, copy it in - if [ -n "${clst_linuxrc}" ] - then - cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc - fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh - delete_from_chroot tmp/linuxrc - - extract_modules ${clst_chroot_path} ${clst_kname} - #16:12 <@solar> kernel_name=foo - #16:13 <@solar> eval clst_boot_kernel_${kernel_name}_config=bar - #16:13 <@solar> eval echo \$clst_boot_kernel_${kernel_name}_config - ;; - image) - # Creates the base initramfs image for the netboot - echo -e ">>> Preparing Image ..." - shift - - # Copy remaining files over to the initramfs target - clst_files="${@}" \ - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh - ;; - final) - # For each arch, fetch the kernel images and put them in builds/ - echo -e ">>> Copying completed kernels to ${clst_target_path} ..." - ${clst_sharedir}/targets/support/netboot2-final.sh - ;; - clean) - exit 0;; - *) - exit 1;; -esac - -exit $? diff --git a/src/catalyst/targets/netboot2/netboot2-copyfile.sh b/src/catalyst/targets/netboot2/netboot2-copyfile.sh deleted file mode 100644 index a9a2b5930e..0000000000 --- a/src/catalyst/targets/netboot2/netboot2-copyfile.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot2/Attic/netboot2-copyfile.sh,v 1.4 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -echo ">>> Copying initramfs files to ${clst_merge_path} (in chroot) ..." -[ ! -d "${clst_merge_path}" ] && mkdir -p ${clst_merge_path} -for f in ${clst_files} -do - # copy it to the merge path - cp -pPRf --parents ${f} ${clst_merge_path} - - # if the file is an ELF binary, strip unneeded stuff from it - if [ -x "${f}" ] && [ ! -L "${f}" ]; then - if [ "$(head -c 4 ${f} 2>/dev/null | tail -c 3)" = "ELF" ]; then - strip -R .comment -R .note ${clst_merge_path}${f} - fi - fi -done -echo "" diff --git a/src/catalyst/targets/netboot2/netboot2-pkg.sh b/src/catalyst/targets/netboot2/netboot2-pkg.sh deleted file mode 100644 index 8812dec4cb..0000000000 --- a/src/catalyst/targets/netboot2/netboot2-pkg.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot2/Attic/netboot2-pkg.sh,v 1.2 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup our environment -export FEATURES="${clst_myfeatures}" -export USE_ORDER="env:pkg:conf:defaults" - -# START BUILD - -run_emerge ${clst_myemergeopts} ${clst_packages} diff --git a/src/catalyst/targets/stage1/build.py b/src/catalyst/targets/stage1/build.py deleted file mode 100644 index bd7d18ceb1..0000000000 --- a/src/catalyst/targets/stage1/build.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/build.py,v 1.5 2006/10/02 20:41:54 wolf31o2 Exp $ - -import os,portage,sys - -# this loads files from the profiles ... -# wrap it here to take care of the different -# ways portage handles stacked profiles -# last case is for portage-2.1_pre* -def scan_profile(file): - if "grab_stacked" in dir(portage): - return portage.grab_stacked(file, portage.settings.profiles, portage.grabfile, incremental_lines=1); - else: - if "grab_multiple" in dir(portage): - return portage.stack_lists( portage.grab_multiple(file, portage.settings.profiles, portage.grabfile), incremental=1); - else: - return portage.stack_lists( [portage.grabfile_package(os.path.join(x, file)) for x in portage.settings.profiles], incremental=1); - -# loaded the stacked packages / packages.build files -pkgs = scan_profile("packages") -buildpkgs = scan_profile("packages.build") - -# go through the packages list and strip off all the -# crap to get just the <category>/<package> ... then -# search the buildpkg list for it ... if it's found, -# we replace the buildpkg item with the one in the -# system profile (it may have <,>,=,etc... operators -# and version numbers) -for idx in range(0, len(pkgs)): - try: - bidx = buildpkgs.index(portage.dep_getkey(pkgs[idx])) - buildpkgs[bidx] = pkgs[idx] - if buildpkgs[bidx][0:1] == "*": - buildpkgs[bidx] = buildpkgs[bidx][1:] - except: pass - -for b in buildpkgs: sys.stdout.write(b+" ") diff --git a/src/catalyst/targets/stage1/stage1-chroot.sh b/src/catalyst/targets/stage1/stage1-chroot.sh deleted file mode 100644 index 515121aae3..0000000000 --- a/src/catalyst/targets/stage1/stage1-chroot.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-chroot.sh,v 1.43 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup our environment -export clst_buildpkgs="$(/tmp/build.py)" -export STAGE1_USE="$(portageq envvar STAGE1_USE)" -export USE="-* build ${STAGE1_USE}" -export FEATURES="${clst_myfeatures} nodoc noman noinfo" - -## Sanity check profile -if [ -z "${clst_buildpkgs}" ] -then - echo "Your profile seems to be broken." - echo "Could not build a list of build packages." - echo "Double check your /etc/make.profile link and the 'packages' files." - exit 1 -fi - -## START BUILD -run_emerge "--noreplace --oneshot ${clst_buildpkgs}" -rm -f /var/lib/portage/world -touch /var/lib/portage/world - -rm -f /var/log/emerge.log diff --git a/src/catalyst/targets/stage1/stage1-controller.sh b/src/catalyst/targets/stage1/stage1-controller.sh deleted file mode 100644 index 087e5124c4..0000000000 --- a/src/catalyst/targets/stage1/stage1-controller.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-controller.sh,v 1.14 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -case $1 in - enter) - ;; - run) - cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp - - # Setup "ROOT in chroot" dir - install -d ${clst_chroot_path}/${clst_root_path}/etc - - # Setup make.conf and make.profile link in "ROOT in chroot": - copy_to_chroot ${clst_chroot_path}/etc/make.conf /${clst_root_path}/etc - copy_to_chroot ${clst_chroot_path}/etc/make.profile \ - /${clst_root_path}/etc - - # Enter chroot, execute our build script - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \ - || exit 1 - ;; - preclean) - # Before we enter the chroot, we need to run gcc-config/binutils-config - if [ -x /usr/bin/gcc-config ] - then - mythang=$( cd ${clst_chroot_path}/tmp/stage1root/etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) - if [ -z "${mythang}" ] - then - mythang=1 - fi - ROOT=${clst_chroot_path}/tmp/stage1root/ \ - CHOST=${clst_CHOST} \ - gcc-config ${mythang} - fi - if [ -x /usr/bin/binutils-config ] - then - mythang=$( cd ${clst_chroot_path}/tmp/stage1root/etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) - if [ -z "${mythang}" ] - then - mythang=1 - fi - ROOT=${clst_chroot_path}/tmp/stage1root/ \ - CHOST=${clst_CHOST} \ - binutils-config ${mythang} - fi - ${clst_CHROOT} ${clst_chroot_path}/tmp/stage1root \ - /usr/sbin/env-update || exit 1 - - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1 - ;; - clean) - # Clean out man, info and doc files - rm -rf usr/share/{man,doc,info}/* - # Zap all .pyc and .pyo files - find -iname "*.py[co]" -exec rm -f {} \; - # Cleanup all .a files except libgcc.a, *_nonshared.a and - # /usr/lib/portage/bin/*.a - find -type f -iname "*.a" | grep -v 'libgcc.a' | grep -v 'nonshared.a' \ - | grep -v '/usr/lib/portage/bin/' | grep -v 'libgcc_eh.a' | xargs \ - rm -f - ;; - *) - exit 1 - ;; -esac -exit $? diff --git a/src/catalyst/targets/stage1/stage1-preclean-chroot.sh b/src/catalyst/targets/stage1/stage1-preclean-chroot.sh deleted file mode 100644 index c5b8f2da1c..0000000000 --- a/src/catalyst/targets/stage1/stage1-preclean-chroot.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-preclean-chroot.sh,v 1.11 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -# Now, some finishing touches to initialize gcc-config.... -unset ROOT - -setup_gcc -setup_binutils - -# Stage1 is not going to have anything in zoneinfo, so save our Factory timezone -if [ -d /usr/share/zoneinfo ] -then - rm -f /etc/localtime - cp /usr/share/zoneinfo/Factory /etc/localtime -else - echo UTC > /etc/TZ -fi - -#if [ -n "${clst_CCACHE}" ] -#then -# run_emerge -C dev-util/ccache || exit 1 -#fi - -#if [ -n "${clst_DISTCC}" ] -#then -# run_emerge -C sys-devel/distcc || exit 1 -#fi - -#cleanup_distcc diff --git a/src/catalyst/targets/stage2/stage2-chroot.sh b/src/catalyst/targets/stage2/stage2-chroot.sh deleted file mode 100644 index cd6c275207..0000000000 --- a/src/catalyst/targets/stage2/stage2-chroot.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-chroot.sh,v 1.19 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup the environment -export FEATURES="${clst_myfeatures} nodoc noman noinfo" - -if [ "${clst_VERBOSE}" ] -then - /usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} - echo "Press any key within 15 seconds to pause the build..." - read -s -t 15 -n 1 - if [ $? -eq 0 ] - then - echo "Press any key to continue..." - read -s -n 1 - fi -fi - -## START BUILD -/usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1 - diff --git a/src/catalyst/targets/stage2/stage2-controller.sh b/src/catalyst/targets/stage2/stage2-controller.sh deleted file mode 100644 index eb58e0cfa4..0000000000 --- a/src/catalyst/targets/stage2/stage2-controller.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-controller.sh,v 1.5 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -# Only put commands in this section that you want every target to execute. -# This is a global default file and will affect every target -case $1 in - enter) - ${clst_CHROOT} ${clst_chroot_path} - ;; - run) - shift - export clst_packages="$*" - exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} - ;; - clean) - exit 0 - ;; - *) - exit 1 - ;; -esac -exit $? diff --git a/src/catalyst/targets/stage2/stage2-preclean-chroot.sh b/src/catalyst/targets/stage2/stage2-preclean-chroot.sh deleted file mode 100644 index b2f5093b9a..0000000000 --- a/src/catalyst/targets/stage2/stage2-preclean-chroot.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-preclean-chroot.sh,v 1.11 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -if [ -n "${clst_CCACHE}" ] -then - run_emerge -C dev-util/ccache || exit 1 -fi - -if [ -n "${clst_DISTCC}" ] -then - run_emerge -C sys-devel/distcc || exit 1 -fi - -cleanup_distcc - -rm -f /var/log/emerge.log diff --git a/src/catalyst/targets/stage3/stage3-chroot.sh b/src/catalyst/targets/stage3/stage3-chroot.sh deleted file mode 100644 index 5cadc6de1a..0000000000 --- a/src/catalyst/targets/stage3/stage3-chroot.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.28 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup the build environment -export FEATURES="${clst_myfeatures}" -export USE="${USE} ${clst_HOSTUSE}" - -## START BUILD -# portage needs to be merged manually with USE="build" set to avoid frying our -# make.conf. emerge system could merge it otherwise. - -setup_portage - -run_emerge "-e system" -rm -f /var/lib/portage/world -touch /var/lib/portage/world diff --git a/src/catalyst/targets/stage3/stage3-controller.sh b/src/catalyst/targets/stage3/stage3-controller.sh deleted file mode 100644 index 88acc9554d..0000000000 --- a/src/catalyst/targets/stage3/stage3-controller.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-controller.sh,v 1.5 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -# Only put commands in this section that you want every target to execute. -# This is a global default file and will affect every target -case $1 in - enter) - ${clst_CHROOT} ${clst_chroot_path} - ;; - run) - shift - export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} - ;; - clean) - exit 0 - ;; - *) - exit 1 - ;; -esac -exit $? diff --git a/src/catalyst/targets/stage3/stage3-preclean-chroot.sh b/src/catalyst/targets/stage3/stage3-preclean-chroot.sh deleted file mode 100644 index 12abeae0be..0000000000 --- a/src/catalyst/targets/stage3/stage3-preclean-chroot.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-preclean-chroot.sh,v 1.11 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -if [ -n "${clst_CCACHE}" ] -then - run_emerge -C dev-util/ccache || exit 1 -fi - -if [ -n "${clst_DISTCC}" ] -then - run_emerge -C sys-devel/distcc || exit 1 -fi - -cleanup_distcc - -rm -f /var/log/emerge.log diff --git a/src/catalyst/targets/stage4/stage4-chroot.sh b/src/catalyst/targets/stage4/stage4-chroot.sh deleted file mode 100644 index 024f4c3b47..0000000000 --- a/src/catalyst/targets/stage4/stage4-chroot.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures -setup_myemergeopts - -# Setup the environment -export FEATURES="${clst_myfeatures}" - -## START BUILD -setup_portage -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" - -echo "Bringing system up to date using profile specific use flags" -export USE="${USE} ${clst_HOSTUSE}" -run_emerge -u system - -echo "Emerging packages using stage4 use flags" -if [ -n "${clst_use}" ] -then - export USE="${USE} ${clst_HOSTUSE}" -else - USE="${clst_use}" -fi - -run_emerge "${clst_packages}" diff --git a/src/catalyst/targets/stage4/stage4-controller.sh b/src/catalyst/targets/stage4/stage4-controller.sh deleted file mode 100644 index 515cafa880..0000000000 --- a/src/catalyst/targets/stage4/stage4-controller.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/Attic/stage4-controller.sh,v 1.14 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -# Only put commands in this section that you want every target to execute. -# This is a global default file and will affect every target -case $1 in - enter) - ${clst_CHROOT} ${clst_chroot_path} - ;; - pre-kmerge) - # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh - ;; - kernel) - shift - export clst_kname="$1" - # If we have our own linuxrc, copy it in - if [ -n "${clst_linuxrc}" ] - then - cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc - fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh - delete_from_chroot tmp/linuxrc - extract_modules ${clst_chroot_path} ${clst_kname} - # Do we need this one? -# extract_kernel ${clst_chroot_path}/boot ${clst_kname} - ;; - build_packages) - shift - export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh - ;; - preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} - ;; - rc-update) - exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh - ;; - fsscript) - exec_in_chroot ${clst_fsscript} - ;; - livecd-update) - # Now, finalize and tweak the livecd fs (inside of the chroot) - exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh - - # Move over the xinitrc (if applicable) - # This is moved here, so we can override any default xinitrc - if [ -n "${clst_livecd_xinitrc}" ] - then - cp -f ${clst_livecd_xinitrc} \ - ${clst_chroot_path}/etc/X11/xinit/xinitrc - fi - ;; - bootloader) - exit 0 - ;; - target_image_setup) - shift - ${clst_sharedir}/targets/support/target_image_setup.sh $1 - ;; - unmerge) - shift - export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh - ;; - iso) - shift - ${clst_sharedir}/targets/support/create-iso.sh $1 - ;; - clean) - exit 0 - ;; - *) - exit 1 - ;; -esac -exit $? diff --git a/src/catalyst/targets/stage4/stage4-preclean-chroot.sh b/src/catalyst/targets/stage4/stage4-preclean-chroot.sh deleted file mode 100644 index e03971e4cc..0000000000 --- a/src/catalyst/targets/stage4/stage4-preclean-chroot.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/Attic/stage4-preclean-chroot.sh,v 1.4 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh -#update_env_settings diff --git a/src/catalyst/targets/support/bootloader-setup.sh b/src/catalyst/targets/support/bootloader-setup.sh deleted file mode 100644 index 41449fe62d..0000000000 --- a/src/catalyst/targets/support/bootloader-setup.sh +++ /dev/null @@ -1,601 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.41 2006/10/02 20:41:54 wolf31o2 Exp $ -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -# $1 is the destination root - -extract_cdtar $1 -extract_kernels $1/boot -check_dev_manager -check_bootargs -check_filesystem_type - -default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" - -case ${clst_mainarch} in - alpha) - # NO SOFTLEVEL SUPPORT YET - acfg=$1/etc/aboot.conf - bctr=0 - # Pass 1 is for non-serial - for x in ${clst_boot_kernel} - do - echo -n "${bctr}:/boot/${x} " >> ${acfg} - echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg} - echo "init=/linuxrc ${cmdline_opts} cdroot" >> ${acfg} - ((bctr=${bctr}+1)) - done - # Pass 2 is for serial - cmdline_opts="${cmdline_opts} console=ttyS0" - for x in ${clst_boot_kernel} - do - echo -n "${bctr}:/boot/${x} " >> ${acfg} - echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg} - echo "init=/linuxrc ${cmdline_opts} cdroot" >> ${acfg} - ((bctr=${bctr}+1)) - done - ;; - arm) - # NO SOFTLEVEL SUPPORT YET - ;; - hppa) - # NO SOFTLEVEL SUPPORT YET - icfg=$1/boot/palo.conf - kmsg=$1/boot/kernels.msg - hmsg=$1/boot/help.msg - echo "--commandline=0/${first} initrd=${first}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts}" >> ${icfg} - echo "--bootloader=boot/iplboot" >> ${icfg} - echo "--ramdisk=boot/${first}.igz" >> ${icfg} - ;; - ppc) - # NO SOFTLEVEL SUPPORT YET - - # PPC requirements: - # ----------------- - # The specs indicate the kernels to be build. We need to put - # those kernels and the corresponding initrd.img.gz(s) in the - # /boot directory. This directory contains a message boot.msg - # containing some info to be displayed on boot, a configuration - # (yaboot.conf) specifying the boot options (kernel/initrd - # combinations). The boot directory also contains a file called - # yaboot, which normally gets copied from the live environment. - # For now we supply a prebuilt file, prebuilt configuration - # and prebuilt boot message. This can be enhanced later on - # but the following suffices for now: - - # this sets up the config file for yaboot - - - # ADD RUNLEVEL SUPPORT ??? - - icfg=$1/boot/yaboot.conf - kmsg=$1/boot/boot.msg - - echo "default ${first}" > ${icfg} - echo "timeout 300" >> ${icfg} - echo "device=cd:" >> ${icfg} - echo "root=/dev/ram" >> ${icfg} - echo "fgcolor=white" >> ${icfg} - echo "bgcolor=black" >> ${icfg} - echo "message=/boot/boot.msg" >> ${icfg} - - # Here is where I fix up the boot.msg file. - sed -e 's/ARCH/PPC/' \ - -e 's/HARDWARE/32-bit Apple and Pegasos hardware/' \ - -i $kmsg - - # Here we wipe out the /ppc directory, if it exists. - rm -rf $1/ppc - - for x in ${clst_boot_kernel} - do - eval custom_kopts=\$${x}_kernelopts - echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" - echo "image=/boot/${x}" >> ${icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${icfg} - fi - - echo "label=${x}" >> ${icfg} - echo "read-write" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg} - else - echo "append=\"${default_append_line}\"" >> ${icfg} - fi - done - ;; - - ppc64) - # NO SOFTLEVEL SUPPORT YET - - # PPC requirements: - # ----------------- - # The specs indicate the kernels to be build. We need to put - # those kernels and the corresponding initrd.img.gz(s) in the - # /boot directory. This directory contains a message boot.msg - # containing some info to be displayed on boot, a configuration - # (yaboot.conf) specifying the boot options (kernel/initrd - # combinations). The boot directory also contains a file called - # yaboot, which normally gets copied from the live environment. - # For now we supply a prebuilt file, prebuilt configuration - # and prebuilt boot message. This can be enhanced later on - # but the following suffices for now: - - # this sets up the config file for yaboot - - - # ADD RUNLEVEL SUPPORT ??? - - icfg=$1/boot/yaboot.conf - kmsg=$1/boot/boot.msg - - echo "device=cd:" >> ${icfg} - echo "root=/dev/ram" >> ${icfg} - echo "fgcolor=white" >> ${icfg} - echo "bgcolor=black" >> ${icfg} - echo "message=/boot/boot.msg" >> ${icfg} - - # Here is where I fix up the boot.msg file. - sed -e 's/ARCH/PPC/' \ - -e 's/HARDWARE/64-bit Apple and IBM hardware/' \ - -i $kmsg - - # Setup the IBM yaboot.conf - etc_icfg=$1/etc/yaboot.conf - mkdir -p $1/etc - IBM_YABOOT="FALSE" - echo "root=/dev/ram" >> ${etc_icfg} - echo "fgcolor=white" >> ${etc_icfg} - echo "bgcolor=black" >> ${etc_icfg} - echo "message=/boot/boot.msg" >> ${etc_icfg} - - for x in ${clst_boot_kernel} - do - eval "clst_kernel_console=\$clst_boot_kernel_${x}_console" - eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type" - eval custom_kopts=\$${x}_kernelopts - - echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" - if [ "${clst_kernel_machine_type}" == "ibm" ] - then - IBM_YABOOT="true" - if [ -n "${clst_kernel_console}" ] - then - echo >> ${etc_icfg} - echo "image=/boot/${x}" >> ${etc_icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${etc_icfg} - fi - - echo "label=${x}" >> ${etc_icfg} - echo "read-write" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${etc_icfg} - else - echo "append=\"${default_append_line}\"" >> ${etc_icfg} - fi - - for y in ${clst_kernel_console} - do - echo ${y} - echo >> ${etc_icfg} - echo "image=/boot/${x}" >> ${etc_icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${etc_icfg} - fi - - echo "label=${x}-${y} " >> ${etc_icfg} - echo "read-write" >> ${icfg} - echo "append=\"${default_append_line} console=${y}\"" >> ${etc_icfg} - done - else - echo >> ${etc_icfg} - echo "image=/boot/${x}" >> ${etc_icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${etc_icfg} - fi - - echo "label=${x}" >> ${etc_icfg} - echo "read-write" >> ${etc_icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${etc_icfg} - else - echo "append=\"${default_append_line}\"" >> ${etc_icfg} - fi - fi - else - if [ -n "${clst_kernel_console}" ] - then - echo >> ${icfg} - echo "image=/boot/${x}" >> ${icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${icfg} - fi - - echo "label=${x}" >> ${icfg} - echo "read-write" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg} - else - echo "append=\"${default_append_line}\"" >> ${icfg} - fi - - for y in ${clst_kernel_console} - do - echo >> ${icfg} - echo "image=/boot/${x}" >> ${icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${icfg} - fi - - echo "label=${x}-${y} " >> ${icfg} - echo "read-write" >> ${icfg} - echo "append=\"${default_append_line} console=${y}\"" >> ${icfg} - done - else - echo >> ${icfg} - echo "image=/boot/${x}" >> ${icfg} - - if [ -e "$1/boot/${x}.igz" ] - then - echo "initrd=/boot/${x}.igz" >> ${icfg} - fi - - echo "label=${x}" >> ${icfg} - echo "read-write" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg} - else - echo "append=\"${default_append_line}\"" >> ${icfg} - fi - fi - fi - done - - if [ "${IBM_YABOOT}" == "FALSE" ] - then - rm ${etc_kmsg} - rmdir $1/etc - if [ -d $1/ppc ] - then - rm -r $1/ppc - fi - fi - - ;; - sparc*) - # NO SOFTLEVEL SUPPORT YET - - scfg=$1/boot/silo.conf - echo "default=\"help\"" > ${scfg} - echo "message=\"/boot/boot.msg\"" >> ${scfg} - - for x in ${clst_boot_kernel} - do - echo >> ${icfg} - echo "image=\"/boot/${x}\"" >> ${scfg} - echo -e "\tlabel=\"${x}\"" >> ${scfg} - echo -e "\tappend=\"initrd=/boot/${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} cdroot\"" >> ${scfg} - - done - - echo "image=\"cat /boot/silo.conf\"" >> ${scfg} - echo -e "label=\"config\"" >> ${scfg} - echo "image=\"cat /boot/video.msg\"" >> ${scfg} - echo -e "label=\"video\"" >> ${scfg} - echo "image=\"cat /boot/help.msg\"" >> ${scfg} - echo -e "label=\"help\"" >> ${scfg} - echo "image=\"cat /boot/parameters.msg\"" >> ${scfg} - echo -e "label=\"parameters\"" >> ${scfg} - ;; - ia64) - # NO SOFTLEVEL SUPPORT YET - - iacfg=$1/boot/elilo.conf - echo 'prompt' > ${iacfg} - echo 'message=/efi/boot/elilo.msg' >> ${iacfg} - echo 'chooser=simple' >> ${iacfg} - echo 'timeout=50' >> ${iacfg} - echo 'relocatable' >> ${iacfg} - echo >> ${iacfg} - for x in ${clst_boot_kernel} - do - echo "image=/efi/boot/${x}" >> ${iacfg} - echo " label=${x}" >> ${iacfg} - echo ' append="'initrd=${x}.igz ${default_append_line}'"' >> ${iacfg} - echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} - echo >> ${iacfg} - echo "image=/efi/boot/${x}" >> ${iacfg} - echo " label=${x}-serial">> ${iacfg} - echo ' append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttyS0,9600"' >> ${iacfg} - echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} - echo >> ${iacfg} - echo "image=/efi/boot/${x}" >> ${iacfg} - echo " label=${x}-sgi">> ${iacfg} - echo ' append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttySG0,115200"' >> ${iacfg} - echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} - echo >> ${iacfg} - mv $1/boot/${x}{,.igz} $1/boot/efi/boot - done - cp ${iacfg} $1/boot/efi/boot - ;; - x86|amd64) - if [ -e $1/isolinux/isolinux.bin ] - then - mv $1/boot/* $1/isolinux - rmdir $1/boot - # the rest of this function sets up the config file for isolinux - icfg=$1/isolinux/isolinux.cfg - kmsg=$1/isolinux/kernels.msg - echo "default ${first}" > ${icfg} - echo "timeout 150" >> ${icfg} - echo "prompt 1" >> ${icfg} - echo "display boot.msg" >> ${icfg} - echo "F1 kernels.msg" >> ${icfg} - echo "F2 F2.msg" >> ${icfg} - echo "F3 F3.msg" >> ${icfg} - echo "F4 F4.msg" >> ${icfg} - echo "F5 F5.msg" >> ${icfg} - echo "F6 F6.msg" >> ${icfg} - echo "F7 F7.msg" >> ${icfg} - - echo "Available kernels:" > ${kmsg} - for i in 2 3 4 5 6 7 - do - cp ${clst_sharedir}/livecd/files/x86-F$i.msg \ - $1/isolinux/F$i.msg - done - - for x in ${clst_boot_kernel} - do - eval custom_kopts=\$${x}_kernelopts - echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" - echo >> ${icfg} - - eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel" - - if [ -n "${clst_kernel_softlevel}" ] - then - for y in ${clst_kernel_softlevel} - do - echo "label ${x}-${y}" >> ${icfg} - echo " kernel ${x}" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} - elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent" >> ${icfg} - else - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg} - fi - - echo >> ${icfg} - echo " ${x}" >> ${kmsg} - echo "label ${x}-${y}-nofb" >> ${icfg} - echo " kernel ${x}" >> ${icfg} - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz" >> ${icfg} - echo >> ${icfg} - echo " ${x}-nofb" >> ${kmsg} - done - else - echo "label ${x}" >> ${icfg} - echo " kernel ${x}" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo " append ${default_append_line} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} - elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo " append ${default_append_line} initrd=${x}.igz vga=791 splash=silent" >> ${icfg} - else - echo " append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg} - fi - echo >> ${icfg} - echo " ${x}" >> ${kmsg} - echo "label ${x}-nofb" >> ${icfg} - echo " kernel ${x}" >> ${icfg} - echo " append ${default_append_line} initrd=${x}.igz" >> ${icfg} - echo >> ${icfg} - echo " ${x}-nofb" >> ${kmsg} - fi - done - - if [ -f $1/isolinux/memtest86 ] - then - echo >> $icfg - echo " memtest86" >> $kmsg - echo "label memtest86" >> $icfg - echo " kernel memtest86" >> $icfg - fi - fi - - if [ -e $1/boot/efi/elilo.efi ] - then - iacfg=$1/boot/elilo.conf - echo 'prompt' > ${iacfg} - echo 'message=/efi/boot/elilo.msg' >> ${iacfg} - echo 'chooser=simple' >> ${iacfg} - echo 'timeout=50' >> ${iacfg} - echo >> ${iacfg} - for x in ${clst_boot_kernel} - do - echo "image=/efi/boot/${x}" >> ${iacfg} - echo " label=${x}" >> ${iacfg} - echo ' append="'initrd=${x}.igz ${default_append_line}'"' >> ${iacfg} - echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} - echo >> ${iacfg} - echo "image=/efi/boot/${x}" >> ${iacfg} - echo >> ${iacfg} - cp -f $1/boot/${x}{,.igz} $1/boot/efi/boot > /dev/null - cp -f $1/isolinux/${x}{,.igz} $1/boot/efi/boot > /dev/null - done - cp ${iacfg} $1/boot/efi/boot - fi - - if [ -e $1/boot/grub/stage2_eltorito ] - then - icfg=$1/boot/grub/grub.conf - echo "default 1" > ${icfg} - echo "timeout 150" >> ${icfg} - - # Setup help message - echo >> ${icfg} - echo "title help" >> ${icfg} - cp ${clst_sharedir}/livecd/files/README.txt \ - $1/boot/help.msg - echo "cat /boot/help.msg" >> ${icfg} - - for x in ${clst_boot_kernel} - do - eval custom_kopts=\$${x}_kernelopts - echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" - echo >> ${icfg} - - eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel" - - if [ -n "${clst_kernel_softlevel}" ] - then - for y in ${clst_kernel_softlevel} - do - echo "title ${x}-${y}" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "kernel /boot/${x} softlevel=${y} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} - elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent" >> ${icfg} - else - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg} - fi - if [ -e $1/boot/${x}.igz ] - then - echo "initrd /boot/${x}.igz" >> ${icfg} - fi - echo >> ${icfg} - echo "title ${x}-${y} [ No FrameBuffer ]" >> ${icfg} - echo "kernel /boot/${x} softlevel=${y} ${default_append_line}" >> ${icfg} - if [ -e $1/boot/${x}.igz ] - then - echo "initrd /boot/${x}.igz" >> ${icfg} - fi - echo >> ${icfg} - done - else - echo "title ${x}" >> ${icfg} - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "kernel /boot/${x} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} - elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] - then - echo "kernel /boot/${x} ${default_append_line} vga=791 splash=silent" >> ${icfg} - else - echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg} - fi - if [ -e $1/boot/${x}.igz ] - then - echo "initrd /boot/${x}.igz" >> ${icfg} - fi - echo >> ${icfg} - echo "title ${x} [ No FrameBuffer ]" >> ${icfg} - echo "kernel /boot/${x} ${default_append_line}" >> ${icfg} - if [ -e $1/boot/${x}.igz ] - then - echo "initrd /boot/${x}.igz" >> ${icfg} - fi - fi - - done - - if [ -f $1/boot/memtest86 ] - then - echo >> ${icfg} - echo "title memtest86" >> ${icfg} - echo "kernel /boot/memtest86" >> ${icfg} - fi - fi - ;; - mips) - - # NO SOFTLEVEL SUPPORT YET - - - # Mips is an interesting arch -- where most archs will - # use ${1} as the root of the LiveCD, an SGI LiveCD lacks - # such a root. Instead, we will use ${1} as a scratch - # directory to build the components we need for the - # CD image, and then pass these components to the - # `sgibootcd` tool which outputs a final CD image - scratch="${1}" - [ ! -d "${scratch}/kernels" ] && mkdir ${scratch}/kernels - [ ! -d "${scratch}/kernels/misc" ] && mkdir ${scratch}/kernels/misc - [ ! -d "${scratch}/arcload" ] && mkdir ${scratch}/arcload - echo "" > ${scratch}/arc.cf - - # Move kernel binaries to ${scratch}/kernels, and - # move everything else to ${scratch}/kernels/misc - for x in ${clst_boot_kernel}; do - [ -e "${1}/boot/${x}" ] && mv ${1}/boot/${x} ${scratch}/kernels - [ -e "${1}/boot/${x}.igz" ] && mv ${1}/boot/${x}.igz ${scratch}/kernels/misc - done - [ -d "${1}/boot" ] && rmdir ${1}/boot - - # Source the arcload source file to generated required sections of arc.cf - source ${clst_sharedir}/targets/support/mips-arcload_conf.sh - - # Generate top portions of the config - echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf - - # Next, figure out what kernels were specified in the - # spec file, and generate the appropriate arcload conf - # blocks specific to each system - ip22="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip22" | tr "\n" " ")" - ip27="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip27" | tr "\n" " ")" - ip28="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip28" | tr "\n" " ")" - ip30="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip30" | tr "\n" " ")" - ip32="$(echo ${clst_boot_kernel} | tr " " "\n" | grep "ip32" | tr "\n" " ")" - - if [ -n "${ip22}" ]; then - echo -e "${ip22base}" >> ${scratch}/arc.cf - for x in ${ip22}; do echo -e "${!x}" >> ${scratch}/arc.cf; done - echo -e "${ip22vid}${ip22x}" >> ${scratch}/arc.cf - fi - - [ -n "${ip27}" ] && echo -e "${ip27base}" >> ${scratch}/arc.cf - [ -n "${ip28}" ] && echo -e "${ip28base}" >> ${scratch}/arc.cf - [ -n "${ip30}" ] && echo -e "${ip30base}" >> ${scratch}/arc.cf - - if [ -n "${ip32}" ]; then - echo -e "${ip32base}" >> ${scratch}/arc.cf - for x in ${ip32}; do echo -e "${!x}" >> ${scratch}/arc.cf; done - echo -e "${ip32vid}${ip32x}" >> ${scratch}/arc.cf - fi - - # Finish off the config - echo -e "${cmt2}" >> ${scratch}/arc.cf - - # Move the bootloader binaries & config to their destination - [ -e "${1}/sashARCS" ] && mv ${1}/sashARCS ${scratch}/arcload - [ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload - [ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload - ;; -esac -exit $? diff --git a/src/catalyst/targets/support/chroot-functions.sh b/src/catalyst/targets/support/chroot-functions.sh deleted file mode 100644 index 63b7257870..0000000000 --- a/src/catalyst/targets/support/chroot-functions.sh +++ /dev/null @@ -1,247 +0,0 @@ - -# Trap these signals and kill ourselves if recieved -# Force ourselves to die if any of these signals are recieved -# most likely our controlling terminal is gone -trap "echo SIGTERM signal recieved killing $0 with pid $$;kill -9 $$" SIGTERM -trap "echo SIGHUP signal recieved killing $0 with pid $$;kill -9 $$" SIGHUP -trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL - -#SIGINT interrupt character (usually Ctrl-C) -# * example: high-level sequence of events -# * my process (call it "P") is running -# * user types ctrl-c -# * kernel recognizes this and generates SIGINT signal -trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT - -check_genkernel_version(){ - if [ -x /usr/bin/genkernel ] - then - genkernel_version=$(genkernel --version) - genkernel_version_major=${genkernel_version%%.*} - genkernel_version_minor_sub=${genkernel_version#${genkernel_version_major}.} - genkernel_version_minor=${genkernel_version_minor_sub%%.*} - genkernel_version_sub=${genkernel_version##*.} - if [ -n "${genkernel_version}" -a "${genkernel_version_major}" -eq '3' -a "${genkernel_version_minor}" -ge '3' ] - then - echo "Genkernel version ${genkernel_version} found ... continuing" - else - echo "ERROR: Your genkernel version is too low in your seed stage. genkernel version 3.3.0" - echo "or greater is required." - exit 1 - fi - else - exit 1 - fi -} - -setup_myfeatures(){ - if [ -n "${clst_CCACHE}" ] - then - export clst_myfeatures="${clst_myfeatures} ccache" - #if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_ccache ] - #then - # echo "CCACHE Autoresume point found not emerging ccache" - #else - emerge --oneshot --nodeps -b -k ccache || exit 1 - # touch /tmp/.clst_ccache - #fi - fi - - if [ -n "${clst_DISTCC}" ] - then - export clst_myfeatures="${clst_myfeatures} distcc" - export DISTCC_HOSTS="${clst_distcc_hosts}" - #if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_distcc ] - #then - # echo "DISTCC Autoresume point found not emerging distcc" - #else - USE="-gtk -gnome" emerge --oneshot --nodeps -b -k distcc || exit 1 - #touch /tmp/.clst_distcc - #fi - mkdir -p /etc/distcc - echo "${clst_distcc_hosts}" > /etc/distcc/hosts - fi -} - -setup_myemergeopts(){ - if [ -n "${clst_VERBOSE}" ] - then - clst_myemergeopts="--verbose" - else - clst_myemergeopts="--quiet" - fi - if [ -n "${clst_FETCH}" ] - then - export bootstrap_opts="-f" - export clst_myemergeopts="${clst_myemergeopts} -f" - elif [ -n "${clst_PKGCACHE}" ] - then - export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" - export bootstrap_opts="-r" - fi -} - - -setup_portage(){ - # portage needs to be merged manually with USE="build" set to avoid frying - # our make.conf. emerge system could merge it otherwise. - if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_portage ] - then - echo "Portage Autoresume point found not emerging portage" - else - USE="build" run_emerge --oneshot --nodeps portage - touch /tmp/.clst_portage || exit 1 - fi -} - -setup_gcc(){ - if [ -x /usr/bin/gcc-config ] - then - mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) - if [ -z "${mythang}" ] - then - mythang=1 - fi - gcc-config ${mythang}; update_env_settings - fi -} - -setup_binutils(){ - if [ -x /usr/bin/binutils-config ] - then - mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) - if [ -z "${mythang}" ] - then - mythang=1 - fi - binutils-config ${mythang}; update_env_settings - fi -} - -cleanup_distcc() { - rm -rf /etc/distcc/hosts -} - -update_env_settings(){ - /usr/sbin/env-update - source /etc/profile - [ -f /tmp/envscript ] && source /tmp/envscript -} - -die() { - echo "$1" - exit 1 -} - -make_destpath() { - if [ "${1}" = "" ] - then - export ROOT=/ - else - export ROOT=${1} - if [ ! -d ${ROOT} ] - then - install -d ${ROOT} - fi - fi -} - -run_emerge() { - # Sets up the ROOT= parameter - # with no options ROOT=/ - make_destpath ${clst_root_path} - - export EMERGE_WARNING_DELAY=0 - export CLEAN_DELAY=0 - export EBEEP_IGNORE=0 - export EPAUSE_IGNORE=0 - export CONFIG_PROTECT="-*" - - if [ -n "${clst_VERBOSE}" ] - then - echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 - emerge ${clst_myemergeopts} -pt $@ || exit 3 - echo "Press any key within 15 seconds to pause the build..." - read -s -t 15 -n 1 - if [ $? -eq 0 ] - then - echo "Press any key to continue..." - read -s -n 1 - fi - fi - - echo "emerge ${clst_myemergeopts} $@" || exit 1 - - emerge ${clst_myemergeopts} $@ || exit 1 -} - -# Functions -# Copy libs of a executable in the chroot -function copy_libs() { - # Check if it's a dynamix exec - ldd ${1} > /dev/null 2>&1 || return - - for lib in `ldd ${1} | awk '{ print $3 }'` - do - echo ${lib} - if [ -e ${lib} ] - then - if [ ! -e ${clst_root_path}/${lib} ] - then - copy_file ${lib} - [ -e "${clst_root_path}/${lib}" ] && \ - strip -R .comment -R .note ${clst_root_path}/${lib} \ - || echo "WARNING : Cannot strip lib ${clst_root_path}/${lib} !" - fi - else - echo "WARNING : Some library was not found for ${lib} !" - fi - done -} - -function copy_symlink() { - STACK=${2} - [ "${STACK}" = "" ] && STACK=16 || STACK=$((${STACK} - 1 )) - - if [ ${STACK} -le 0 ] - then - echo "WARNING : ${TARGET} : too many levels of symbolic links !" - return - fi - - [ ! -e ${clst_root_path}/`dirname ${1}` ] && \ - mkdir -p ${clst_root_path}/`dirname ${1}` - [ ! -e ${clst_root_path}/${1} ] && \ - cp -vfdp ${1} ${clst_root_path}/${1} - - TARGET=`readlink -f ${1}` - if [ -h ${TARGET} ] - then - copy_symlink ${TARGET} ${STACK} - else - copy_file ${TARGET} - fi -} - -function copy_file() { - f="${1}" - - if [ ! -e "${f}" ] - then - echo "WARNING : File not found : ${f}" - continue - fi - - [ ! -e ${clst_root_path}/`dirname ${f}` ] && \ - mkdir -p ${clst_root_path}/`dirname ${f}` - [ ! -e ${clst_root_path}/${f} ] && \ - cp -vfdp ${f} ${clst_root_path}/${f} - if [ -x ${f} -a ! -h ${f} ] - then - copy_libs ${f} - strip -R .comment -R .note ${clst_root_path}/${f} > /dev/null 2>&1 - elif [ -h ${f} ] - then - copy_symlink ${f} - fi -} diff --git a/src/catalyst/targets/support/create-iso.sh b/src/catalyst/targets/support/create-iso.sh deleted file mode 100644 index 489e2883d1..0000000000 --- a/src/catalyst/targets/support/create-iso.sh +++ /dev/null @@ -1,532 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.32 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -## START RUNSCRIPT - -# Check for our CD ISO creation tools -case ${clst_mainarch} in - mips) - cdmaker="sgibootcd" - cdmakerpkg="sys-boot/sgibootcd" - ;; - *) - cdmaker="mkisofs" - cdmakerpkg="app-cdr/cdrtools" - ;; -esac - -[ ! -f /usr/bin/${cdmaker} ] \ - && echo && echo && die \ - "!!! /usr/bin/${cdmaker} is not found. Have you merged ${cdmakerpkg}?" \ - && echo && echo - -# If not volume ID is set, make up a sensible default -if [ -z "${clst_iso_volume_id}" ] -then - case ${clst_livecd_type} in - gentoo-*) - case ${clst_mainarch} in - alpha) - clst_iso_volume_id="Gentoo Linux - Alpha" - ;; - amd64) - clst_iso_volume_id="Gentoo Linux - AMD64" - ;; - arm) - clst_iso_volume_id="Gentoo Linux - ARM" - ;; - hppa) - clst_iso_volume_id="Gentoo Linux - HPPA" - ;; - ia64) - clst_iso_volume_id="Gentoo Linux - IA64" - ;; - m68k) - clst_iso_volume_id="Gentoo Linux - M68K" - ;; - mips) - clst_iso_volume_id="Gentoo Linux - MIPS" - ;; - ppc) - clst_iso_volume_id="Gentoo Linux - PPC" - ;; - ppc64) - clst_iso_volume_id="Gentoo Linux - PPC64" - ;; - s390) - clst_iso_volume_id="Gentoo Linux - S390" - ;; - sh) - clst_iso_volume_id="Gentoo Linux - SH" - ;; - sparc*) - clst_iso_volume_id="Gentoo Linux - SPARC" - ;; - x86) - clst_iso_volume_id="Gentoo Linux - X86" - ;; - *) - clst_iso_volume_id="Catalyst LiveCD" - ;; - esac - esac -fi - -# Here we actually create the ISO images for each architecture -case ${clst_mainarch} in - alpha) - case ${clst_fstype} in - zisofs) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" - mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - *) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \ - ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - esac - isomarkboot ${1} /boot/bootlx - ;; - arm) - ;; - hppa) - case ${clst_fstype} in - zisofs) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" - mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - *) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \ - ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - esac - palo -f boot/palo.conf -C ${1} - ;; - ia64) - if [ ! -e ${clst_target_path}/gentoo.efimg ] - then - iaSizeTemp=$(du -sk ${clst_target_path}/boot 2>/dev/null) - iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1) - iaSize=$((${iaSizeB}+32)) # Add slack - - dd if=/dev/zero of=${clst_target_path}/gentoo.efimg bs=1k \ - count=${iaSize} - mkdosfs -F 16 -n GENTOO ${clst_target_path}/gentoo.efimg - - mkdir ${clst_target_path}/gentoo.efimg.mountPoint - mount -t vfat -o loop ${clst_target_path}/gentoo.efimg \ - ${clst_target_path}/gentoo.efimg.mountPoint - - echo '>> Populating EFI image...' - cp -pPRv ${clst_target_path}/boot/* \ - ${clst_target_path}/gentoo.efimg.mountPoint - - umount ${clst_target_path}/gentoo.efimg.mountPoint - rmdir ${clst_target_path}/gentoo.efimg.mountPoint - else - echo ">> Found populated EFI image at \ - ${clst_target_path}/gentoo.efimg" - fi - echo '>> Removing /boot...' - rm -rf ${clst_target_path}/boot - - echo '>> Generating ISO...' - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} -b \ - gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c \ - boot.cat -no-emul-boot \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - mips) - case ${clst_fstype} in - squashfs) - # $clst_target_path/[kernels|arcload] already exists, create loopback and sgibootcd - [ ! -d "${clst_target_path}/loopback" ] && mkdir ${clst_target_path}/loopback - [ ! -d "${clst_target_path}/sgibootcd" ] && mkdir ${clst_target_path}/sgibootcd - - # Setup variables - [ -f "${clst_target_path}/livecd" ] && rm -f ${clst_target_path}/livecd - img="${clst_target_path}/loopback/image.squashfs" - knl="${clst_target_path}/kernels" - arc="${clst_target_path}/arcload" - cfg="${clst_target_path}/sgibootcd/sgibootcd.cfg" - echo "" > ${cfg} - - # If the image file exists in $clst_target_path, move it to the loopback dir - [ -e "${clst_target_path}/image.squashfs" ] \ - && mv -f ${clst_target_path}/image.squashfs ${clst_target_path}/loopback - - # An sgibootcd config is essentially a collection of commandline params - # stored in a text file. We could pass these on the command line, but it's - # far easier to generate a config file and pass it to sgibootcd versus using a - # ton of commandline params. - # - # f= indicates files to go into DVH (disk volume header) in an SGI disklabel - # format: f=</path/to/file>@<DVH name> - # p0= the first partition holds the LiveCD rootfs image - # format: p0=</path/to/image> - # p8= the eighth partition is the DVH partition - # p10= the tenth partition is the disk volume partition - # format: p8= is always "#dvh" and p10= is always "#volume" - - # Add the kernels to the sgibootcd config - for x in ${clst_boot_kernel}; do - echo -e "f=${knl}/${x}@${x}" >> ${cfg} - done - - # Next, the bootloader binaries and config - echo -e "f=${arc}/sash64@sash64" >> ${cfg} - echo -e "f=${arc}/sashARCS@sashARCS" >> ${cfg} - echo -e "f=${arc}/arc.cf@arc.cf" >> ${cfg} - - # Next, the Loopback Image - echo -e "p0=${img}" >> ${cfg} - - # Finally, the required SGI Partitions (dvh, volume) - echo -e "p8=#dvh" >> ${cfg} - echo -e "p10=#volume" >> ${cfg} - - # All done; feed the config to sgibootcd and end up with an image - # c= the config file - # o= output image (burnable to CD; readable by fdisk) - /usr/bin/sgibootcd c=${cfg} o=${clst_iso} - ;; - *) die "SGI LiveCDs only support the 'normal' fstype!" ;; - esac - ;; - ppc) - case ${clst_fstype} in - zisofs) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe \ - -map ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \ - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" - mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe -map \ - ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \ - ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \ - ${1} ${clst_target_path} || die "Cannot make ISO image" - ;; - *) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \ - ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \ - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" - mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \ - ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \ - ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \ - ${1} ${clst_target_path} || die "Cannot make ISO image" - ;; - esac - ;; - ppc64) - if [ -f ${clst_target_path}/ppc/bootinfo.txt ] - then - echo "bootinfo.txt found .. updating it" - sed -i -e \ - 's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \ - ${clst_target_path}/ppc/bootinfo.txt - sed -i -e \ - 's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \ - ${clst_target_path}/ppc/bootinfo.txt - fi - - case ${clst_fstype} in - zisofs) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}" - mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map \ - ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \ - ${clst_target_path}boot -hide-hfs "zisofs" -hide-hfs "stages" \ - -hide-hfs "distfiles" -hide-hfs "snapshots" \ - -V "${clst_iso_volume_id}" -o \ - ${1} ${clst_target_path} || die "Cannot make ISO image" - ;; - *) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \ - ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \ - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" \ - -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" \ - -hide-hfs \"image.loop\" -hide-hfs \"image.squashfs\" -hide-hfs \"image.jffs\" \ - -hide-hfs \"image.cramfs\" \ - -o ${1} ${clst_target_path}" - mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \ - ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \ - ${clst_target_path}boot -V "${clst_iso_volume_id}" \ - -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" \ - -hide-hfs "image.loop" -hide-hfs "image.squashfs" -hide-hfs "image.jffs" \ - -hide-hfs "image.cramfs" \ - -o ${1} ${clst_target_path} || die "Cannot make ISO image" - ;; - esac - ;; - sparc*) - # Old silo (<=1.2.6) requires a specially built mkisofs - # We try to autodetect this in a simple way, said mkisofs - # should be in the cdtar, otherwise use the new style. - if [ -x ${clst_target_path}/boot/mkisofs.sparc.fu ] - then - mv ${clst_target_path}/boot/mkisofs.sparc.fu /tmp - case ${clst_fstype} in - zisofs) - echo "Running mkisofs.sparc.fu to create iso image...." - echo "/tmp/mkisofs.sparc.fu -z -o ${1} -D -r -pad -quiet -S \ - 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'" - echo "-V \"${clst_iso_volume_id}\" ${clst_target_path}" - /tmp/mkisofs.sparc.fu -z -o ${1} -D -r -pad -quiet -S 'boot/cd.b' \ - -B '/boot/second.b' -s '/boot/silo.conf'\ - -V "${clst_iso_volume_id}" ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - *) - echo "Running mkisofs.sparc.fu to create iso image...." - echo "/tmp/mkisofs.sparc.fu -o ${1} -D -r -pad -quiet -S \ - 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'" - echo "-V \"${clst_iso_volume_id}\" ${clst_target_path}" - /tmp/mkisofs.sparc.fu -o ${1} -D -r -pad -quiet -S 'boot/cd.b' \ - -B '/boot/second.b' -s '/boot/silo.conf'\ - -V "${clst_iso_volume_id}" ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - esac - rm /tmp/mkisofs.sparc.fu - else - case ${clst_fstype} in - zisofs) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o ${1} \ - -G \"${clst_target_path}/boot/isofs.b\" -B ... \ - ${clst_target_path}" - mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \ - -G "${clst_target_path}/boot/isofs.b" -B ... \ - ${clst_target_path} || die "CAnnot make ISO image" - ;; - *) - echo "Running mkisofs to create iso image...." - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \ - -G \"${clst_target_path}/boot/isofs.b\" -B ... \ - ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ - -G "${clst_target_path}/boot/isofs.b" -B ... \ - ${clst_target_path} || die "CAnnot make ISO image" - ;; - esac - fi - - ;; - x86|amd64) - if [ -e ${clst_target_path}/boot/elilo.efi ] - then - if [ ! -e ${clst_target_path}/gentoo.efimg ] - then - iaSizeTemp=$(du -sk ${clst_target_path}/boot 2>/dev/null) - iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1) - iaSize=$((${iaSizeB}+32)) # Add slack - - dd if=/dev/zero of=${clst_target_path}/gentoo.efimg bs=1k \ - count=${iaSize} - mkdosfs -F 16 -n GENTOO ${clst_target_path}/gentoo.efimg - - mkdir ${clst_target_path}/gentoo.efimg.mountPoint - mount -t vfat -o loop ${clst_target_path}/gentoo.efimg \ - ${clst_target_path}/gentoo.efimg.mountPoint - - echo "Populating EFI image" - cp -pPRv ${clst_target_path}/boot/* \ - ${clst_target_path}/gentoo.efimg.mountPoint - - umount ${clst_target_path}/gentoo.efimg.mountPoint - rmdir ${clst_target_path}/gentoo.efimg.mountPoint - else - echo "Found populated EFI image at \ - ${clst_target_path}/gentoo.efimg" - fi - if [ ! -e ${clst_target_path}/boot/grub/stage2_eltorito ] - then - echo "Removing /boot" - rm -rf ${clst_target_path}/boot - fi - fi - - if [ -e ${clst_target_path}/isolinux/isolinux.bin ] - then - if [ -d ${clst_target_path}/boot ] - then - if [ -n "$(ls ${clst_target_path}/boot)" ] - then - mv ${clst_target_path}/boot/* ${clst_target_path}/isolinux - rm -r ${clst_target_path}/boot - echo "Creating ISO using ISOLINUX bootloader" - case ${clst_fstype} in - zisofs) - echo "mkisofs -J -R -l -V \ - \"${clst_iso_volume_id}\" -o ${1} -b \ - isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 \ - -boot-info-table -z ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ - ${1} -b isolinux/isolinux.bin -c \ - isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table -z \ - ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - *) - echo "mkisofs -J -R -l -V \ - \"${clst_iso_volume_id}\" -o ${1} -b \ - isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 \ - -boot-info-table ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ - ${1} -b isolinux/isolinux.bin -c \ - isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table \ - ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - esac - elif [ -e ${clst_target_path}/gentoo.efimg ] - then - echo "Creating ISO using both ISOLINUX and EFI bootloader" - case ${clst_fstype} in - zisofs) - echo "mkisofs -J -R -l -V \ - \"${clst_iso_volume_id}\" -o ${1} -b \ - isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 \ - -boot-info-table -eltorito-alt-boot -b \ - gentoo.efimg -c boot.cat \ - -no-emul-boot -z ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ - ${1} -b isolinux/isolinux.bin -c \ - isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table \ - -eltorito-alt-boot -b gentoo.efimg -c \ - boot.cat -no-emul-boot -z ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - *) - echo "mkisofs -J -R -l -V \ - \"${clst_iso_volume_id}\" -o ${1} -b \ - isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 \ - -boot-info-table -eltorito-alt-boot -b \ - gentoo.efimg -c boot.cat \ - -no-emul-boot ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ - ${1} -b isolinux/isolinux.bin -c \ - isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table \ - -eltorito-alt-boot -b gentoo.efimg -c boot.cat \ - -no-emul-boot ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - esac - fi - else - echo "Creating ISO using ISOLINUX bootloader" - case ${clst_fstype} in - zisofs) - echo "mkisofs -J -R -l -V \ - \"${clst_iso_volume_id}\" -o ${1} -b \ - isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 \ - -boot-info-table -z ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ - ${1} -b isolinux/isolinux.bin -c \ - isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table -z \ - ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - *) - echo "mkisofs -J -R -l -V \ - \"${clst_iso_volume_id}\" -o ${1} -b \ - isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 \ - -boot-info-table ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ - ${1} -b isolinux/isolinux.bin -c \ - isolinux/boot.cat -no-emul-boot \ - -boot-load-size 4 -boot-info-table \ - ${clst_target_path} \ - || die "Cannot make ISO image" - ;; - esac - fi - elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ] - then - echo "Creating ISO using GRUB bootloader" - case ${clst_fstype} in - zisofs) - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ - ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table -z \ - ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b \ - boot/grub/stage2_eltorito -c boot/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table -z \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - *) - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ - ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b \ - boot/grub/stage2_eltorito -c boot/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - esac - elif [ -e ${clst_target_path}/gentoo.efimg ] - then - echo 'Creating ISO using EFI bootloader' - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} -b \ - gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b \ - gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} \ - || die "Cannot make ISO image" - else - case ${clst_fstype} in - zisofs) - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ - ${1} -z ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ - -z ${clst_target_path} || die "Cannot make ISO image" - ;; - *) - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ - ${clst_target_path} || die "Cannot make ISO image" - ;; - esac - fi - ;; -esac -exit $? diff --git a/src/catalyst/targets/support/filesystem-functions.sh b/src/catalyst/targets/support/filesystem-functions.sh deleted file mode 100644 index 31ad6d35b0..0000000000 --- a/src/catalyst/targets/support/filesystem-functions.sh +++ /dev/null @@ -1,82 +0,0 @@ -# Dont forget to update functions.sh check_looptype -# $1 is the target directory for the filesystem - -create_normal_loop() { - export source_path="${clst_destpath}" - export destination_path="$1" - export loopname="image.loop" - - # We get genkernel-built kernels and initrds in place, create the loopback - # file system on $clst_target_path, mount it, copy our bootable filesystem - # over, umount it, and have a ready-to-burn ISO tree at $clst_target_path. - - echo "Calculating size of loopback filesystem..." - loopsize=`du -ks ${source_path} | cut -f1` - [ "${loopsize}" = "0" ] && loopsize=1 - # Add 4MB for filesystem slop - loopsize=`expr ${loopsize} + 4096` - echo "Creating loopback file..." - dd if=/dev/zero of=${destination_path}/${loopname} bs=1k count=${loopsize} \ - || die "${loopname} creation failure" - mke2fs -m 0 -F -q ${destination_path}/${loopname} \ - || die "Couldn't create ext2 filesystem" - install -d ${destination_path}/loopmount - sync; sync; sleep 3 # Try to work around 2.6.0+ loopback bug - mount -t ext2 -o loop ${destination_path}/${loopname} \ - ${destination_path}/loopmount \ - || die "Couldn't mount loopback ext2 filesystem" - sync; sync; sleep 3 # Try to work around 2.6.0+ loopback bug - echo "cp -pPR ${source_path}/* ${destination_path}/loopmount" - cp -pPR ${source_path}/* ${destination_path}/loopmount - [ $? -ne 0 ] && { umount ${destination_path}/${loopname}; \ - die "Couldn't copy files to loopback ext2 filesystem"; } - umount ${destination_path}/loopmount \ - || die "Couldn't unmount loopback ext2 filesystem" - rm -rf ${destination_path}/loopmount - # Now, $clst_target_path should contain a proper bootable image for our - # ISO, including boot loader and loopback filesystem. -} - -create_zisofs() { - rm -rf "$1/zisofs" > /dev/null 2>&1 - echo "Creating zisofs..." - mkzftree -z 9 -p2 "${clst_destpath}" "$1/zisofs" \ - || die "Could not run mkzftree, did you emerge zisofs" -} - -create_noloop() { - echo "Copying files for image (no loop)..." - cp -pPR "${clst_destpath}"/* "$1" \ - || die "Could not copy files to image (no loop)" -} - -create_squashfs() { - echo "Creating squashfs..." - export loopname="image.squashfs" - mksquashfs "${clst_destpath}" "$1/${loopname}" ${clst_fsops} -noappend \ - || die "mksquashfs failed, did you emerge squashfs-tools?" -} - -create_jffs() { - echo "Creating jffs..." - export loopname="image.jffs" - # fs_check /usr/sbin/mkfs.jffs jffs sys-fs/mtd - mkfs.jffs -d ${clst_destpath} -o $1/${loopname} ${clst_fsops} \ - || die "Could not create a jffs filesystem" -} - -create_jffs2(){ - echo "Creating jffs2..." - export loopname="image.jffs" - # fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd - mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} ${clst_fsops} \ - || die "Could not create a jffs2 filesystem" -} - -create_cramfs(){ - echo "Creating cramfs..." - export loopname="image.cramfs" - #fs_check /sbin/mkcramfs cramfs sys-fs/cramfs - mkcramfs ${clst_fsops} ${clst_destpath} $1/${loopname} \ - || die "Could not create a cramfs filesystem" -} diff --git a/src/catalyst/targets/support/functions.sh b/src/catalyst/targets/support/functions.sh deleted file mode 100644 index 18984d280e..0000000000 --- a/src/catalyst/targets/support/functions.sh +++ /dev/null @@ -1,213 +0,0 @@ -copy_to_chroot(){ - local file_name=$(basename ${1}) - local dest_dir=${clst_chroot_path}${2} - if [ "${2}" != "" ] - then - echo "copying ${file_name} to ${dest_dir}" - mkdir -p ${dest_dir} - cp -pPR ${1} ${dest_dir} - chmod 755 ${dest_dir}/${file_name} - else - echo "copying ${file_name} to ${clst_chroot_path}/tmp" - mkdir -p ${chroot_path}/tmp - cp -pPR ${1} ${clst_chroot_path}/tmp - chmod 755 ${clst_chroot_path}/tmp/${file_name} - fi -} - -delete_from_chroot(){ - if [ -e ${clst_chroot_path}${1} ] - then - echo "removing ${clst_chroot_path}${1} from the chroot" - rm -f ${clst_chroot_path}${1} - fi -} - -exec_in_chroot(){ -# Takes the full path to the source file as its argument -# copies the file to the /tmp directory of the chroot -# and executes it. - local file_name=$(basename ${1}) - local subdir=${2#/} - - if [ "${subdir}" != "" ] - then - copy_to_chroot ${1} ${subdir}/tmp/ - chroot_path=${clst_chroot_path}${subdir} - copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \ - ${subdir}/tmp/ - echo "Running ${file_name} in chroot ${chroot_path}" - ${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1 - else - copy_to_chroot ${1} tmp/ - chroot_path=${clst_chroot_path} - copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \ - tmp/ - echo "Running ${file_name} in chroot ${chroot_path}" - ${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1 - fi - - rm -f ${chroot_path}/tmp/${file_name} - if [ "${subdir}" != "" ] - then - delete_from_chroot ${subdir}/tmp/${file_name} - delete_from_chroot ${subdir}/tmp/chroot-functions.sh - else - delete_from_chroot tmp/chroot-functions.sh - delete_from_chroot tmp/${file_name} - fi -} - -#return codes -die() { - echo "$1" - exit 1 -} - -extract_cdtar() { - # Create a filesystem tree for the ISO at - # $clst_target_path. We extract the "cdtar" to this directory, - # which will normally contains a pre-built binary - # boot-loader/filesystem skeleton for the ISO. - cdtar=${clst_cdtar} - [ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting" - tar xjpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}" -} - -extract_kernels() { - # extract multiple kernels - # $1 = Destination - # ${clst_target_path}/kernel is often a good choice for ${1} - - # Takes the relative desination dir for the kernel as an arguement - # i.e boot or isolinux - [ -z "$clst_boot_kernel" ] && \ - die "Required key boot/kernel not defined, exiting" - # install the kernels built in kmerge.sh - for x in ${clst_boot_kernel} - do - first=${first:-""} - kbinary="${clst_chroot_path}/tmp/kerncache/${x}-kernel-initrd-${clst_version_stamp}.tar.bz2" - if [ -z "${first}" ] - then - # grab name of first kernel - export first="${x}" - fi - - [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" - mkdir -p ${1}/ - tar xjf ${kbinary} -C ${1}/ - - # change config name from "config-*" to "gentoo", for example - #mv ${1}/config-* ${1}/${x}-config - rm ${1}/config-* - - # change kernel name from "kernel" to "gentoo", for example - if [ -e ${1}/kernel-* ] - then - mv ${1}/kernel-* ${1}/${x} - fi - - # change kernel name from "kernelz" to "gentoo", for example - if [ -e ${1}/kernelz-* ] - then - mv ${1}/kernelz-* ${1}/${x} - fi - - # change initrd name from "initrd" to "gentoo.igz", for example - if [ -e ${1}/initrd-* ] - then - mv ${1}/initrd-* ${1}/${x}.igz - fi - - if [ -e ${1}/initramfs-* ] - then - mv ${1}/initramfs-* ${1}/${x}.igz - fi - done -} - -extract_modules() { - # $1 = Destination - # $2 = kname - kmodules="${clst_chroot_path}/tmp/kerncache/${2}-modules-${clst_version_stamp}.tar.bz2" - - if [ -f "${kmodules}" ] - then - mkdir -p ${1}/ - tar xjf ${kmodules} -C ${1} lib - else - echo "Can't find kernel modules tarball at ${kmodules}. Skipping...." - fi -} -extract_kernel() { - # $1 = Destination - # $2 = kname - - kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2" - [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" - mkdir -p ${1}/ - tar xjf ${kbinary} -C ${1}/ - # change config name from "config-*" to "gentoo", for example - #mv ${1}/config-* ${1}/${2}-config - rm ${1}/config-* - - # change kernel name from "kernel" to "gentoo", for example - mv ${1}/kernel-* ${1}/${2} - - # change initrd name from "initrd" to "gentoo.igz", for example - if [ -e ${1}/initrd-* ] - then - mv ${1}/initrd-* ${1}/${2}.igz - fi - - # change initramfs name from "initramfs" to "gentoo.igz", for example - if [ -e ${1}/initramfs-* ] - then - mv ${1}/initramfs-* ${1}/${2}.igz - fi -} - -check_dev_manager(){ - # figure out what device manager we are using and handle it accordingly - if [ "${clst_livecd_devmanager}" == "devfs" ] - then - cmdline_opts="${cmdline_opts} noudev devfs" - fi -} - -check_bootargs(){ - # Add any additional options - if [ -n "${clst_livecd_bootargs}" ] - then - for x in ${clst_livecd_bootargs} - do - cmdline_opts="${cmdline_opts} ${x}" - done - fi -} - -check_filesystem_type(){ - case ${clst_fstype} in - normal) - cmdline_opts="${cmdline_opts} looptype=normal loop=/image.loop" - ;; - zisofs) - cmdline_opts="${cmdline_opts} looptype=zisofs loop=/zisofs" - ;; - noloop) - ;; - squashfs) - cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs" - ;; - jffs) - cmdline_opts="${cmdline_opts} looptype=jffs loop=/image.jffs" - ;; - jffs2) - cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2" - ;; - cramfs) - cmdline_opts="${cmdline_opts} looptype=cramfs loop=/image.cramfs" - ;; - esac -} diff --git a/src/catalyst/targets/support/kill-chroot-pids.sh b/src/catalyst/targets/support/kill-chroot-pids.sh deleted file mode 100644 index 9e8bf01d6f..0000000000 --- a/src/catalyst/targets/support/kill-chroot-pids.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# Script to kill processes found running in the chroot. - -if [ "${clst_chroot_path}" == "/" ] -then - echo "Aborting .... clst_chroot_path is set to /" - echo "This is very dangerous" - exit 1 -fi - -if [ "${clst_chroot_path}" == "" ] -then - echo "Aborting .... clst_chroot_path is NOT set" - echo "This is very dangerous" - exit 1 -fi - -j=0 -declare -a pids -# Get files and dirs in /proc -for i in `ls /proc` -do - # Test for directories - if [ -d /proc/$i ] - then - # Search for exe containing string inside ${clst_chroot_path} - ls -la --color=never /proc/$i 2>&1 |grep exe|grep ${clst_chroot_path} > /dev/null - - # If found - if [ $? == 0 ] - then - # Assign the pid into the pids array - pids[$j]=$i - j=$(($j+1)) - fi - fi -done - -if [ ${j} -gt 0 ] -then - echo - echo "Killing process(es)" - echo "pid: process name" - for pid in ${pids[@]} - do - P_NAME=$(ls -la --color=never /proc/${pid} 2>&1 |grep exe|grep ${clst_chroot_path}|awk '{print $11}') - echo ${pid}: ${P_NAME} - done - echo - echo "Press Ctrl-C within 10 seconds to abort" - - sleep 10 - - for pid in ${pids[@]} - do - kill -9 ${pid} - done - - # Small sleep here to give the process(es) a chance to die before running unbind again. - sleep 5 - -fi diff --git a/src/catalyst/targets/support/kmerge.sh b/src/catalyst/targets/support/kmerge.sh deleted file mode 100644 index d3714f2bcd..0000000000 --- a/src/catalyst/targets/support/kmerge.sh +++ /dev/null @@ -1,222 +0,0 @@ -#!/bin/bash - -source /tmp/chroot-functions.sh - -mkdir -p /tmp/kerncache - -check_genkernel_version - -PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds - -setup_gk_args() { - # default genkernel args - GK_ARGS="${clst_gk_mainargs} \ - ${clst_kernel_gk_kernargs} \ - --cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} \ - --no-mountboot \ - --kerneldir=/usr/src/linux \ - --kernel-config=/var/tmp/${clst_kname}.config \ - --modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 \ - --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 \ - --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2 all" - # extra genkernel options that we have to test for - if [ "${clst_splash_type}" == "bootsplash" -a -n "${clst_splash_theme}" ] - then - GK_ARGS="${GK_ARGS} --bootsplash=${clst_splash_theme}" - fi - - if [ "${clst_splash_type}" == "gensplash" -a -n "${clst_splash_theme}" ] - then - GK_ARGS="${GK_ARGS} --gensplash=${clst_splash_theme}" - fi - - if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ] - then - GK_ARGS="${GK_ARGS} --initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}" - fi - if [ -n "${clst_CCACHE}" ] - then - GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc" - fi - - if [ "${clst_devmanager}" == "devfs" ] - then - GK_ARGS="${GK_ARGS} --no-udev" - fi - - if [ -n "${clst_linuxrc}" ] - then - GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc" - fi -} - -genkernel_compile(){ - eval "clst_initramfs_overlay=\$clst_boot_kernel_${filtered_kname}_initramfs_overlay" - eval "clst_kernel_merge=\$clst_boot_kernel_${filtered_kname}_packages" - - setup_gk_args - #echo "The GK_ARGS are" - #echo ${GK_ARGS} - export clst_kernel_merge - export clst_initramfs_overlay - # Build our list of kernel packages - if [ "${clst_livecd_type}" = "gentoo-release-livecd" ] \ - && [ -n "${clst_kernel_merge}" ] - then - mkdir -p /usr/livecd - echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt - fi - # Build with genkernel using the set options - # callback is put here to avoid escaping issues - if [ -n "${clst_KERNCACHE}" ] - then - if [ "$clst_kernel_merge" != "" ] - then - genkernel --callback="PKGDIR=${PKGDIR} emerge -kqb \ - ${clst_kernel_merge}" ${GK_ARGS} || exit 1 - else - genkernel ${GK_ARGS} || exit 1 - fi - else - if [ "$clst_kernel_merge" != "" ] - then - genkernel --callback="emerge -q ${clst_kernel_merge}" \ - ${GK_ARGS} || exit 1 - else - genkernel ${GK_ARGS} || exit 1 - fi - fi - md5sum /var/tmp/${clst_kname}.config|awk '{print $1}' > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG -} - -build_kernel() { - genkernel_compile -} - -# Script to build each kernel, kernel-related packages -/usr/sbin/env-update -source /etc/profile - -setup_myfeatures -setup_myemergeopts - -[ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript -export CONFIG_PROTECT="-*" - -# Set the timezone for the kernel build -rm /etc/localtime -ln -s /usr/share/zoneinfo/UTC /etc/localtime - - -filtered_kname=${clst_kname/-/_} -filtered_kname=${clst_kname/\//_} -filtered_kname=${filtered_kname/\./_} - -eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use" -export USE=$clst_kernel_use - -eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs" -eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources" - -# Don't use pkgcache here, as the kernel source may get emerged with different -# USE variables (and thus different patches enabled/disabled.) Also, there's no -# real benefit in using the pkgcache for kernel source ebuilds. - -USE_MATCH=0 -if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ] -then - STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort) - STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort) - if [ "${STR1}" = "${STR2}" ] - then - #echo "USE Flags match" - USE_MATCH=1 - else - if [ -n "${clst_KERNCACHE}" ] - then - [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \ - rm -r /tmp/kerncache/${clst_kname}/ebuilds - [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \ - rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config - fi - fi -fi - -EXTRAVERSION_MATCH=0 -if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ] -then - STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION` - STR2=${clst_kextraversion} - if [ "${STR1}" = "${STR2}" ] - then - if [ -n "${clst_KERNCACHE}" ] - then - #echo "EXTRAVERSION match" - EXTRAVERSION_MATCH=1 - fi - fi -fi - -CONFIG_MATCH=0 -if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] -then - STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` - STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` - if [ "${STR1}" = "${STR2}" ] - then - if [ -n "${clst_KERNCACHE}" ] - then - #echo "CONFIG match" - CONFIG_MATCH=1 - fi - fi -fi - -mkdir -p /tmp/kerncache/${clst_kname} - -if [ -n "${clst_KERNCACHE}" ] -then - ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} USE="${USE} symlink build" emerge --nodeps -uqkb "${clst_ksource}" || exit 1 - KERNELVERSION=`/usr/lib/portage/bin/portageq best_visible / "${clst_ksource}"` - if [ ! -e /etc/portage/profile/package.provided ] - then - mkdir -p /etc/portage/profile - echo "${KERNELVERSION}" > /etc/portage/profile/package.provided - else - if ( ! grep -q "^${KERNELVERSION}" /etc/portage/profile/package.provided ) - then - echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided - fi - fi - [ -d /usr/src/linux ] && rm /usr/src/linux - ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux -else - USE="${USE} symlink build" emerge "${clst_ksource}" || exit 1 -fi - -# If catalyst has set to a empty string, extraversion wasn't specified so we -# skip this part -if [ "${EXTRAVERSION_MATCH}" = "0" ] -then - if [ ! "${clst_kextraversion}" = "" ] - then - echo "Setting extraversion to ${clst_kextraversion}" - sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile - echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION - else - touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION - fi -fi - -build_kernel -# grep out the kernel version so that we can do our modules magic -VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` -PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` -SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` -EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"` -clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV} - -/sbin/modules-update --assume-kernel=${clst_fudgeuname} - -unset USE -echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE diff --git a/src/catalyst/targets/support/livecdfs-update.sh b/src/catalyst/targets/support/livecdfs-update.sh deleted file mode 100644 index 31cd9b838c..0000000000 --- a/src/catalyst/targets/support/livecdfs-update.sh +++ /dev/null @@ -1,390 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.64 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -# Allow root logins to our CD by default -if [ -e /etc/sshd/sshd_config ] -then - sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \ - /etc/ssh/sshd_config -fi - -# Turn off udev tarball -sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc - -# Clean up the time and set to UTC -rm -rf /etc/localtime -cp /usr/share/zoneinfo/UTC /etc/localtime - -# Setup the hostname -if [ "${clst_livecd_type}" == "gentoo-gamecd" ] -then - echo 'HOSTNAME="gamecd"' > /etc/conf.d/hostname - echo "127.0.0.1 gamecd.gentoo gamecd localhost" > /etc/hosts -else - echo 'HOSTNAME="livecd"' > /etc/conf.d/hostname - echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts -fi -echo 'OVERRIDE=0' > /etc/conf.d/domainname -echo 'DNSDOMAIN="gentoo"' >> /etc/conf.d/domainname - -# Add any users -if [ -n "${clst_livecd_users}" ] -then - first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1) - - # Here we check to see if games exists for bug #125498 - if [ "$(getent group games | cut -d: -f1)" != "games" ] - then - echo "Adding games group" - groupadd -g 35 games - fi - for x in ${clst_livecd_users} - do - useradd -G users,wheel,audio,games,cdrom,usb -c "Default LiveCD User" \ - -m ${x} - if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ] - then - echo "[Desktop]" > /home/${x}/.dmrc - echo "Session=${clst_livecd_xsession}" >> /home/${x}/.dmrc - chown -R ${x}:users /home/${x} - fi - done -fi - -# Setup sudoers -if [ -f /etc/sudoers ] -then - sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers -fi - -# Setup links for ethernet devices -cd /etc/init.d -ln -sf net.lo net.eth1 -ln -sf net.lo net.eth2 -ln -sf net.lo net.eth3 -ln -sf net.lo net.eth4 - -# Add this for hwsetup/mkx86config -mkdir -p /etc/sysconfig - -# fstab tweaks -echo "tmpfs / tmpfs defaults 0 0" > /etc/fstab -echo "tmpfs /lib/firmware tmpfs defaults 0 0" >> /etc/fstab -echo "tmpfs /usr/portage tmpfs defaults 0 0" >> /etc/fstab -# If /usr/lib/X11/xkb/compiled then make it tmpfs -if [ -d /usr/lib/X11/xkb/compiled ] -then - echo "tmpfs /usr/lib/X11/xkb/compiled tmpfs defaults 0 0" >> \ - /etc/fstab -fi - -# devfs tweaks -[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf - -# Tweak the livecd fstab so that users know not to edit it -# http://bugs.gentoo.org/show_bug.cgi?id=60887 -mv /etc/fstab /etc/fstab.old -echo "####################################################" >> /etc/fstab -echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ##" >> /etc/fstab -echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab -echo "####################################################" >> /etc/fstab -cat /etc/fstab.old >> /etc/fstab -rm /etc/fstab.old - -# Add some helpful aliases -echo "alias cp='cp -i'" >> /etc/profile -echo "alias mv='mv -i'" >> /etc/profile -echo "alias rm='rm -i'" >> /etc/profile -echo "alias ls='ls --color=auto'" >> /etc/profile -echo "alias ll='ls -l'" >> /etc/profile -echo "alias grep='grep --color=auto'" >> /etc/profile - -# Make sure we have the latest pci,usb and hotplug ids -[ -x /sbin/update-pciids ] && /sbin/update-pciids -[ -x /sbin/update-usbids ] && /sbin/update-usbids -if [ -d /usr/share/hwdata ] -then - [ -f /usr/share/hwdata/pci.ids ] && rm -f /usr/share/hwdata/pci.ids - [ -f /usr/share/hwdata/usb.ids ] && rm -f /usr/share/hwdata/usb.ids - ln -s /usr/share/misc/pci.ids /usr/share/hwdata/pci.ids - ln -s /usr/share/misc/usb.ids /usr/share/hwdata/usb.ids -fi - -# Setup opengl in /etc (if configured) -[ -x /usr/sbin/openglify ] && /usr/sbin/openglify - -# Setup configured display manager -if [ -n "${clst_livecd_xdm}" ] -then - sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ - /etc/rc.conf -fi - -# Setup configured default X Session -if [ -n "${clst_livecd_xsession}" ] -then - sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \ - /etc/rc.conf -fi - -# touch /etc/asound.state -touch /etc/asound.state - -# Tweak the MOTD for Gentoo releases -case ${clst_livecd_type} in - gentoo-release-universal ) - cat /etc/generic.motd.txt /etc/universal.motd.txt \ - /etc/minimal.motd.txt > /etc/motd - sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd - ;; - gentoo-release-minimal ) - cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd - sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd - ;; - gentoo-release-livecd ) - cat /etc/generic.motd.txt \ - /etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd - sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \ - -e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd - ;; - gentoo-gamecd ) - cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd - sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd - ;; -esac - -rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt /etc/gamecd.motd.txt - -# Setup splash/bootsplash (if called for) -if [ "${clst_livecd_splash_type}" == "bootsplash" -a -n \ - "${clst_livecd_splash_theme}" ] -then - if [ -d /etc/bootsplash/${clst_livecd_splash_theme} ] - then - sed -i 's:BOOTSPLASH_THEME=\"gentoo\":BOOTSPLASH_THEME=\"${clst_livecd_splash_theme}\":' /etc/conf.d/bootsplash - rm -f /etc/bootsplash/default - ln -s "/etc/bootsplash/${clst_livecd_splash_theme}" \ - /etc/bootsplash/default - else - echo "Error, cannot setup bootsplash theme ${clst_livecd_splash_theme}" - exit 1 - fi -elif [ "${clst_livecd_splash_type}" == "gensplash" -a -n \ - "${clst_livecd_splash_theme}" ] -then - if [ -d /etc/splash/${clst_livecd_splash_theme} ] - then - sed -i \ - -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \ - -e "/^# SPLASH_TTYS=/ s/^#//" \ - /etc/conf.d/splash - rm -f /etc/splash/default - ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default - else - echo "Error, cannot setup splash theme ${clst_livecd_splash_theme}" - exit 1 - fi -fi - -# Create firmware directory if it does not exist -[ ! -d /lib/firmware ] && mkdir -p /lib/firmware - -# tar up the firmware so that it does not get clobbered by the livecd mounts -if [ -n "$(ls /lib/firmware)" ] -then - cd /lib/firmware - if [ -n "$(ls /usr/lib/hotplug/firmware)" ] - then - cp -r /usr/lib/hotplug/firmware/* /lib/firmware - fi - /bin/tar cjpf /lib/firmware.tar.bz2 . - rm -rf /lib/firmware/* - mkdir -p /usr/lib/hotplug - rm -rf /usr/lib/hotplug/firmware - ln -sf /lib/firmware /usr/lib/hotplug/firmware -fi - -# Clear out locales -case ${clst_livecd_type} in - gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd) - rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}* - ;; -esac - -# Post configuration -case ${clst_livecd_type} in - gentoo-gamecd ) - # We grab our configuration - if [ -e /tmp/gamecd.conf ] - then - source /tmp/gamecd.conf || exit 1 - rm /tmp/gamecd.conf - - # Here we replace out game information into several files - sed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd - - # Here we setup our xinitrc - echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc - fi - - # This is my hack to reduce tmpfs usage - mkdir -p /usr/livecd/db/pkg/x11-base - mv -f /var/db/pkg/x11-base/xorg* /usr/livecd/db/pkg/x11-base - rm -rf /var/db - - touch /etc/startx - ;; - gentoo-release-livecd ) - # First we setup the livecd-kernel package - if [ -e /opt/installer/misc/mkvardb ] - then - chmod +x /opt/installer/misc/mkvardb - /opt/installer/misc/mkvardb -p livecd-kernel -c sys-kernel -v ${clst_version_stamp} --provide "virtual/alsa" /boot/System* /boot/kernel* /boot/initr* $(for i in $(find "/lib/modules/" -type f); do grep --quiet "${i}" /var/db/pkg/*/*/CONTENTS || echo ${i}; done) - fi - - # Setup Gnome theme - if [ "${clst_livecd_xsession}" == "gnome" ] - then - gconftool-2 --direct \ - --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --type string --set /desktop/gnome/interface/theme Clearlooks - gconftool-2 --direct \ - --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --type string --set /apps/metacity/general/theme Clearlooks - gconftool-2 --direct \ - --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --type string --set /desktop/gnome/interface/gtk_key_theme \ - Clearlooks - gconftool-2 --direct \ - --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --type string --set /desktop/gnome/interface/gtk_theme \ - Clearlooks - gconftool-2 --direct \ - --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --type string --set /desktop/gnome/interface/font_name "Sans 9" - fi - - # Setup GDM - if [ "${clst_livecd_xdm}" == "gdm" ] - then - if [ ! -e /etc/X11/gdm/gdm.conf ] && [ -e /usr/share/gdm/defaults.conf ] - then - if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ] - then - sedxtra="\nTimedLogin=${first_user}" - else - sedxtra="" - fi - - cp -f /etc/X11/gdm/custom.con /etc/X11/gdm/custom.conf.old - - sed -i \ - -e "s:\(\[daemon\]\)$:\1\nTimedLoginEnable=true\nTimedLoginDelay=10${sedxtra}:" \ - -e 's:\(\[greeter\]\)$:\1\nGraphicalTheme=gentoo-emergence:' \ - /etc/X11/gdm/custom.conf - else - cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old - sed -i \ - -e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \ - -e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \ - -e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \ - -e ':^#GraphicalTheme=: s:^#::' \ - -e 's:^GraphicalTheme=.*$:GraphicalTheme=gentoo-emergence:' \ - /etc/X11/gdm/gdm.conf - - if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ] - then - sed -i \ - -e "s:TimedLogin=:TimedLogin=${first_user}:" \ - /etc/X11/gdm/gdm.conf - fi - fi - fi - - - # This gives us our list of system packages for the installer - mkdir -p /usr/livecd - USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt - - # This is my hack to reduce tmpfs usage - cp -r /usr/portage/profiles /usr/livecd - cp -r /usr/portage/eclass /usr/livecd - rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} - mv -f /etc/gconf /usr/livecd - mv -f /var/db /usr/livecd - - # This gives us a proper cache for portage/installer - tar cjf /usr/livecd/metadata.tar.bz2 /var/cache/edb/dep/usr/portage - - # We remove kernel sources from our vdb - rm -rf /usr/livecd/db/pkg/sys-kernel/*sources* - - # Clear out lastlog - rm -f /var/log/lastlog && touch /var/log/lastlog - - # Create our installer icons - if [ -e /usr/share/applications/installer-gtk.desktop ] - then - if [ -n "${clst_livecd_users}" ] - then - for username in ${clst_livecd_users} - do - mkdir -p /home/${username}/Desktop - cp -f /usr/share/applications/installer-gtk.desktop \ - /home/${username}/Desktop - cp -f /usr/share/applications/installer-faq.desktop \ - /home/${username}/Desktop - cp -f /usr/share/applications/installer-dialog.desktop \ - /home/${username}/Desktop - sed -i -e 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ - /home/${username}/Desktop/installer-dialog.desktop - sed -i -e 's:Exec=installer-gtk:Exec=installer:' \ - /home/${username}/Desktop/installer-gtk.desktop - chown -R ${username}:100 /home/${username} - done - fi - fi - ;; - generic-livecd ) - # This is my hack to reduce tmpfs usage - mkdir -p /usr/livecd - [ -d /etc/gconf ] && mv -f /etc/gconf /usr/livecd - if [ -e /usr/livecd/grppkgs.txt ] - then - rm -f /usr/livecd/grppkgs.txt - fi - if [ -e /usr/livecd/kernelpkgs.txt ] - then - rm -f /usr/livecd/kernelpkgs.txt - fi - - touch /etc/startx - ;; - * ) - if [ -e /usr/livecd/grppkgs.txt ] - then - rm -f /usr/livecd/grppkgs.txt - fi - if [ -e /usr/livecd/kernelpkgs.txt ] - then - rm -f /usr/livecd/kernelpkgs.txt - fi - ;; -esac - -# We want the first user to be used when auto-starting X -if [ -e /etc/startx ] -then - sed -i \ - "s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \ - /root/.bashrc -fi - -if [ -e /lib/rcscripts/addons/udev-start.sh ] -then - sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh -fi diff --git a/src/catalyst/targets/support/mips-arcload_conf.sh b/src/catalyst/targets/support/mips-arcload_conf.sh deleted file mode 100644 index 29692b4a67..0000000000 --- a/src/catalyst/targets/support/mips-arcload_conf.sh +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/bash - - -#// Variables holding the data of the arcload config file, arc.cf -#//----------------------------------------------------------------------------- - -topofconfig="# Gentoo/MIPS LiveCD Prototype\n# ARCLoad Configuration\n\ndetect;\n\n\ -# Global options\ncomment\t\t\"Global Options (not bootable):\\\n\\\r\\\n\\\r\";\n\n" - -serial="serial {\n\ -\tbaud=9600 {\n\ -\t\tport1 {\n\ -\t\t\tdescription\t\"Serial Console, Port 1, 9600 Baud\";\n\ -\t\t\timage\t\t\"\";\n\ -\t\t\tappend\t\t\"console=ttyS0,9600\" \"nox\";\n\ -\t\t}\n\n\ -\t\tport2 {\n\ -\t\t\tdescription\t\"Serial Console, Port 2, 9600 Baud\";\n\ -\t\t\timage\t\t\"\";\n\ -\t\t\tappend\t\t\"console=ttyS1,9600\" \"nox\";\n\ -\t\t}\n\ -\t}\n\n\ -\tbaud=38400 {\n\ -\t\tport1 {\n\ -\t\t\tdescription\t\"Serial Console, Port 1, 38400 Baud\";\n\ -\t\t\timage\t\t\"\";\n\ -\t\t\tappend\t\t\"console=ttyS0,38400\" \"nox\";\n\ -\t\t}\n\n\ -\t\tport2 {\n\ -\t\t\tdescription\t\"Serial Console, Port 2, 38400 Baud\";\n\ -\t\t\timage\t\t\"\";\n\ -\t\t\tappend\t\t\"console=ttyS1,38400\" \"nox\";\n\ -\t\t}\n\ -\t}\n\ -}\n\n\n" - -dbg="debug {\n\ -\tdescription\t\"Debug Shell\";\n\ -\timage\t\t\"\";\n\ -\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n" - -cmt1="comment\t\t\"\\\n\\\n\";\n\ -comment\t\t\"Bootable Images & Options:\\\n\\\r\\\n\\\r\";\n" - -ip22base="# IP22 R4x00 Systems (Indy/Indigo2)\n\ -ip22 {\n\ -\tdescription\t\"SGI Indy/Indigo2\";\n\ -\tappend\t\t\"real_root=/dev/sr0\" \"cdroot=/dev/loop0\" \"looptype=sgimips\" \"nosound\";\n" - -ip22r4k="\tr4000 r4600 r4700 {\n\ -\t\tdescription\t\"\\\tR4x00 CPU\";\n\ -\t\timage system\t\"/ip22r4k\";\n\ -\t}\n" - -ip22r5k="\tr5000 {\n\ -\t\tdescription\t\"\\\tR5000 CPU\";\n\ -\t\timage system\t\"/ip22r5k\";\n\ -\t}\n" - -ip22vid="\tvideo {\n\ -\t\tdescription\t\"\\\tNewport Console\\\n\\\r\";\n\ -\t\tappend\t\t\"console=tty0\" \"ip22\";\n\ -\t}\n" - -ip22x="}\n\n\n" - -ip27base="# IP27 Origin 200/2000\n\ -ip27 {\n\ -\tdescription\t\"SGI Origin 200/2000\\\n\\\r\";\n\ -\timage system\t\"/ip27r10k\";\n\ -\tappend\t\t\"real_root=/dev/sr0\" \"cdroot=/dev/loop0\" \"looptype=sgimips\" \"nox\" \"nosound\";\n\ -}\n\n\n" - -ip28base="# IP28 Indigo2 Impact R10000\n\ -ip28 {\n\ -\tdescription\t\"SGI Indigo2 Impact R10000\\\n\\\r\";\n\ -\timage system\t\"/ip28r10k\";\n\ -\tappend\t\t\"real_root=/dev/sr0\" \"cdroot=/dev/loop0\" \"looptype=sgimips\" \"nosound\" \"ip28\";\n\ -}\n\n\n" - -ip30base="# IP30 Octane\n\ -ip30 {\n\ -\tdescription\t\"SGI Octane\";\n\ -\timage system\t\"/ip30r10k\";\n\ -\tappend\t\t\"real_root=/dev/sr0\" \"cdroot=/dev/loop0\" \"looptype=sgimips\" \"nosound\" \"ip30\";\n\n\ -\tnosmp {\n\ -\t\tdescription\t\"\\\tUniprocessor Mode\";\n\ -\t\tappend\t\t\"nosmp\";\n\ -\t}\n\n\ -\tvideo {\n\ -\t\tdescription\t\"\\\tImpactSR/VPro Console\\\n\\\r\";\n\ -\t\tappend\t\t\"console=tty0\" \"ip30\";\n\ -\t}\n\ -}\n\n\n" - -ip32base="# IP32 O2\n\ -ip32 {\n\ -\tdescription\t\"SGI O2\";\n\ -\tappend\t\t\"real_root=/dev/sr0\" \"cdroot=/dev/loop0\" \"looptype=sgimips\" \"nosound\";\n" - -ip32r5k="\tr5000 {\n\ -\t\tdescription\t\"\\\tR5000 CPU\";\n\ -\t\timage system\t\"/ip32r5k\";\n\ -\t}\n" - -ip32rm5k="\trm5200 {\n\ -\t\tdescription\t\"\\\tRM5200 CPU\";\n\ -\t\timage system\t\"/ip32rm5k\";\n\ -\t}\n" - -ip32rm7k="\trm7000 {\n\ -\t\tdescription\t\"\\\tRM7000 CPU\";\n\ -\t\timage system\t\"/ip32rm7k\";\n\ -\t}\n" - -ip32r10k="\tr10000 r12000 {\n\ -\t\tdescription\t\"\\\tR10000/R12000 CPU\";\n\ -\t\timage system\t\"/ip32r10k\";\n\ -\t}\n" - -ip32vid="\tvideo=640x480 {\n\ -\t\tdescription\t\"\\\tGBEFB Console 640x480 16bpp/75Hz\";\n\ -\t\tappend\t\t\"console=tty0 video=gbefb:640x480-16@75\" \"ip32\";\n\ -\t}\n\n\ -\tvideo=800x600 {\n\ -\t\tdescription\t\"\\\tGBEFB Console 800x600 16bpp/75Hz\";\n\ -\t\tappend\t\t\"console=tty0 video=gbefb:800x600-16@75\" \"ip32\";\n\ -\t}\n\n\ -\tvideo=1024x768 {\n\ -\t\tdescription\t\"\\\tGBEFB Console 1024x768 16bpp/75Hz\";\n\ -\t\tappend\t\t\"console=tty0 video=gbefb:1024x768-16@75\" \"ip32\";\n\ -\t}\n\n\ -\tvideo=1280x1024 {\n\ -\t\tdescription\t\"\\\tGBEFB Console 1280x1024 16bpp/75Hz\\\n\\\r\\\n\\\r\\\n\\\r\";\n\ -\t\tappend\t\t\"console=tty0 video=gbefb:1280x1024-16@75\" \"ip32\";\n\ -\t}\n" - -ip32x="}\n\n\n" - -cmt2="comment\t\t\"To boot an image, set \`OSLoadFilename\` to the to following sequence\";\n\ -comment\t\t\"depending on your desired options (examples):\\\n\\\r\\\n\\\r\";\n\ -comment\t\t\"IP32 R5000 w/ 38400 serial:\\\n\\\r\";\n\ -comment\t\t\"setenv OSLoadFilename ip32(r5000,serial-h)\\\n\\\r\\\n\\\r\";\n\ -comment\t\t\"IP32 RM5200 w/ GBEFB Console @ 800x600:\\\n\\\r\";\n\ -comment\t\t\"setenv OSloadFilename ip32(rm5200,video=800x600)\\\n\\\r\\\n\\\r\";\n\ -comment\t\t\"IP30 w/ no SMP and video:\\\n\\\r\";\n\ -comment\t\t\"setenv OSLoadFilename ip30(nosmp,video)\\\n\\\r\\\n\\\r\\\n\\\r\";\n\ -comment\t\t\"Once \`OSLoadFilename\` is set, execute:\\\n\\\r\\\n\\\r\";\n\ -comment\t\t\"\`sashARCS\` for IP22/IP32\\\n\\\r\\\n\\\r\";\n\ -comment\t\t\"\`sash64\` for IP27/IP28/IP30\\\n\\\r\\\n\\\r\";\n\n" - -#//----------------------------------------------------------------------------- diff --git a/src/catalyst/targets/support/netboot2-final.sh b/src/catalyst/targets/support/netboot2-final.sh deleted file mode 100644 index 7e6159f1d5..0000000000 --- a/src/catalyst/targets/support/netboot2-final.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/netboot2-final.sh,v 1.3 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - - -extract_kernels ${clst_target_path}boot - -# Move kernel binaries to ${clst_target_path}kernels, and -# move everything else to ${clst_target_path}kernels/misc -mkdir ${clst_target_path}kernels -mkdir ${clst_target_path}kernels/misc - -for x in ${clst_boot_kernel}; do - mv ${clst_target_path}boot/${x} ${clst_target_path}kernels - mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc -done - -rmdir ${clst_target_path}boot - -# Any post-processing necessary for each architecture can be done here. This -# may include things like sparc's elftoaout, x86's PXE boot, etc. -case ${clst_mainarch} in - alpha) - sleep 0 - ;; - arm) - sleep 0 - ;; - hppa) - sleep 0 - ;; - sparc*) - sleep 0 - ;; - ia64) - sleep 0 - ;; - x86|amd64) - sleep 0 - ;; -esac -exit $? diff --git a/src/catalyst/targets/support/post-kmerge.sh b/src/catalyst/targets/support/post-kmerge.sh deleted file mode 100644 index 951740b20d..0000000000 --- a/src/catalyst/targets/support/post-kmerge.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -. /tmp/chroot-functions.sh - -update_env_settings - -# Only run depscan.sh if modules exist -if [ -n "$(ls /lib/modules)" ] -then - /sbin/depscan.sh - find /lib/modules -name modules.dep -exec touch {} \; -fi diff --git a/src/catalyst/targets/support/pre-kmerge.sh b/src/catalyst/targets/support/pre-kmerge.sh deleted file mode 100644 index 3503ab49af..0000000000 --- a/src/catalyst/targets/support/pre-kmerge.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /tmp/chroot-functions.sh - -update_env_settings - -case ${clst_target} in - livecd*|stage4) - export USE="livecd" - run_emerge --oneshot genkernel - install -d /tmp/kerncache - - # Setup case structure for livecd_type - case ${clst_livecd_type} in - gentoo-release-minimal | gentoo-release-universal) - case ${clst_mainarch} in - amd64|x86) - sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /' /usr/share/genkernel/genkernel - ;; - esac - ;; - esac - ;; - - - netboot2) - run_emerge --oneshot genkernel - install -d /tmp/kerncache - - # Set the netboot builddate/hostname in linuxrc and copy to proper arch - # directory in genkernel - sed -e "s/@@MYDATE@@/${clst_netboot2_builddate}/g" \ - -e "s/@@RELVER@@/${clst_version_stamp}/g" \ - ${clst_root_path}usr/share/genkernel/netboot/linuxrc.x \ - > ${clst_root_path}usr/share/genkernel/${clst_mainarch}/linuxrc - - echo ">>> Copying support files to ${clst_root_path} ..." - cp -pPRf ${clst_root_path}usr/share/genkernel/netboot/misc/* \ - ${clst_merge_path} - - echo ">>> Copying busybox config ..." - cp -f ${clst_root_path}usr/share/genkernel/${clst_mainarch}/nb-busybox.cf \ - ${clst_root_path}usr/share/genkernel/${clst_mainarch}/busy-config - ;; -esac diff --git a/src/catalyst/targets/support/rc-update.sh b/src/catalyst/targets/support/rc-update.sh deleted file mode 100644 index b35ebed2e8..0000000000 --- a/src/catalyst/targets/support/rc-update.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -if [ "${clst_spec_prefix}" == "livecd" ] -then - # default programs that we always want to start - rc-update del iptables - rc-update del netmount - rc-update del keymaps - rc-update del serial - rc-update del consolefont - rc-update add autoconfig default - rc-update add modules boot - rc-update add pwgen default - [ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default - [ -e /etc/init.d/splash ] && rc-update add splash default - [ -e /etc/init.d/sysklogd ] && rc-update add sysklogd default - [ -e /etc/init.d/metalog ] && rc-update add metalog default - [ -e /etc/init.d/syslog-ng ] && rc-update add syslog-ng default - - # Do some livecd_type specific rc-update changes - case ${clst_livecd_type} in - gentoo-gamecd ) - rc-update add spind default - ;; - gentoo-release-livecd ) - rc-update add spind default - rc-update add xdm default - ;; - generic-livecd ) - rc-update add spind default - ;; - *) - ;; - esac -fi - -# Perform any rcadd then any rcdel -if [ -n "${clst_rcadd}" ] || [ -n "${clst_rcdel}" ] -then - if [ -n "${clst_rcadd}" ] - then - for x in ${clst_rcadd} - do - echo "Adding ${x%%|*} to ${x##*|}" - if [ ! -d /etc/runlevels/${x##*|} ] - then - echo "Runlevel ${x##*|} doesn't exist .... creating it" - mkdir -p "/etc/runlevels/${x##*|}" - fi - rc-update add "${x%%|*}" "${x##*|}" - done - fi - - if [ -n "${clst_rcdel}" ] - then - for x in ${clst_rcdel} - do - rc-update del "${x%%|*}" "${x##*|}" - done - fi -fi - diff --git a/src/catalyst/targets/support/target_image_setup.sh b/src/catalyst/targets/support/target_image_setup.sh deleted file mode 100644 index c55aba60d6..0000000000 --- a/src/catalyst/targets/support/target_image_setup.sh +++ /dev/null @@ -1,44 +0,0 @@ - -. ${clst_sharedir}/targets/support/functions.sh -. ${clst_sharedir}/targets/support/filesystem-functions.sh - -# Make the directory if it doesnt exist -mkdir -p $1 - -loopret=1 -case ${clst_fstype} in - normal) - create_normal_loop $1 - loopret=$? - ;; - zisofs) - create_zisofs $1 - loopret=$? - ;; - noloop) - create_noloop $1 - loopret=$? - ;; - squashfs) - create_squashfs $1 - loopret=$? - ;; - jffs) - create_jffs $1 - loopret=$? - ;; - jffs2) - create_jffs2 $1 - loopret=$? - ;; - cramfs) - create_cramfs $1 - loopret=$? - ;; -esac - -if [ ${loopret} = "1" ] -then - die "Filesystem not setup" -fi -exit $loopret diff --git a/src/catalyst/targets/support/unmerge.sh b/src/catalyst/targets/support/unmerge.sh deleted file mode 100644 index 9a3720b6bf..0000000000 --- a/src/catalyst/targets/support/unmerge.sh +++ /dev/null @@ -1,10 +0,0 @@ -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/unmerge.sh,v 1.6 2006/10/02 20:41:54 wolf31o2 Exp $ - - -source /tmp/chroot-functions.sh - -update_env_settings - -run_emerge -C ${clst_packages} - -exit 0 diff --git a/src/catalyst/targets/tinderbox/tinderbox-chroot.sh b/src/catalyst/targets/tinderbox/tinderbox-chroot.sh deleted file mode 100644 index 9c34e01ae2..0000000000 --- a/src/catalyst/targets/tinderbox/tinderbox-chroot.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox-chroot.sh,v 1.17 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh - -update_env_settings - -setup_myfeatures - -# Setup the environment -export FEATURES="${clst_myfeatures}" - -# START THE BUILD -setup_portage - -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" -# Backup pristine system - -rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \ - /tmp/rsync-bak/ - -for x in ${clst_tinderbox_packages} -do - if [ -n "${clst_VERBOSE}" ] - then - run_emerge --usepkg --buildpkg --newuse -vp $x - echo "Press any key within 15 seconds to pause the build..." - read -s -t 15 -n 1 - if [ $? -eq 0 ] - then - echo "Press any key to continue..." - read -s -n 1 - fi - fi - - mkdir -p /tmp/packages/$x - export PORT_LOGDIR="/tmp/packages/$x" - run_emerge --usepkg --buildpkg --newuse $x - - if [ "$?" != "0" ] - then - echo "! $x" >> /tmp/tinderbox.log - else - echo "$x" >> /tmp/tinderbox.log - fi - echo "Syncing from original pristine tinderbox snapshot..." - rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \ - "/usr/portage/" /tmp/rsync-bak/ / -done diff --git a/src/catalyst/targets/tinderbox/tinderbox-controller.sh b/src/catalyst/targets/tinderbox/tinderbox-controller.sh deleted file mode 100644 index 36092c80de..0000000000 --- a/src/catalyst/targets/tinderbox/tinderbox-controller.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox-controller.sh,v 1.6 2006/10/02 20:41:54 wolf31o2 Exp $ - -. ${clst_sharedir}/targets/support/functions.sh - -case $1 in - run) - shift - exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh - ;; - preclean) - #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh - delete_from_chroot /tmp/chroot-functions.sh - ;; - clean) - exit 0 - ;; - *) - exit 1 - ;; -esac -exit $? diff --git a/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh b/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh deleted file mode 100644 index 6e0ea00253..0000000000 --- a/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox-preclean-chroot.sh,v 1.9 2006/10/02 20:41:54 wolf31o2 Exp $ - -. /tmp/chroot-functions.sh -update_env_settings -cleanup_distcc |