From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7B29F138779 for ; Sat, 14 Jun 2014 05:58:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6499DE09C0; Sat, 14 Jun 2014 05:58:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4252E09B9 for ; Sat, 14 Jun 2014 05:58:15 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A813233FF98 for ; Sat, 14 Jun 2014 05:58:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1D39818370 for ; Sat, 14 Jun 2014 05:58:12 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402724806.771f5c4f294e5a5614a95679ed86b9ef4bf9ad0e.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ... X-VCS-Repository: proj/catalyst X-VCS-Files: etc/catalyst.conf targets/embedded/embedded-controller.sh targets/grp/grp-controller.sh targets/livecd-stage1/livecd-stage1-controller.sh targets/livecd-stage2/livecd-stage2-controller.sh targets/netboot/netboot-combine.sh targets/netboot/netboot-controller.sh targets/netboot2/netboot2-controller.sh targets/stage1/stage1-controller.sh targets/stage2/stage2-controller.sh targets/stage3/stage3-controller.sh targets/stage4/stage4-controller.sh targets/support/bootloader-setup.sh targets/support/create-iso.sh targets/support/functions.sh targets/support/netboot2-final.sh targets/support/target_image_setup.sh targets/tinderbox/tinderbox-controller.sh X-VCS-Directories: targets/livecd-stage2/ targets/livecd-stage1/ targets/stage3/ targets/stage1/ etc/ targets/grp/ targets/stage4/ targets/embedded/ targets/stage2/ targets/netboot/ targets/tinderbox/ targets/support/ targets/netboot2/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 771f5c4f294e5a5614a95679ed86b9ef4bf9ad0e X-VCS-Branch: pending Date: Sat, 14 Jun 2014 05:58:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d65c7ae3-2623-44f2-8100-861c3f990814 X-Archives-Hash: 269080a61b9a60e2e06d7d2e69bfef89 commit: 771f5c4f294e5a5614a95679ed86b9ef4bf9ad0e Author: Brian Dolbec gentoo org> AuthorDate: Tue Feb 12 04:09:01 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Jun 14 05:46:46 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=771f5c4f Make shdir a complete path to ease it's use. Add a "shdir" setting to config. This is to make moving the bash code around easier. It also reduces more hardcoded paths in the bash scripts. Migrate all target shell scripts to use the new shdir setting --- etc/catalyst.conf | 8 ++++++-- targets/embedded/embedded-controller.sh | 22 ++++++++++----------- targets/grp/grp-controller.sh | 6 +++--- targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++-- targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++----------- targets/netboot/netboot-combine.sh | 6 +++--- targets/netboot/netboot-controller.sh | 24 +++++++++++------------ targets/netboot2/netboot2-controller.sh | 16 +++++++-------- targets/stage1/stage1-controller.sh | 8 ++++---- targets/stage2/stage2-controller.sh | 6 +++--- targets/stage3/stage3-controller.sh | 6 +++--- targets/stage4/stage4-controller.sh | 22 ++++++++++----------- targets/support/bootloader-setup.sh | 6 +++--- targets/support/create-iso.sh | 4 ++-- targets/support/functions.sh | 2 +- targets/support/netboot2-final.sh | 4 ++-- targets/support/target_image_setup.sh | 4 ++-- targets/tinderbox/tinderbox-controller.sh | 6 +++--- 18 files changed, 90 insertions(+), 86 deletions(-) diff --git a/etc/catalyst.conf b/etc/catalyst.conf index 2d377b2..d52a5c8 100644 --- a/etc/catalyst.conf +++ b/etc/catalyst.conf @@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache" # portdir specifies the source portage tree used by the snapshot target. portdir="/usr/portage" -# sharedir specifies where all of the catalyst runtime executables are. Most -# users do not need to change this. +# sharedir specifies where all of the catalyst runtime executables +# and other shared lib objects are. +# Most users do not need to change this. sharedir="/usr/lib/catalyst" +# shdir specifies where all of the catalyst runtime executables are. +shdir="%(sharedir)s/targets" + # snapshot_cache specifies where the snapshots will be cached to if snapcache is # enabled in the options. snapshot_cache="/var/tmp/catalyst/snapshot_cache" diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh index 2a0c5fe..c0b62ea 100755 --- a/targets/embedded/embedded-controller.sh +++ b/targets/embedded/embedded-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh case ${1} in enter) @@ -11,7 +11,7 @@ case ${1} in shift export clst_packages="$*" exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh ;; preclean) @@ -21,7 +21,7 @@ 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_shdir}/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 \ @@ -31,12 +31,12 @@ case ${1} in pre-kmerge) # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh + exec_in_chroot ${clst_shdir}/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 + exec_in_chroot ${clst_shdir}/support/post-kmerge.sh ;; kernel) @@ -47,18 +47,18 @@ case ${1} in then cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh + exec_in_chroot ${clst_shdir}/support/kmerge.sh delete_from_chroot tmp/linuxrc ;; target_image_setup) shift - ${clst_sharedir}/targets/support/target_image_setup.sh ${1} + ${clst_shdir}/support/target_image_setup.sh ${1} ;; livecd-update) # Now, finalize and tweak the livecd fs (inside of the chroot) - exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh + exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh ;; bootloader) @@ -66,12 +66,12 @@ case ${1} in # Here is where we poke in our identifier touch ${1}/livecd - ${clst_sharedir}/targets/support/bootloader-setup.sh ${1} + ${clst_shdir}/support/bootloader-setup.sh ${1} ;; iso) shift - ${clst_sharedir}/targets/support/create-iso.sh ${1} + ${clst_shdir}/support/create-iso.sh ${1} ;; clean) diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh index 541429a..0f1a5b5 100755 --- a/targets/grp/grp-controller.sh +++ b/targets/grp/grp-controller.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh case $1 in enter) @@ -15,11 +15,11 @@ case $1 in shift export clst_grp_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh + exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh ;; preclean) - exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh + exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh ;; clean) diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh index f3b1f40..19b8dd1 100755 --- a/targets/livecd-stage1/livecd-stage1-controller.sh +++ b/targets/livecd-stage1/livecd-stage1-controller.sh @@ -1,5 +1,5 @@ -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh ## START RUNSCRIPT @@ -9,7 +9,7 @@ case $1 in export clst_packages="$*" mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt ;; diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 57dcff7..a98cb47 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -1,16 +1,16 @@ -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh case $1 in pre-kmerge) # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh + exec_in_chroot ${clst_shdir}/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 + exec_in_chroot ${clst_shdir}/support/post-kmerge.sh ;; kernel) @@ -22,7 +22,7 @@ case $1 in then cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh + exec_in_chroot ${clst_shdir}/support/kmerge.sh delete_from_chroot tmp/linuxrc extract_modules ${clst_chroot_path} ${clst_kname} @@ -79,7 +79,7 @@ case $1 in livecd-update) # Now, finalize and tweak the livecd fs (inside of the chroot) - exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh + exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh # Move over the xinitrc (if applicable) # This is moved here, so we can override any default xinitrc @@ -92,7 +92,7 @@ case $1 in ;; rc-update) - exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh + exec_in_chroot ${clst_shdir}/support/rc-update.sh ;; fsscript) @@ -182,23 +182,23 @@ case $1 in ;; esac - ${clst_sharedir}/targets/support/bootloader-setup.sh $1 + ${clst_shdir}/support/bootloader-setup.sh $1 ;; unmerge) shift export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh + exec_in_chroot ${clst_shdir}/support/unmerge.sh ;; target_image_setup) shift - ${clst_sharedir}/targets/support/target_image_setup.sh $1 + ${clst_shdir}/support/target_image_setup.sh $1 ;; iso) shift - ${clst_sharedir}/targets/support/create-iso.sh $1 + ${clst_shdir}/support/create-iso.sh $1 ;; esac exit $? diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh index e4294ca..d5312fb 100755 --- a/targets/netboot/netboot-combine.sh +++ b/targets/netboot/netboot-combine.sh @@ -1,8 +1,8 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/chroot-functions.sh -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/chroot-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh update_env_settings diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh index edf1f21..93feb26 100755 --- a/targets/netboot/netboot-controller.sh +++ b/targets/netboot/netboot-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh case ${1} in @@ -11,7 +11,7 @@ case ${1} in clst_root_path="/" \ clst_packages="$*" \ exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh ;; busybox) @@ -30,26 +30,26 @@ case ${1} in clst_myemergeopts="${clst_myemergeopts} -O" \ clst_packages="busybox" \ exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh ;; pre-kmerge) # Sets up the build environment before any kernels are compiled - #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh + #exec_in_chroot ${clst_shdir}/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 + #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh ;; kernel) shift export clst_kname="$1" export clst_root_path="/" - #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh - #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh - #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh + #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh + #exec_in_chroot ${clst_shdir}/support/kmerge.sh + #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh #extract_kernels kernels ;; @@ -61,15 +61,15 @@ case ${1} in clst_myemergeopts="${clst_myemergeopts} --nodeps" \ clst_packages="netboot-base" \ exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh clst_files="${@}" \ exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh + ${clst_shdir}/${clst_target}/${clst_target}-image.sh ;; finish) - ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh + ${clst_shdir}/${clst_target}/${clst_target}-combine.sh ;; clean) diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh index 2ffcb0d..be5f91d 100755 --- a/targets/netboot2/netboot2-controller.sh +++ b/targets/netboot2/netboot2-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh case ${1} in build_packages) @@ -10,17 +10,17 @@ case ${1} in clst_root_path="/" \ clst_packages="$*" \ exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh + ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh ;; pre-kmerge) # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh + exec_in_chroot ${clst_shdir}/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 + exec_in_chroot ${clst_shdir}/support/post-kmerge.sh ;; kernel) @@ -37,7 +37,7 @@ case ${1} in cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh + exec_in_chroot ${clst_shdir}/support/kmerge.sh delete_from_chroot tmp/linuxrc delete_from_chroot tmp/busy-config @@ -56,13 +56,13 @@ case ${1} in # Copy remaining files over to the initramfs target clst_files="${@}" \ exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh + ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh ;; final) # For each arch, fetch the kernel images and put them in builds/ echo -e ">>> Copying completed kernels to ${clst_target_path} ..." - ${clst_sharedir}/targets/support/netboot2-final.sh + ${clst_shdir}/support/netboot2-final.sh ;; clean) diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 8dbd16b..56e1375 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -1,13 +1,13 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh case $1 in enter) ;; run) - cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp + cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp # Setup "ROOT in chroot" dir install -d ${clst_chroot_path}${clst_root_path}/etc @@ -18,12 +18,12 @@ case $1 in # Enter chroot, execute our build script exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \ + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \ || exit 1 ;; preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1 + exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1 ;; clean) diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh index 69ba7c9..25e5120 100755 --- a/targets/stage2/stage2-controller.sh +++ b/targets/stage2/stage2-controller.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh # Only put commands in this section that you want every target to execute. # This is a global default file and will affect every target @@ -13,11 +13,11 @@ case $1 in shift export clst_packages="$*" exec_in_chroot \ - ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh ;; preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ;; clean) diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh index ff546f8..df1479e 100755 --- a/targets/stage3/stage3-controller.sh +++ b/targets/stage3/stage3-controller.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh # Only put commands in this section that you want every target to execute. # This is a global default file and will affect every target @@ -12,11 +12,11 @@ case $1 in run) shift export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh ;; preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ;; clean) diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh index ff8dc03..d42f302 100755 --- a/targets/stage4/stage4-controller.sh +++ b/targets/stage4/stage4-controller.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh # Only put commands in this section that you want every target to execute. # This is a global default file and will affect every target @@ -11,12 +11,12 @@ case $1 in pre-kmerge) # Sets up the build environment before any kernels are compiled - exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh + exec_in_chroot ${clst_shdir}/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 + exec_in_chroot ${clst_shdir}/support/post-kmerge.sh ;; kernel) @@ -27,7 +27,7 @@ case $1 in then cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc fi - exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh + exec_in_chroot ${clst_shdir}/support/kmerge.sh delete_from_chroot tmp/linuxrc extract_modules ${clst_chroot_path} ${clst_kname} # Do we need this one? @@ -37,15 +37,15 @@ case $1 in build_packages) shift export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh ;; preclean) - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} + exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} ;; rc-update) - exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh + exec_in_chroot ${clst_shdir}/support/rc-update.sh ;; fsscript) @@ -54,7 +54,7 @@ case $1 in livecd-update) # Now, finalize and tweak the livecd fs (inside of the chroot) - exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh + exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh # Move over the xinitrc (if applicable) # This is moved here, so we can override any default xinitrc @@ -71,18 +71,18 @@ case $1 in target_image_setup) shift - ${clst_sharedir}/targets/support/target_image_setup.sh $1 + ${clst_shdir}/support/target_image_setup.sh $1 ;; unmerge) shift export clst_packages="$*" - exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh + exec_in_chroot ${clst_shdir}/support/unmerge.sh ;; iso) shift - ${clst_sharedir}/targets/support/create-iso.sh $1 + ${clst_shdir}/support/create-iso.sh $1 ;; clean) diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index a0bc5f5..857ce6f 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -1,7 +1,7 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh # $1 is the destination root @@ -455,7 +455,7 @@ case ${clst_hostarch} in [ -d "${1}/boot" ] && rmdir ${1}/boot # Source the arcload source file to generated required sections of arc.cf - source ${clst_sharedir}/targets/support/mips-arcload_conf.sh + source ${clst_shdir}/support/mips-arcload_conf.sh # Generate top portions of the config echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index fe1f0fc..08598e5 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -1,7 +1,7 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh ## START RUNSCRIPT diff --git a/targets/support/functions.sh b/targets/support/functions.sh index c8757d4..268b478 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -24,7 +24,7 @@ exec_in_chroot(){ echo "Copying ${file_name} to ${destdir}" copy_to_chroot ${1} ${destdir} - copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \ + copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \ ${destdir} chroot_path=${clst_chroot_path}${subdir} diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh index 2ee207e..55835d2 100755 --- a/targets/support/netboot2-final.sh +++ b/targets/support/netboot2-final.sh @@ -1,7 +1,7 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh extract_kernels ${clst_target_path}boot diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh index b9e2781..b428d4e 100755 --- a/targets/support/target_image_setup.sh +++ b/targets/support/target_image_setup.sh @@ -1,6 +1,6 @@ -source ${clst_sharedir}/targets/support/functions.sh -source ${clst_sharedir}/targets/support/filesystem-functions.sh +source ${clst_shdir}/support/functions.sh +source ${clst_shdir}/support/filesystem-functions.sh # Make the directory if it doesnt exist mkdir -p $1 diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh index d7d89cb..3dbc76f 100755 --- a/targets/tinderbox/tinderbox-controller.sh +++ b/targets/tinderbox/tinderbox-controller.sh @@ -1,14 +1,14 @@ #!/bin/bash -source ${clst_sharedir}/targets/support/functions.sh +source ${clst_shdir}/support/functions.sh case $1 in run) shift - exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh + exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh ;; preclean) - #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh + #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh delete_from_chroot /tmp/chroot-functions.sh ;; clean)