From: Chris Gianelloni Date: Fri, 16 Dec 2005 19:08:59 +0000 (+0000) Subject: Fixed up spacing/coding style on embedded. X-Git-Tag: CATALYST_2_0_6_916~522 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e274ae36e9c516ebadaf723b45ff8d318cd5543;p=catalyst.git Fixed up spacing/coding style on embedded. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@972 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 9523489e..6f409077 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.459 2005/12/16 18:57:57 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.460 2005/12/16 19:08:59 wolf31o2 Exp $ + + 16 Dec 2005; Chris Gianelloni + targets/embedded/embedded-chroot.sh, + targets/embedded/embedded-controller.sh, + targets/embedded/embedded-fs-runscript.sh, + targets/embedded/embedded-preclean-chroot.sh: + Fixed up spacing/coding style on embedded. 16 Dec 2005; Chris Gianelloni arch/x86.py, targets/support/bootloader-setup.sh, targets/support/chroot-functions.sh, diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh index 63429ed0..66d7545f 100755 --- a/targets/embedded/embedded-chroot.sh +++ b/targets/embedded/embedded-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.19 2005/12/09 19:03:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.20 2005/12/16 19:08:59 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -11,7 +11,7 @@ setup_myfeatures setup_myemergeopts -# setup the environment +# Setup the environment export FEATURES="${clst_myfeatures}" #export clst_myemergeopts="${clst_myemergeopts} -O" export USE="${clst_use}" diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh index fc295226..42c31eda 100755 --- a/targets/embedded/embedded-controller.sh +++ b/targets/embedded/embedded-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash # 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/embedded-controller.sh,v 1.7 2005/11/30 21:34:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-controller.sh,v 1.8 2005/12/16 19:08:59 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -22,17 +22,19 @@ case $1 in # 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 +# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \ +# ${clst_embedded_fs_type} || exit 1 # imagesize=`du -sk ${clst_image_path}/root.img | cut -f1` -# echo "Created ${clst_embedded_fs_type} image at ${clst_image_path}/root.img" +# echo "Created ${clst_embedded_fs_type} image at \ +# ${clst_image_path}/root.img" # echo "Image size: ${imagesize}k" - # ;; pre-kmerge) # Sets up the build environment before any kernels are compiled exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh ;; + post-kmerge) # Cleans up the build environment after the kernels are compiled exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh @@ -44,7 +46,7 @@ case $1 in # if we have our own linuxrc, copy it in if [ -n "${clst_linuxrc}" ] then - cp -a ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc + cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc fi exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh delete_from_chroot tmp/linuxrc @@ -55,8 +57,8 @@ case $1 in ${clst_sharedir}/targets/support/target_image_setup.sh $1 ;; - livecd-update) - # now, finalize and tweak the livecd fs (inside of the chroot) + livecd-update) + # Now, finalize and tweak the livecd fs (inside of the chroot) exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh ;; @@ -73,7 +75,6 @@ case $1 in ${clst_sharedir}/targets/support/create-iso.sh $1 ;; - clean) ;; diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh index e31995ff..11628b3d 100644 --- a/targets/embedded/embedded-fs-runscript.sh +++ b/targets/embedded/embedded-fs-runscript.sh @@ -16,26 +16,28 @@ fs_check() { 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_fs_ops} || die "Could not create a jffs filesystem" + fs_check /usr/sbin/mkfs.jffs jffs sys-fs/mtd + mkfs.jffs -d ${root_fs_path} -o ${clst_image_path}/root.img \ + ${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_fs_ops} || die "Could not create a jffs2 filesystem" + fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd + mkfs.jffs2 --root=${root_fs_path} --output=${clst_image_path}/root.img\ + ${clst_embedded_fs_ops} || die "Could not create a jffs2 filesystem" ;; cramfs) - fs_check /sbin/mkcramfs cramfs sys-fs/cramfs - mkcramfs ${clst_embedded_fs_ops} ${root_fs_path} \ - ${clst_image_path}/root.img || die "Could not create a cramfs filesystem" + fs_check /sbin/mkcramfs cramfs sys-fs/cramfs + mkcramfs ${clst_embedded_fs_ops} ${root_fs_path} \ + ${clst_image_path}/root.img || \ + die "Could not create a cramfs filesystem" ;; squashfs) - fs_check /usr/bin/mksquashfs squashfs sys-fs/squashfs-tools - mksquashfs ${root_fs_path} ${clst_image_path}/root.img \ - ${clst_embedded_fs_ops} || die "Could not create a squashfs filesystem" + fs_check /usr/bin/mksquashfs squashfs sys-fs/squashfs-tools + mksquashfs ${root_fs_path} ${clst_image_path}/root.img \ + ${clst_embedded_fs_ops} || \ + die "Could not create a squashfs filesystem" ;; *) ;; diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh index 7bf4ec46..e54b913b 100755 --- a/targets/embedded/embedded-preclean-chroot.sh +++ b/targets/embedded/embedded-preclean-chroot.sh @@ -1,8 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-preclean-chroot.sh,v 1.6 2005/07/05 21:53:41 wolf31o2 Exp $ - +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-preclean-chroot.sh,v 1.7 2005/12/16 19:08:59 wolf31o2 Exp $ . /tmp/chroot-functions.sh update_env_settings