diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2013-02-11 20:09:01 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-12-31 21:58:06 -0800 |
| commit | a751343297b8f941e170f91e704a51dc3c9b4e30 (patch) | |
| tree | 19c2545aa701b8199f96c27f5ecfe982cd38ce9f /targets/netboot | |
| parent | Extend ParserBase to do variable substitution. (diff) | |
| download | catalyst-a751343297b8f941e170f91e704a51dc3c9b4e30.tar.gz catalyst-a751343297b8f941e170f91e704a51dc3c9b4e30.tar.bz2 catalyst-a751343297b8f941e170f91e704a51dc3c9b4e30.zip | |
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
Diffstat (limited to 'targets/netboot')
| -rwxr-xr-x | targets/netboot/netboot-combine.sh | 6 | ||||
| -rwxr-xr-x | targets/netboot/netboot-controller.sh | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh index e4294ca0..d5312fb8 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 edf1f21a..93feb266 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) |