Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 3876300 in mainline


Ignore:
Timestamp:
2016-04-05T18:32:23Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
cfb1217
Parents:
5823f4da
Message:

Do not depend on scripts being run from the directory they reside in.

Location:
tools/grub
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tools/grub/grub-update.sh

    r5823f4da r3876300  
    3333#
    3434
    35 origdir="$(pwd)"
     35origdir="$(cd "$(dirname "$0")" && pwd)"
    3636helenosdir="$origdir/../.."
    37 workdir="$(pwd)/grub-src"
    38 builddir="$(pwd)/grub-build"
     37workdir="$origdir/grub-src"
     38builddir="$origdir/grub-build"
    3939git_repo="git://git.savannah.gnu.org/grub.git"
    4040grub_rev="bc220962e366b1b46769ed6f9fa5be603ba58ab5"
  • tools/grub/mkimage.sh

    r5823f4da r3876300  
    3737#
    3838
    39 grub_tools_dir="$(pwd)"/grub-build/i386-pc/bin
    40 grub_mod_dir="$(pwd)"/../../boot/grub.pc/i386-pc
     39orig_dir="$(cd "$(dirname "$0")" && pwd)"
     40grub_tools_dir="$orig_dir/grub-build/i386-pc/bin"
     41grub_mod_dir="$orig_dir/../../boot/grub.pc/i386-pc"
    4142
    4243"$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \
    43     --prefix "$grub_mod_dir" --output "$grub_mod_dir"/"core.img" \
    44     --format 'i386-pc' --compression 'auto' --config "$(pwd)"/"load.cfg" \
     44    --prefix "$grub_mod_dir" --output "$grub_mod_dir/core.img" \
     45    --format 'i386-pc' --compression 'auto' --config "$orig_dir/load.cfg" \
    4546    "minix3" "part_msdos" "biosdisk" "search_fs_uuid"
Note: See TracChangeset for help on using the changeset viewer.