diff options
author | Stefano Stabellini | 2019-07-15 16:07:57 -0700 |
---|---|---|
committer | Stefano Stabellini | 2019-08-01 14:57:24 -0700 |
commit | 9ab1b1d15ff41829385e65555592cac08448d1e0 (patch) | |
tree | 0ee848bfe78d92d7563ddd581b713a2b2010477c /docker-extras | |
parent | 83334cb46f749091c66fa426b6e6c0b758ac208a (diff) |
Call disk_image from imagebuilder_run, introduce imagebuilder_sd
Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
Diffstat (limited to 'docker-extras')
-rwxr-xr-x | docker-extras/disk_image | 106 | ||||
-rw-r--r-- | docker-extras/imagebuilder_sd | 9 | ||||
-rw-r--r-- | docker-extras/imagebuilder_tftp | 8 | ||||
-rw-r--r-- | docker-extras/uboot-script-gen (renamed from docker-extras/imagebuilder_run) | 23 |
4 files changed, 138 insertions, 8 deletions
diff --git a/docker-extras/disk_image b/docker-extras/disk_image new file mode 100755 index 0000000..2d70ad3 --- /dev/null +++ b/docker-extras/disk_image @@ -0,0 +1,106 @@ +#!/bin/sh + +# This helps to see what is going on +set -e -x + +# Used to maintain intermediary state. (Not currently used) +DESTDIR="$(mktemp -d /tmp/imagebuilder-zynqmp.XXXXXX)" +UBOOT_OUT="/tmp/output" +OUTDIR="/tmp/img" +mkdir ${OUTDIR} + +IMG="${OUTDIR}/zynqmp.img" + +# NOTE: Increase vos_a to 256 to accomodate rootfs +# 528 MiB (256 + 256 + 16) +truncate $IMG -s 528M + +# create GPT partition table +sgdisk -og $IMG + +# _sector_first_start needs to be aligned to 2048 +_sector_first_start=2048 + +# _sector_first_end is obtained by running +# ``` +# sgdisk -n 1:2048:+256M -c 1:"Linux" -t 1:8300 /tmp/img/zynqmp.img +# ``` +_sector_first_end=526335 + +# create linux partition +sgdisk -n 1:$_sector_first_start:$_sector_first_end -c 1:"Linux1" -t 1:8300 $IMG + +# _sector_second_start is obtained by running +# ``` +# sgdisk -F /tmp/img/zynqmp.img +# ``` +_sector_second_start=526336 + +# _sector_second_end is obtained by running +# ``` +# sgdisk -n 2:526336:+256M -c 2:"Linux2" -t 2:8300 /tmp/img/zynqmp.img +# ``` +_sector_second_end=1050623 +sgdisk -n 2:$_sector_second_start:$_sector_second_end -c 2:"Linux2" -t 2:8300 $IMG + +# find the first available loop device +_loop_dev=$(losetup -f) + +# attach loopback device to $IMG +losetup $_loop_dev $IMG + +_disksize=$(blockdev --getsize $_loop_dev) + +dmsetup create diskimage --table "0 $_disksize linear $_loop_dev 0" + +# ensure that /dev/mapper/diskimage exists +while [ ! -b /dev/mapper/diskimage ] +do + sleep 2 +done + +kpartx -a /dev/mapper/diskimage + +# ensure that /dev/mapper/{diskimage1,diskimage2} exists +while [ ! -b /dev/mapper/diskimage1 ] || [ ! -b /dev/mapper/diskimage2 ] +do + sleep 2 +done + +# format vos_a partition +mkfs.ext4 -L vos_a -F /dev/mapper/diskimage1 + +# format vos_b partition +mkfs.ext4 -L vos_b -F /dev/mapper/diskimage2 + + +# create mount point and mount disk2 +mkdir -p ${DESTDIR}/part/disk2 +mount -t ext4 /dev/mapper/diskimage2 $DESTDIR/part/disk2 + +# Extract rootfs cpio archive into `.../part/vos_a` +cd ${DESTDIR}/part/disk2 +cat ${UBOOT_OUT}/dom0-ramdisk.cpio | gunzip | cpio -id +mv ${UBOOT_OUT}/dom0-ramdisk.cpio* /tmp + +# umount +sync +cd / +umount $DESTDIR/part/disk2 + +# create mount point and mount disk1 +mkdir -p ${DESTDIR}/part/disk1 +mount -t ext4 /dev/mapper/diskimage1 $DESTDIR/part/disk1 + +# copy over files needed +cp -r $UBOOT_OUT/* ${DESTDIR}/part/disk1/ + +# unmount +sync +# This fails for some reason. It could work now because we are not using qemu-user +# fstrim $DESTDIR/part/disk1 +umount $DESTDIR/part/disk1 + +kpartx -d /dev/mapper/diskimage +dmsetup remove diskimage +losetup -d $_loop_dev diff --git a/docker-extras/imagebuilder_sd b/docker-extras/imagebuilder_sd new file mode 100644 index 0000000..d3c98fb --- /dev/null +++ b/docker-extras/imagebuilder_sd @@ -0,0 +1,9 @@ +#!/bin/bash + +rm -rf /tmp/output +mkdir /tmp/output +cd /tmp/output +cp -r /home/builder/output/* . +export LOAD_CMD="load scsi 0:1" +bash /uboot-script-gen +bash /disk_image diff --git a/docker-extras/imagebuilder_tftp b/docker-extras/imagebuilder_tftp new file mode 100644 index 0000000..2bc12f2 --- /dev/null +++ b/docker-extras/imagebuilder_tftp @@ -0,0 +1,8 @@ +#!/bin/bash + +rm -rf /tmp/output +mkdir /tmp/output +cd /tmp/output +cp -r /home/builder/output/* . +export LOAD_CMD="tftpb" +bash /uboot-script-gen diff --git a/docker-extras/imagebuilder_run b/docker-extras/uboot-script-gen index ab0cbe4..ebb0f7a 100644 --- a/docker-extras/imagebuilder_run +++ b/docker-extras/uboot-script-gen @@ -1,5 +1,8 @@ #!/bin/bash +# LOAD_CMD="tftpb" +# LOAD_CMD="load scsi 0:1" + offset=$((2*1024*1024)) filesize=0 @@ -49,8 +52,12 @@ function device_tree_editing() echo "fdt mknod /chosen dom0" >> $UBOOT_SOURCE echo "fdt set /chosen/dom0 compatible \"xen,linux-zimage\" \"xen,multiboot-module\"" >> $UBOOT_SOURCE echo "fdt set /chosen/dom0 reg <0x0 "$dom0_kernel_addr" 0x0 "$dom0_kernel_size">" >> $UBOOT_SOURCE - echo "fdt set /chosen/dom0 bootargs \"console=hvc0 earlycon=xen earlyprintk=xen\"" >> $UBOOT_SOURCE - + if test "$LOAD_CMD" = "tftpb" + then + echo "fdt set /chosen/dom0 bootargs \"console=hvc0 earlycon=xen earlyprintk=xen\"" >> $UBOOT_SOURCE + else + echo "fdt set /chosen/dom0 bootargs \"console=hvc0 earlycon=xen earlyprintk=xen root=/dev/mmcblk0p2\"" >> $UBOOT_SOURCE + fi i=0 while test $i -lt $NUM_DOMUS do @@ -119,16 +126,17 @@ function check_compressed_file_type() check_file_type $filename "$type" } -rm -rf /tmp/output -mkdir /tmp/output -cd /tmp/output -cp -r /home/builder/output/* . . config rm -f $UBOOT_SOURCE $UBOOT_SCRIPT memaddr=$(( $MEMORY_START + $offset )) memaddr=`printf "0x%X\n" $memaddr` +if [[ $LOAD_CMD = *scsi* ]] +then + echo "scsi scan" >> $UBOOT_SOURCE +fi + check_compressed_file_type $XEN "MS-DOS executable" xen_addr=$memaddr mkimage -A arm64 -T kernel -C none -a $xen_addr -e $xen_addr -d $XEN "$XEN".uboot &> /dev/null @@ -139,7 +147,7 @@ dom0_kernel_addr=$memaddr load_file $DOM0_KERNEL dom0_kernel_size=$(( $memaddr - $dom0_kernel_addr )) -if test "$DOM0_RAMDISK" +if test "$DOM0_RAMDISK" && [[ $LOAD_CMD = "tftpb" ]] then check_compressed_file_type $DOM0_RAMDISK "cpio archive" dom0_ramdisk_addr=$memaddr @@ -191,5 +199,4 @@ memaddr=$(( $memaddr + $offset + $offset )) memaddr=`printf "0x%X\n" $memaddr` uboot_addr="$memaddr" mkimage -A arm64 -T script -C none -a $uboot_addr -e $uboot_addr -d $UBOOT_SOURCE "$UBOOT_SCRIPT" &> /dev/null -echo "Generated uboot script $UBOOT_SCRIPT, to be loaded at address $uboot_addr:" echo "$LOAD_CMD $uboot_addr $UBOOT_SCRIPT; source $uboot_addr" |