From f32ce34713e3b308a2229ddd505acc05901ac433 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 28 Jun 2006 12:51:43 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1155 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 ++++++++- catalyst | 4 ++-- modules/generic_stage_target.py | 8 +------- modules/livecd_stage2_target.py | 8 ++++---- targets/support/filesystem-functions.sh | 8 ++++---- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9bba925..e5c48aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.639 2006/06/28 12:48:22 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.640 2006/06/28 12:51:43 wolf31o2 Exp $ + + 28 Jun 2006; Chris Gianelloni 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 arch/ppc.py, arch/x86.py: diff --git a/catalyst b/catalyst index 11269a65..d464c912 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python -OO # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.156 2006/06/21 22:11:54 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.157 2006/06/28 12:51:43 wolf31o2 Exp $ # Maintained in full by: # Eric Edgar @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0_rc48" +__version__="2.0_rc49" conf_values={} diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 5c6fbd0e..6022b44c 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.136 2006/06/22 14:54:27 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.137 2006/06/28 12:51:43 wolf31o2 Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -345,12 +345,6 @@ class generic_stage_target(generic_target): def set_fsops(self): if self.settings.has_key("fstype"): self.valid_values.append("fsops") - if self.settings.has_key(self.settings["spec_prefix"]+"/fs-ops"): - print "\n\n\nWarning!!!"+self.settings["spec_prefix"]+"/fs-ops" + "is deprecated and may be removed." - print "\tUse "+self.settings["spec_prefix"]+"/fsops" + "instead.\n\n\n" - self.settings["fsops"]=self.settings[self.settings["spec_prefix"]+"/fs-ops"] - del self.settings[self.settings["spec_prefix"]+"/fs-ops"] - 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"] diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index a70f6503..48a40144 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.60 2006/01/18 13:06:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.61 2006/06/28 12:51:43 wolf31o2 Exp $ """ Builder class for a LiveCD stage2 build. @@ -23,9 +23,9 @@ class livecd_stage2_target(generic_stage_target): "livecd/modblacklist","livecd/splash_theme","livecd/splash_type",\ "livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\ "livecd/root_overlay","livecd/devmanager","livecd/users",\ - "gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\ - "livecd/fstype","livecd/linuxrc","livecd/bootargs","gamecd/conf",\ - "livecd/xdm","livecd/xsession","livecd/volid"]) + "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"): diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh index ef1bd675..31ad6d35 100755 --- a/targets/support/filesystem-functions.sh +++ b/targets/support/filesystem-functions.sh @@ -53,7 +53,7 @@ create_noloop() { create_squashfs() { echo "Creating squashfs..." export loopname="image.squashfs" - mksquashfs "${clst_destpath}" "$1/${loopname}" ${clst_fs_ops} -noappend \ + mksquashfs "${clst_destpath}" "$1/${loopname}" ${clst_fsops} -noappend \ || die "mksquashfs failed, did you emerge squashfs-tools?" } @@ -61,7 +61,7 @@ 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_fs_ops} \ + mkfs.jffs -d ${clst_destpath} -o $1/${loopname} ${clst_fsops} \ || die "Could not create a jffs filesystem" } @@ -69,7 +69,7 @@ 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_fs_ops} \ + mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} ${clst_fsops} \ || die "Could not create a jffs2 filesystem" } @@ -77,6 +77,6 @@ create_cramfs(){ echo "Creating cramfs..." export loopname="image.cramfs" #fs_check /sbin/mkcramfs cramfs sys-fs/cramfs - mkcramfs ${clst_fs_ops} ${clst_destpath} $1/${loopname} \ + mkcramfs ${clst_fsops} ${clst_destpath} $1/${loopname} \ || die "Could not create a cramfs filesystem" } -- 2.26.2