Changeset bc73be3 in mainline for tools/grub/mkimage.sh


Ignore:
Timestamp:
2019-06-27T08:51:20Z (6 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tools/grub/mkimage.sh

    rad40b74b rbc73be3  
    3939orig_dir="$(cd "$(dirname "$0")" && pwd)"
    4040grub_tools_dir="$orig_dir/grub-build/i386-pc/bin"
    41 grub_mod_dir="$orig_dir/../../boot/grub.pc/i386-pc"
     41grub_mod_dir="$orig_dir/../../boot/grub/ia32-pc/i386-pc"
    4242
    4343"$grub_tools_dir"/grub-mkimage --directory "$grub_mod_dir" \
Note: See TracChangeset for help on using the changeset viewer.