d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Odroid-C2: Build Fixes, correct root partition

Browse Source
This commit is contained in:
Ryan Bray
2018-08-24 22:40:15 -06:00
parent 486161f2d8
commit dc0f6367cb
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
buildroot-external/scripts/hdd-image.sh
View File

@@ -110,7 +110,7 @@ function create_disk_image() {
function _create_disk_gpt() {
local boot_img="$(path_boot_img)"
local rootfs_img="$(path_boot_img)"
local rootfs_img="$(path_rootfs_img)"
local overlay_img="$(path_overlay_img)"
local data_img="$(path_data_img)"
local kernel_img="$(path_kernel_img)"
@@ -185,7 +185,7 @@ function _create_disk_gpt() {
function _create_disk_mbr() {
local boot_img="$(path_boot_img)"
local rootfs_img="$(path_boot_img)"
local rootfs_img="$(path_rootfs_img)"
local overlay_img="$(path_overlay_img)"
local data_img="$(path_data_img)"
local kernel_img="$(path_kernel_img)"
@@ -229,15 +229,15 @@ function _create_disk_mbr() {
echo "label: dos"
echo "label-id: 0x48617373"
echo "unit: sectors"
echo "hassos-boot : start= ${boot_start}, size= ${boot_size}, type=c, bootable" #create the boot partition
echo "hassos-extended : start= ${extended_start}, size= ${extended_size}, type=5" #Make an extended partition
echo "hassos-kernel0 : start= ${kernel0_start}, size= ${kernel0_size}, type=83" #Make a logical partition
echo "hassos-system0 : start= ${system0_start}, size= ${system0_size}, type=83" #Make a logical partition
echo "hassos-kernel1 : start= ${kernel1_start} size= ${kernel1_size}, type=83" #Make a logical partition
echo "hassos-system1 : start= ${system1_start}, size= ${system1_size}, type=83" #Make a logical partition
echo "hassos-bootstate : start= ${bootstate_start}, size= ${bootstate_size}, type=83" #Make a logical partition
echo "hassos-overlay : start= ${overlay_start}, size= ${overlay_size}, type=83" #Make a logical partition
echo "hassos-data : start= ${data_start}, size= ${data_size}, type=83" #Make a logical partition
echo "hassos-boot : start= ${boot_start}, size= ${boot_size}, type=c, bootable" #create the boot partition
echo "hassos-extended : start= ${extended_start}, size= ${extended_size}, type=5" #Make an extended partition
echo "hassos-kernel : start= ${kernel0_start}, size= ${kernel0_size}, type=83" #Make a logical Linux partition
echo "hassos-system : start= ${system0_start}, size= ${system0_size}, type=83" #Make a logical Linux partition
echo "hassos-kernel : start= ${kernel1_start} size= ${kernel1_size}, type=83" #Make a logical Linux partition
echo "hassos-system : start= ${system1_start}, size= ${system1_size}, type=83" #Make a logical Linux partition
echo "hassos-bootstate : start= ${bootstate_start}, size= ${bootstate_size}, type=83" #Make a logical Linux partition
echo "hassos-overlay : start= ${overlay_start}, size= ${overlay_size}, type=83" #Make a Linux partition
echo "hassos-data : start= ${data_start}, size= ${data_size}, type=83" #Make a Linux partition
) > ${disk_layout}
# Update Labels
@@ -277,11 +277,12 @@ function _fix_disk_spl_gpt() {
function _fix_disk_spl_mbr() {
local hdd_img="$(hassos_image_name img)"
local spl_img="$(path_spl_img)"
local backup="/tmp/mbr-backup.bin"
# backup MBR
dd if=${hdd_img} of=${backup} bs=1 count=72 skip=440
dd if=${spl_img} of=${hdd_img} conv=notrunc bs=512
dd if=${backup} of=${hdd_img} conv=notrunc bs=1 skip=440
dd if=${backup} of=${hdd_img} conv=notrunc bs=1 count=72 seek=440
}

1
buildroot-external/scripts/post-build.sh
View File

@@ -40,4 +40,3 @@ install_hassos_cli
write_rauc_config
install_rauc_certs
install_bootloader_config

3
buildroot-external/scripts/post-image.sh
View File

@@ -8,9 +8,11 @@ HOOK_FILE=${3}
. ${BR2_EXTERNAL_HASSOS_PATH}/meta
. ${BOARD_DIR}/meta
. ${SCRIPT_DIR}/hdd-image.sh
. ${SCRIPT_DIR}/rootfs-layer.sh
. ${SCRIPT_DIR}/name.sh
. ${SCRIPT_DIR}/rauc.sh
. ${SCRIPT_DIR}/ota.sh
. ${HOOK_FILE}
# Cleanup
@@ -26,4 +28,3 @@ create_ota_update
# Hook post image build stuff
hassos_post_image

2
buildroot-external/scripts/rauc.sh
View File

@@ -87,6 +87,6 @@ function install_bootloader_config() {
# Fix MBR
if [ "${BOOT_SYS}" == "mbr" ]; then
mkdir -p ${TARGET_DIR}/etc/udev/rules.d
cp -f ${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-fix.rules ${TARGET_DIR}/etc/udev/rules.d/
cp -f ${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-part.rules ${TARGET_DIR}/etc/udev/rules.d/
fi
}