From 3f47662941224cb5d261b7ab37d2c980172e4d3e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 20 Feb 2008 02:01:17 +0000 Subject: [PATCH] Change all . to source. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1308 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 16 ++++++++++++++++ targets/embedded/embedded-chroot.sh | 2 +- targets/embedded/embedded-preclean-chroot.sh | 2 +- targets/grp/grp-chroot.sh | 2 +- targets/grp/grp-preclean-chroot.sh | 2 +- targets/livecd-stage1/livecd-stage1-chroot.sh | 2 +- .../livecd-stage1-preclean-chroot.sh | 2 +- targets/netboot/netboot-chroot.sh | 2 +- targets/netboot/netboot-image.sh | 2 +- targets/netboot2/netboot2-copyfile.sh | 2 +- targets/netboot2/netboot2-pkg.sh | 2 +- targets/stage1/stage1-chroot.sh | 2 +- targets/stage1/stage1-preclean-chroot.sh | 2 +- targets/stage2/stage2-chroot.sh | 2 +- targets/stage2/stage2-preclean-chroot.sh | 2 +- targets/stage3/stage3-chroot.sh | 2 +- targets/stage3/stage3-preclean-chroot.sh | 2 +- targets/stage4/stage4-chroot.sh | 2 +- targets/stage4/stage4-preclean-chroot.sh | 2 +- targets/support/pre-kmerge.sh | 8 ++++---- targets/tinderbox/tinderbox-chroot.sh | 10 +++++----- targets/tinderbox/tinderbox-preclean-chroot.sh | 2 +- 22 files changed, 44 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e652379..3a457d50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,22 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 20 Feb 2008; Chris Gianelloni + targets/embedded/embedded-chroot.sh, + targets/embedded/embedded-preclean-chroot.sh, targets/grp/grp-chroot.sh, + targets/grp/grp-preclean-chroot.sh, + targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, + targets/netboot/netboot-chroot.sh, targets/netboot/netboot-image.sh, + targets/netboot2/netboot2-copyfile.sh, targets/netboot2/netboot2-pkg.sh, + targets/stage1/stage1-chroot.sh, targets/stage1/stage1-preclean-chroot.sh, + targets/stage2/stage2-chroot.sh, targets/stage2/stage2-preclean-chroot.sh, + targets/stage3/stage3-chroot.sh, targets/stage3/stage3-preclean-chroot.sh, + targets/stage4/stage4-chroot.sh, targets/stage4/stage4-preclean-chroot.sh, + targets/support/pre-kmerge.sh, targets/tinderbox/tinderbox-chroot.sh, + targets/tinderbox/tinderbox-preclean-chroot.sh: + Change all . to source. + 20 Feb 2008; Chris Gianelloni targets/embedded/embedded-preclean-chroot.sh, targets/grp/grp-preclean-chroot.sh, diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh index 6f2b97b0..bdc1ddad 100755 --- a/targets/embedded/embedded-chroot.sh +++ b/targets/embedded/embedded-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh # Setup the environment export DESTROOT="${clst_root_path}" diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh index 2e8814b5..5353f67d 100755 --- a/targets/embedded/embedded-preclean-chroot.sh +++ b/targets/embedded/embedded-preclean-chroot.sh @@ -1,5 +1,5 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh cleanup_stages diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 499a3901..df0da4de 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh ## START BUILD setup_portage diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh index 948cf2ac..98c166fe 100755 --- a/targets/grp/grp-preclean-chroot.sh +++ b/targets/grp/grp-preclean-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh cleanup_stages diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh index f18ab810..5c6be014 100755 --- a/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh ## START BUILD setup_portage diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh index 2e8814b5..5353f67d 100755 --- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh @@ -1,5 +1,5 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh cleanup_stages diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh index 5a541ae8..76e97aac 100755 --- a/targets/netboot/netboot-chroot.sh +++ b/targets/netboot/netboot-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh # START BUILD run_emerge "${clst_packages}" diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh index 2156233c..90bb704a 100644 --- a/targets/netboot/netboot-image.sh +++ b/targets/netboot/netboot-image.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh update_env_settings diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh index 0483cb40..1d0290e2 100644 --- a/targets/netboot2/netboot2-copyfile.sh +++ b/targets/netboot2/netboot2-copyfile.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh update_env_settings diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh index 3e302127..44d1d00e 100644 --- a/targets/netboot2/netboot2-pkg.sh +++ b/targets/netboot2/netboot2-pkg.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh update_env_settings diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index b4f6f2cf..9f974764 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh # Setup our environment export clst_buildpkgs="$(/tmp/build.py)" diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index 53cb849a..6e8eab33 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh # Now, some finishing touches to initialize gcc-config.... unset ROOT diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index 40c627ed..e696d044 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh # Setup the environment export FEATURES="${clst_myfeatures} nodoc noman noinfo" diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh index 0636bb4e..36c2a457 100755 --- a/targets/stage2/stage2-preclean-chroot.sh +++ b/targets/stage2/stage2-preclean-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh cleanup_stages diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh index 1bf134b4..a09e1b6c 100755 --- a/targets/stage3/stage3-chroot.sh +++ b/targets/stage3/stage3-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh ## START BUILD setup_portage diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh index 0636bb4e..36c2a457 100755 --- a/targets/stage3/stage3-preclean-chroot.sh +++ b/targets/stage3/stage3-preclean-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh cleanup_stages diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh index 686fb49f..6622980e 100755 --- a/targets/stage4/stage4-chroot.sh +++ b/targets/stage4/stage4-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh ## START BUILD setup_portage diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh index 2f73ba44..240e2cbb 100755 --- a/targets/stage4/stage4-preclean-chroot.sh +++ b/targets/stage4/stage4-preclean-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh if [ -n "${clst_DISTCC}" ] then diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh index d86ff13b..6c6e82a3 100755 --- a/targets/support/pre-kmerge.sh +++ b/targets/support/pre-kmerge.sh @@ -1,11 +1,11 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh case ${clst_target} in livecd*|stage4) run_emerge --oneshot genkernel - install -d /tmp/kerncache + install -source /tmp/kerncache # Setup case structure for livecd_type case ${clst_livecd_type} in @@ -22,7 +22,7 @@ case ${clst_target} in netboot2) run_emerge --oneshot genkernel - install -d /tmp/kerncache + install -source /tmp/kerncache # Set the netboot builddate/hostname in linuxrc and copy to proper arch # directory in genkernel @@ -36,7 +36,7 @@ case ${clst_target} in ${clst_merge_path} echo ">>> Copying busybox config ..." - cp -f /tmp/busy-config \ + cp -source /tmp/busy-config \ /usr/share/genkernel/${clst_hostarch}/busy-config ;; esac diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 8f98d093..9a0ea707 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh # START THE BUILD setup_portage @@ -24,17 +24,17 @@ do fi fi - mkdir -p /tmp/packages/$x + mkdir -source /tmp/packages/$x export PORT_LOGDIR="/tmp/packages/$x" run_emerge $x if [ "$?" != "0" ] then - echo "! $x" >> /tmp/tinderbox.log + echo "! $x" >source /tmp/tinderbox.log else - echo "$x" >> /tmp/tinderbox.log + echo "$x" >source /tmp/tinderbox.log fi echo "Syncing from original pristine tinderbox snapshot..." rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \ - "/usr/portage/" /tmp/rsync-bak/ / + "/usr/portage/source /tmp/rsync-bak/ / done diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh index 2f73ba44..240e2cbb 100755 --- a/targets/tinderbox/tinderbox-preclean-chroot.sh +++ b/targets/tinderbox/tinderbox-preclean-chroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +source /tmp/chroot-functions.sh if [ -n "${clst_DISTCC}" ] then -- 2.26.2