From ad4eb0fc8394f21fb41a2c7e6e7e0ce7f6f6f76f Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Wed, 15 Oct 2003 04:30:02 +0000 Subject: [PATCH] new ChangeLog entry, old ChangeLog moved into place, see ChangeLog for changes git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@6 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 12 +++++ ChangeLog.old | 106 +++++++++++++++++++++++++++++++++++++++ modules/catalyst_util.py | 23 +++++++-- 3 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 ChangeLog.old diff --git a/ChangeLog b/ChangeLog index e69de29b..451b041d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for gentoo/src/catalyst +# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.2 2003/10/15 04:30:02 drobbins Exp $ + + 14 Oct 2003; Daniel Robbins : 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/ChangeLog.old b/ChangeLog.old new file mode 100644 index 00000000..4de75c93 --- /dev/null +++ b/ChangeLog.old @@ -0,0 +1,106 @@ +# ChangeLog for gentoo-src/stager +# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog.old,v 1.1 2003/10/15 04:30:02 drobbins Exp $ + + 12 Oct 2003; Daniel Robbins : subarch test outsourced to + python catalyst-subarches function. + + 12 Oct 2003; zhen include/build_functions.sh: fixed the + entry in include/build_functions.sh for location of bootstrap.sh + + 12 Oct 2003; zhen catalyst: + removing dup enter_chroot + + 12 Oct 2003; Robin H. Johnson catalyst: + document subarches checking + + 12 Oct 2003; Robin H. Johnson catalyst: + Fix valid subarch test. + + 12 Oct 2003; zhen 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; include/build_functions.sh: + fixed SRCBALL and DESTBALL, making it transparent for profiles + + 11 Oct 2003; catalyst, include/functions.sh: + added an exit condition to the cmd line argument case statement + + 09 Oct 2003; 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 catalyst: + changed how cmd line arguments are handled + + 08 Oct 2003; zhen catalyst: + I changed the is_special handling so that it is cleaner and faster + + 08 Oct 2003; zhen 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 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 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 catalyst: + since we now have a default profile in portage, i massaged some errors + messages to reflect that. + + 04 Oct 2003; zhen 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 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 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; 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; 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; 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 : 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 . + I would like to thank him and the rest of the contributors that coded stager. + diff --git a/modules/catalyst_util.py b/modules/catalyst_util.py index 110fa6d9..8b3f7359 100755 --- a/modules/catalyst_util.py +++ b/modules/catalyst_util.py @@ -254,13 +254,26 @@ modesdesc={ "snap":"Create a snapshot of the Portage tree for building", "stage":"Build the specified stage tarball or package set", } -def do_snapshot(portdir,snap_temp_dir,snapball): - retval=os.system("rsync -a --exclude /packages/ --exclude /distfiles/ --exclude CVS/ "+portdir+"/ "+snap_temp_dir+"/portage/") +def do_snapshot(portdir,snap_temp_dir,snapdir,snapversion): + print "Creating Portage tree snapshot "+snapversion+" from "+portdir+"..." + mytmp=snap_temp_dir+"/snap-"+snapversion + if os.path.exists(mytmp): + retval=os.system("rm -rf "+mytmp) + if retval != 0: + die("Could not remove existing directory: "+mytmp) + os.makedirs(mytmp) + retval=os.system("rsync -a --exclude /packages/ --exclude /distfiles/ --exclude CVS/ "+portdir+"/ "+mytmp+"/portage/") if retval != 0: die("snapshot failure.") - retval=os.system("( cd "+snap_temp_dir+"; tar cjf "+snapball+" portage )") + print "Compressing Portage snapshot tarball..." + retval=os.system("( cd "+mytmp+"; tar cjf "+snapdir+"/portage-"+snapversion+".tar.bz2 portage )") if retval != 0: die("snapshot tarball creation failure.") + print "Cleaning up temporary snapshot directory..." + #Be a good citizen and clean up after ourselves + retval=os.system("rm -rf "+mytmp) + if retval != 0: + die("Unable to clean up directory: "+mytmp) def usage(): print "catalyst: Gentoo Linux stage/LiveCD/GRP building tool" @@ -327,11 +340,11 @@ def mainloop(): verify_os(myset) global_settings_init(myset) init_writable_dirs(myset) - dump_settings(myset) + #dump_settings(myset) if sys.argv[1]=="snap": if len(sys.argv)!=3: die("invalid number of arguments for snapshot.") - do_snapshot(myset["portdir"],myset["cat_tmpdir"],myset["snapdir"]+"/portage-"+sys.argv[2]+".tar.bz2") + do_snapshot(myset["portdir"],myset["cat_tmpdir"],myset["snapdir"],sys.argv[2]) #do snapshot here sys.exit(0) sys.exit(0) -- 2.26.2