From 2903cf9b066c187e39e8c23b83831e51b34dd46b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 11 Oct 2007 23:59:41 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1249 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 5 +++-- examples/livecd-stage2_template.spec | 2 +- modules/generic_stage_target.py | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1f3f076..0a3c86fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 11 Oct 2007; Chris Gianelloni 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 targets/support/chroot-functions.sh: Adding a slightly modified version of Andrew Gaffney's diff --git a/catalyst b/catalyst index 6a6421fb..a4e73387 100755 --- a/catalyst +++ b/catalyst @@ -2,13 +2,14 @@ # Maintained in full by: # Eric Edgar +# Andrew Gaffney # Chris Gianelloni import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 05cb0d1d..d0212008 100644 --- 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 f1c8b507..31bc5125 100644 --- 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) -- 2.26.2