Added Andrew Gaffney to maintainer list, fixed a typo, updated copyright information...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1249 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index b1f3f0765d3e3fbdc4160de73b14ea9a5fce779a..0a3c86fd46f33ef149652a82e1dda404edae754c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  11 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  examples/livecd-stage2_template.spec, modules/generic_stage_target.py:
+  Added Andrew Gaffney to maintainer list, fixed a typo, updated copyright
+  information, and added a small fix for FreeBSD for bug #169041. This is
+  catalyst 2.0.5_pre4 for testing.
+
   11 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/chroot-functions.sh:
   Adding a slightly modified version of Andrew Gaffney's <agaffney@gentoo.org>

diff --git a/catalyst b/catalyst
index 6a6421fb07378c52b285031163d9419724fd1f4e..a4e73387d74cca8f45c2515d8a88ed280dde53a4 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -2,13 +2,14 @@
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
+# Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@gentoo.org>
 
 import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.5_pre3"
+__version__="2.0.5_pre4"
 
 conf_values={}
 
@@ -39,7 +40,7 @@ def usage():
 
 def version():
        print "Gentoo Catalyst, version "+__version__
-       print "Copyright 2003-2006 The Gentoo Foundation"
+       print "Copyright 2003-2007 Gentoo Foundation"
        print "Distributed under the GNU General Public License version 2\n"
 
 def parse_config(myconfig):

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 05cb0d1d776dbbda61431659636b87f4a3dd8b63..d0212008bc0aa427c850c62880c55e8f6e26cc78 100644 (file)
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -84,7 +84,7 @@ kerncache_path:
 # 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.
+# noloop - This copies the files to the CD directly, without using a loopback.
 # example:
 # livecd/fstype: squashfs
 livecd/fstype:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index f1c8b50722b540f6977da2eecefcd0976e217a77..31bc512560f9e94b1492b47242e5a63a53290670 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1363,6 +1363,8 @@ class generic_stage_target(generic_target):
                                # stat the dir, delete the dir, recreate the dir and set
                                # the proper perms and ownership
                                mystat=os.stat(myemp)
+                               if os.uname()[0] == "FreeBSD":
+                                       cmd("chflags -R noschg "+myemp, "Could not remove immutable flag")
                                #cmd("rm -rf "+myemp, "Could not remove existing file: "+myemp,env-self.env)
                                shutil.rmtree(myemp)
                                os.makedirs(myemp,0755)