Whitespace.
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Tue, 21 Aug 2012 01:03:58 +0000 (01:03 +0000)
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Tue, 21 Aug 2012 01:03:58 +0000 (01:03 +0000)
targets/support/bootloader-setup.sh
targets/support/chroot-functions.sh
targets/support/create-iso.sh
targets/support/functions.sh
targets/support/kill-chroot-pids.sh
targets/support/kmerge.sh
targets/support/livecdfs-update.sh
targets/support/mips-arcload_conf.sh
targets/support/rc-update.sh

index 59f1abe93b8bf2e8822b0d6ef21538d03c728ab6..2fa44e031a646ecc7f7267c0d84237da4c4ed08e 100644 (file)
@@ -64,27 +64,27 @@ case ${clst_hostarch} in
                echo "fgcolor=white" >> ${icfg}
                echo "bgcolor=black" >> ${icfg}
                echo "message=/boot/boot.msg" >> ${icfg}
-               
+
                # Here is where I fix up the boot.msg file.
                sed -e 's/ARCH/PowerPC/' \
                        -e 's/HARDWARE/Apple and IBM hardware/' \
                        -i $kmsg
 
-               # Setup the IBM yaboot.conf     
+               # Setup the IBM yaboot.conf
                etc_icfg=$1/etc/yaboot.conf
-               mkdir -p $1/etc 
+               mkdir -p $1/etc
                IBM_YABOOT="FALSE"
                echo "root=/dev/ram" >> ${etc_icfg}
                echo "fgcolor=white" >> ${etc_icfg}
                echo "bgcolor=black" >> ${etc_icfg}
                echo "message=/boot/boot.msg" >> ${etc_icfg}
-               
+
                for x in ${clst_boot_kernel}
-               do      
+               do
                        eval "clst_kernel_console=\$clst_boot_kernel_${x}_console"
                        eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type"
                        eval custom_kopts=\$${x}_kernelopts
-                               
+
                        echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
                        if [ "${clst_kernel_machine_type}" == "ibm" ]
                        then
@@ -147,7 +147,7 @@ case ${clst_hostarch} in
                                        echo "label=${x}" >> ${icfg}
                                        echo "read-write" >> ${icfg}
                                        echo "append=\"${default_append_line}\"" >> ${icfg}
-                                       
+
                                        for y in ${clst_kernel_console}
                                        do
                                                echo >> ${icfg}
@@ -179,7 +179,7 @@ case ${clst_hostarch} in
                done
 
                if [ "${IBM_YABOOT}" == "FALSE" ]
-               then 
+               then
                        rm ${etc_kmsg}
                        rmdir $1/etc
                        if [ -d $1/ppc ]
@@ -280,7 +280,7 @@ case ${clst_hostarch} in
                                eval custom_kopts=\$${x}_kernelopts
                                echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
                                echo >> ${icfg}
-                               
+
                                eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel"
 
                                if [ -n "${clst_kernel_softlevel}" ]
@@ -375,9 +375,9 @@ case ${clst_hostarch} in
                                eval custom_kopts=\$${x}_kernelopts
                                echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
                                echo >> ${icfg}
-                               
+
                                eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel"
-                               
+
                                if [ -n "${clst_kernel_softlevel}" ]
                                then
                                        for y in ${clst_kernel_softlevel}
index 78db5ec485fb33f7819bd989208c5786571f8b7c..12597a329de87a0809b8f1fc98a96bb6ba38cbce 100644 (file)
@@ -251,8 +251,8 @@ run_merge() {
        # Sets up the ROOT= parameter
        # with no options ROOT=/
        make_destpath ${clst_root_path}
-       
-       export EMERGE_WARNING_DELAY=0   
+
+       export EMERGE_WARNING_DELAY=0
        export CLEAN_DELAY=0
        export EBEEP_IGNORE=0
        export EPAUSE_IGNORE=0
@@ -349,7 +349,7 @@ function copy_symlink() {
        STACK=${2}
        [ "${STACK}" = "" ] && STACK=16 || STACK=$((${STACK} - 1 ))
 
-       if [ ${STACK} -le 0 ] 
+       if [ ${STACK} -le 0 ]
        then
                echo "WARNING : ${TARGET} : too many levels of symbolic links !"
                return
@@ -359,7 +359,7 @@ function copy_symlink() {
                mkdir -p ${clst_root_path}/`dirname ${1}`
        [ ! -e ${clst_root_path}/${1} ] && \
                cp -vfdp ${1} ${clst_root_path}/${1}
-       
+
        if [[ -n $(type -p realpath) ]]; then
                TARGET=`realpath ${1}`
        else
@@ -412,4 +412,3 @@ Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
 
 # We do this everywhere, so why not put it in this script
 run_default_funcs
-
index c525a398cc6d90293ec89a888a7dcd8ebea2df69..06a1a7578dd1a5988dc385ade0d5e82dc11b6100 100644 (file)
@@ -284,8 +284,8 @@ case ${clst_hostarch} in
                then
                        echo 'Creating ISO using EFI bootloader'
                        echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" 
-                       mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image" 
-               else    
+                       mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image"
+               else
                        echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
                        mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
                fi
index 429485b3d89aa96e40529427297b267f9eb10252..0bc5d69c5a330091ae30008c8303cc6fd7cf1845 100644 (file)
@@ -37,14 +37,14 @@ exec_in_chroot(){
                chroot_path=${clst_chroot_path}${subdir}
                copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
                        ${subdir}/tmp/
-               echo "Running ${file_name} in chroot ${chroot_path}" 
+               echo "Running ${file_name} in chroot ${chroot_path}"
                ${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1
        else
                copy_to_chroot ${1} tmp/
                chroot_path=${clst_chroot_path}
                copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
                        tmp/
-               echo "Running ${file_name} in chroot ${chroot_path}" 
+               echo "Running ${file_name} in chroot ${chroot_path}"
                ${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1
        fi
 
@@ -97,12 +97,12 @@ extract_kernels() {
 
                [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
                mkdir -p ${1}/
-               tar xjf ${kbinary} -C ${1}/ 
+               tar xjf ${kbinary} -C ${1}/
 
                # change config name from "config-*" to "gentoo", for example
                #mv ${1}/config-* ${1}/${x}-config
-               rm ${1}/config-* 
-               
+               rm ${1}/config-*
+
                # change kernel name from "kernel" to "gentoo", for example
                if [ -e ${1}/kernel-* ]
                then
@@ -117,12 +117,12 @@ extract_kernels() {
 
                # change initrd name from "initrd" to "gentoo.igz", for example
                if [ -e ${1}/initrd-* ]
-               then 
+               then
                        mv ${1}/initrd-* ${1}/${x}.igz
                fi
 
                if [ -e ${1}/initramfs-* ]
-               then 
+               then
                        mv ${1}/initramfs-* ${1}/${x}.igz
                fi
 
@@ -135,7 +135,7 @@ extract_kernels() {
 
 extract_modules() {
        # $1 = Destination
-       # $2 = kname    
+       # $2 = kname
        kmodules="${clst_chroot_path}/tmp/kerncache/${2}-modules-${clst_version_stamp}.tar.bz2"
 
        if [ -f "${kmodules}" ]
@@ -208,7 +208,7 @@ check_filesystem_type(){
                        cmdline_opts="${cmdline_opts} looptype=cramfs loop=/image.cramfs"
                ;;
        esac
-}                                                                                                                                                                                                                              
+}
 
 run_crossdev() {
        crossdev ${clst_CHOST}
index 9e8bf01d6f335e365569c23a6d6a53a11974ea21..ea8ee40212e00ccfbef9bf6f9837967f58cf05d5 100644 (file)
@@ -41,17 +41,17 @@ then
        echo
        echo "Killing process(es)"
        echo "pid: process name"
-       for pid in ${pids[@]} 
-       do 
+       for pid in ${pids[@]}
+       do
                P_NAME=$(ls -la --color=never /proc/${pid} 2>&1 |grep exe|grep ${clst_chroot_path}|awk '{print $11}')
                echo ${pid}: ${P_NAME}
        done
-       echo 
+       echo
        echo "Press Ctrl-C within 10 seconds to abort"
-       
+
        sleep 10
 
-       for pid in ${pids[@]} 
+       for pid in ${pids[@]}
        do
                kill -9 ${pid}
        done
index f57508f454daff91c8807873c1a4e4faf8bf6dad..b73137388f3f92c330c235a8fbfb68cf52eeec4c 100644 (file)
@@ -49,7 +49,7 @@ setup_gk_args() {
        then
                GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc"
        fi
-       
+
        if [ -n "${clst_linuxrc}" ]
        then
                GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
@@ -77,7 +77,7 @@ genkernel_compile(){
 
        setup_gk_args
        #echo "The GK_ARGS are"
-       #echo ${GK_ARGS}        
+       #echo ${GK_ARGS}
        export clst_kernel_merge
        export clst_initramfs_overlay
        # Build our list of kernel packages
@@ -141,15 +141,15 @@ fi
 # USE variables (and thus different patches enabled/disabled.) Also, there's no
 # real benefit in using the pkgcache for kernel source ebuilds.
 
-USE_MATCH=0 
+USE_MATCH=0
 if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
 then
        STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
        STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
        if [ "${STR1}" = "${STR2}" ]
-       then 
+       then
                #echo "USE Flags match"
-               USE_MATCH=1 
+               USE_MATCH=1
        else
                if [ -n "${clst_KERNCACHE}" ]
                then
@@ -167,7 +167,7 @@ then
        STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
        STR2=${clst_kextraversion}
        if [ "${STR1}" = "${STR2}" ]
-       then 
+       then
                if [ -n "${clst_KERNCACHE}" ]
                then
                        #echo "EXTRAVERSION match"
@@ -182,7 +182,7 @@ then
        STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
        STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
        if [ "${STR1}" = "${STR2}" ]
-       then 
+       then
                if [ -n "${clst_KERNCACHE}" ]
                then
                        #echo "CONFIG match"
@@ -204,7 +204,7 @@ then
                mkdir -p /etc/portage/profile
                echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
        else
-               if ( ! grep -q "^${KERNELVERSION}\$"  /etc/portage/profile/package.provided ) 
+               if ( ! grep -q "^${KERNELVERSION}\$"  /etc/portage/profile/package.provided )
                then
                        echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
                fi
@@ -226,7 +226,7 @@ then
                echo "Setting extraversion to ${clst_kextraversion}"
                sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
                echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
-       else 
+       else
                touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
        fi
 fi
index a7aad5f129567877480c557b1f3da85b235b9e37..2b41bf630bd3717899dc912882886c9556cc3c12 100644 (file)
@@ -178,7 +178,7 @@ fi
 # touch /etc/asound.state
 touch /etc/asound.state
 
-# Tweak the MOTD for Gentoo releases 
+# Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
        gentoo-release-universal)
                cat /etc/generic.motd.txt /etc/universal.motd.txt \
index 29692b4a6744082935a3083b66dffb6202b4a3c2..cecddd9878d2a71d44d07211410e3d8d6cf18d20 100644 (file)
@@ -37,7 +37,7 @@ serial="serial {\n\
 dbg="debug {\n\
 \tdescription\t\"Debug Shell\";\n\
 \timage\t\t\"\";\n\
-\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n"               
+\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n"
 
 cmt1="comment\t\t\"\\\n\\\n\";\n\
 comment\t\t\"Bootable Images & Options:\\\n\\\r\\\n\\\r\";\n"
index 50c1da2c2da3d4b16758406c5f63d6dabfddacdb..c3e8ed9cf333d2fde8eff5fa9cb8ff7843da8977 100644 (file)
@@ -66,4 +66,3 @@ then
                done
        fi
 fi
-