From: Chris Gianelloni Date: Thu, 16 Dec 2004 20:01:38 +0000 (+0000) Subject: Added more embedded updates from mutex@gentoo.org and Closing bug #67289. X-Git-Tag: CATALYST_2_0_6_916~875 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a955fff0bbbfc403b63c018a9bd70e5ebcd589a3;p=catalyst.git Added more embedded updates from mutex@gentoo.org and Closing bug #67289. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@498 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index d9c21770..01934dc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.125 2004/12/16 17:51:22 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.126 2004/12/16 20:01:38 wolf31o2 Exp $ + + 16 Dec 2004; Chris Gianelloni + 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 +examples/gamecd.conf.example, -livecd/files/gamecd-xinitrc, diff --git a/modules/embedded_target.py b/modules/embedded_target.py index 68a69245..26c0eaa6 100644 --- a/modules/embedded_target.py +++ b/modules/embedded_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/embedded_target.py,v 1.3 2004/11/23 00:02:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/embedded_target.py,v 1.4 2004/12/16 20:01:38 wolf31o2 Exp $ """ This class works like a 'stage3'. A stage2 tarball is unpacked, but instead @@ -22,10 +22,10 @@ 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/runscript","embedded/mergeroot","embedded/packages","embedded/use","embedded/fstype"]) + self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/runscript","embedded/mergeroot","embedded/packages","embedded/use","embedded/fs-type"]) - if addlargs.has_key("embedded/fstype"): - self.valid_values.append("embedded/fsops") + if addlargs.has_key("embedded/fs-type"): + self.valid_values.append("embedded/fs-ops") generic_stage_target.__init__(self,spec,addlargs) self.settings["image_path"]=self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/image" @@ -55,7 +55,7 @@ class embedded_target(generic_stage_target): def build_fs(self): try: - if self.settings.has_key("embedded/fstype"): + if self.settings.has_key("embedded/fs-type"): cmd("/bin/bash "+self.settings["sharedir"]+"/targets/embedded/embedded.sh package","filesystem packaging failed") except CatalystError: self.unbind() diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh index 36c3e139..26d13b74 100644 --- a/targets/embedded/embedded-fs-runscript.sh +++ b/targets/embedded/embedded-fs-runscript.sh @@ -18,24 +18,24 @@ 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_fsops} || die "Could not create a jffs filesystem" + ${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_fsops} || die "Could not create a jffs2 filesystem" + ${clst_embedded_fs_ops} || die "Could not create a jffs2 filesystem" ;; cramfs) fs_check /sbin/mkcramfs cramfs sys-fs/cramfs - mkcramfs ${clst_embedded_fsops} ${root_fs_path} \ + mkcramfs ${clst_embedded_fs_ops} ${root_fs_path} \ ${clst_image_path}/root.img || die "Could not create a cramfs filesystem" ;; squashfs) - fs_check /usr/sbin/mksquashfs squashfs sys-fs/squashfs-tools + fs_check /usr/bin/mksquashfs squashfs sys-fs/squashfs-tools mksquashfs ${root_fs_path} ${clst_image_path}/root.img \ - ${clst_embedded_fsops} || die "Could not create a squashfs filesystem" + ${clst_embedded_fs_ops} || die "Could not create a squashfs filesystem" ;; *) ;; diff --git a/targets/embedded/embedded.sh b/targets/embedded/embedded.sh index 817a7332..b27433e5 100644 --- a/targets/embedded/embedded.sh +++ b/targets/embedded/embedded.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded.sh,v 1.5 2004/10/15 02:46:58 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded.sh,v 1.6 2004/12/16 20:01:38 wolf31o2 Exp $ case $1 in enter) @@ -13,15 +13,14 @@ case $1 in ${clst_CHROOT} ${clst_chroot_path} /tmp/embedded-chroot.sh || exit 1 rm -f ${clst_chroot_path}/tmp/embedded-chroot.sh ;; - - preclean) - exit 0 - ;; - - clean) - exit 0 + 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_fs | cut -f1` + echo "Created ${clst_embedded_fs_type} image at ${clst_image_path}/root_fs" + echo "Image size: ${imagesize}k" ;; - *) exit 1 ;;