mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 15:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_image: fix hash perms & arm image path

Browse Source 
This should fix the bad parsing and the failed archiving.
EMphasis on should. I'll keep monitoring.

TEST=in progress
BUG=none

Review URL: http://codereview.chromium.org/2812044
This commit is contained in:
Will Drewry 2010-07-03 17:14:58 -07:00
parent 4a675e18a0
commit 821d07cb42
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_image
View File

@ -327,7 +327,8 @@ make_image_bootable() {
$(cat ${OUTPUT_DIR}/boot.config | tr -s '\n' ' ')" $(cat ${OUTPUT_DIR}/boot.config | tr -s '\n' ' ')"
kernel_part="${kernel_part} ${FLAGS_arm_extra_bootargs}'" kernel_part="${kernel_part} ${FLAGS_arm_extra_bootargs}'"
local kpart_offset="--kernel_partition_offset=${koffset}" local kpart_offset="--kernel_partition_offset=${koffset}"
local kpart_size="--kernel_partition_sectors=$(partsize ${image_name} 2)" local kpart_size="\
--kernel_partition_sectors=$(partsize ${OUTPUT_DIR}/${image_name} 2)"
kernel_part="${kernel_part} ${kpart_size} ${kpart_offset}" kernel_part="${kernel_part} ${kpart_size} ${kpart_offset}"
bootloader_to="${OUTPUT_DIR}/arm.mbr" bootloader_to="${OUTPUT_DIR}/arm.mbr"
fi fi

3
build_kernel_image.sh
View File

@ -78,6 +78,9 @@ if [[ -n "${FLAGS_rootfs_image}" && -n "${FLAGS_rootfs_hash}" ]]; then
${FLAGS_rootfs_image} \ ${FLAGS_rootfs_image} \
${root_fs_blocks} \ ${root_fs_blocks} \
${FLAGS_rootfs_hash}) ${FLAGS_rootfs_hash})
if [[ -f "${FLAGS_rootfs_hash}" ]]; then
sudo chmod a+r "${FLAGS_rootfs_hash}"
fi
# Don't claim the root device unless the root= flag is pointed to # Don't claim the root device unless the root= flag is pointed to
# the verified boot device. Doing so will claim /dev/sdDP out from # the verified boot device. Doing so will claim /dev/sdDP out from
# under the system. # under the system.