From 9ab1b1d15ff41829385e65555592cac08448d1e0 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Mon, 15 Jul 2019 16:07:57 -0700 Subject: Call disk_image from imagebuilder_run, introduce imagebuilder_sd Signed-off-by: Stefano Stabellini --- docker-extras/disk_image | 106 +++++++++++++++++++++ docker-extras/imagebuilder_run | 195 -------------------------------------- docker-extras/imagebuilder_sd | 9 ++ docker-extras/imagebuilder_tftp | 8 ++ docker-extras/uboot-script-gen | 202 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 325 insertions(+), 195 deletions(-) create mode 100755 docker-extras/disk_image delete mode 100644 docker-extras/imagebuilder_run create mode 100644 docker-extras/imagebuilder_sd create mode 100644 docker-extras/imagebuilder_tftp create mode 100644 docker-extras/uboot-script-gen (limited to 'docker-extras') 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_run b/docker-extras/imagebuilder_run deleted file mode 100644 index ab0cbe4..0000000 --- a/docker-extras/imagebuilder_run +++ /dev/null @@ -1,195 +0,0 @@ -#!/bin/bash - -offset=$((2*1024*1024)) -filesize=0 - -function add_device_tree_kernel() -{ - local path=$1 - local addr=$2 - local size=$3 - - echo "fdt mknod $path module$addr" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr compatible \"multiboot,kernel\" \"multiboot,module\"" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr reg <0x0 "$addr" 0x0 "$size">" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr bootargs \"console=ttyAMA0\"" >> $UBOOT_SOURCE -} - -function add_device_tree_ramdisk() -{ - local path=$1 - local addr=$2 - local size=$3 - - echo "fdt mknod $path module$addr" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr compatible \"multiboot,ramdisk\" \"multiboot,module\"" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr reg <0x0 "$addr" 0x0 "$size">" >> $UBOOT_SOURCE -} - -function add_device_tree_passthrough() -{ - local path=$1 - local addr=$2 - local size=$3 - - echo "fdt mknod $path module$addr" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr compatible \"multiboot,device-tree\" \"multiboot,module\"" >> $UBOOT_SOURCE - echo "fdt set $path/module$addr reg <0x0 "$addr" 0x0 "$size">" >> $UBOOT_SOURCE -} - -function device_tree_editing() -{ - local device_tree_addr=$1 - - echo "fdt addr $device_tree_addr" >> $UBOOT_SOURCE - echo "fdt resize" >> $UBOOT_SOURCE - echo "fdt set /chosen \#address-cells <0x2>" >> $UBOOT_SOURCE - echo "fdt set /chosen \#size-cells <0x2>" >> $UBOOT_SOURCE - echo "fdt set /chosen xen,xen-bootargs \"console=dtuart dtuart=serial0 dom0_mem=700M dom0_max_vcpus=1 bootscrub=0 serrors=forward vwfi=native sched=null\"" >> $UBOOT_SOURCE - 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 - - i=0 - while test $i -lt $NUM_DOMUS - do - echo "fdt mknod /chosen domU$i" >> $UBOOT_SOURCE - echo "fdt set /chosen/domU$i compatible \"xen,domain\"" >> $UBOOT_SOURCE - echo "fdt set /chosen/domU$i \#address-cells <0x2>" >> $UBOOT_SOURCE - echo "fdt set /chosen/domU$i \#size-cells <0x2>" >> $UBOOT_SOURCE - echo "fdt set /chosen/domU$i memory <0x0 0x40000>" >> $UBOOT_SOURCE - echo "fdt set /chosen/domU$i cpus <0x1>" >> $UBOOT_SOURCE - echo "fdt set /chosen/domU$i vpl011 <0x1>" >> $UBOOT_SOURCE - add_device_tree_kernel "/chosen/domU$i" ${domU_kernel_addr[$i]} ${domU_kernel_size[$i]} - if test "${domU_ramdisk_addr[$i]}" - then - add_device_tree_ramdisk "/chosen/domU$i" ${domU_ramdisk_addr[$i]} ${domU_ramdisk_size[$i]} - fi - if test "${domU_passthrough_dtb_addr[$i]}" - then - add_device_tree_passthrough "/chosen/domU$i" ${domU_passthrough_dtb_addr[$i]} ${domU_passthrough_dtb_size[$i]} - fi - i=$(( $i + 1 )) - done -} - -function add_size() -{ - local filename=$1 - local size=`stat --printf="%s" $filename` - memaddr=$(( $memaddr + $size + $offset - 1)) - memaddr=$(( $memaddr & ~($offset - 1) )) - memaddr=`printf "0x%X\n" $memaddr` - filesize=$size -} - -function load_file() -{ - local filename=$1 - - echo "$LOAD_CMD $memaddr $filename" >> $UBOOT_SOURCE - add_size $filename -} - -function check_file_type() -{ - local filename=$1 - local type="$2" - - file $filename | grep "$type" &> /dev/null - if test $? != 0 - then - echo Wrong file type "$filename". It shold be "$type". - fi -} - -function check_compressed_file_type() -{ - local filename=$1 - local type="$2" - - file $filename | grep "gzip compressed data" &> /dev/null - if test $? == 0 - then - local tmp=`mktemp` - cat $filename | gunzip > $tmp - filename=$tmp - fi - 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` - -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 -load_file "$XEN".uboot - -check_compressed_file_type $DOM0_KERNEL "MS-DOS executable" -dom0_kernel_addr=$memaddr -load_file $DOM0_KERNEL -dom0_kernel_size=$(( $memaddr - $dom0_kernel_addr )) - -if test "$DOM0_RAMDISK" -then - check_compressed_file_type $DOM0_RAMDISK "cpio archive" - dom0_ramdisk_addr=$memaddr - mkimage -A arm64 -T ramdisk -C gzip -a $dom0_ramdisk_addr -e $dom0_ramdisk_addr -d $DOM0_RAMDISK "$DOM0_RAMDISK".uboot &> /dev/null - load_file "$DOM0_RAMDISK".uboot -else - dom0_ramdisk_addr="-" -fi - -i=0 -while test $i -lt $NUM_DOMUS -do - check_compressed_file_type ${DOMU_KERNEL[$i]} "MS-DOS executable" - domU_kernel_addr[$i]=$memaddr - load_file ${DOMU_KERNEL[$i]} - domU_kernel_size[$i]=$filesize - if test "${DOMU_RAMDISK[$i]}" - then - check_compressed_file_type ${DOMU_RAMDISK[$i]} "cpio archive" - domU_ramdisk_addr[$i]=$memaddr - load_file ${DOMU_RAMDISK[$i]} - domU_ramdisk_size[$i]=$filesize - fi - if test "${DOMU_PASSTHROUGH_DTB[$i]}" - then - check_compressed_file_type ${DOMU_PASSTHROUGH_DTB[$i]} "Device Tree Blob" - domU_passthrough_dtb_addr[$i]=$memaddr - load_file ${DOMU_PASSTHROUGH_DTB[$i]} - domU_passthrough_dtb_size[$i]=$filesize - fi - i=$(( $i + 1 )) -done - -check_file_type $DEVICE_TREE "Device Tree Blob" -device_tree_addr=$memaddr -load_file $DEVICE_TREE -device_tree_editing $device_tree_addr - -memaddr=$(( $MEMORY_END - $memaddr )) -if test $memaddr -lt 0 -then - echo Error, not enough memory to load all binaries - exit 1 -fi - -echo "bootm $xen_addr $dom0_ramdisk_addr $device_tree_addr" >> $UBOOT_SOURCE - -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" 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/uboot-script-gen b/docker-extras/uboot-script-gen new file mode 100644 index 0000000..ebb0f7a --- /dev/null +++ b/docker-extras/uboot-script-gen @@ -0,0 +1,202 @@ +#!/bin/bash + +# LOAD_CMD="tftpb" +# LOAD_CMD="load scsi 0:1" + +offset=$((2*1024*1024)) +filesize=0 + +function add_device_tree_kernel() +{ + local path=$1 + local addr=$2 + local size=$3 + + echo "fdt mknod $path module$addr" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr compatible \"multiboot,kernel\" \"multiboot,module\"" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr reg <0x0 "$addr" 0x0 "$size">" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr bootargs \"console=ttyAMA0\"" >> $UBOOT_SOURCE +} + +function add_device_tree_ramdisk() +{ + local path=$1 + local addr=$2 + local size=$3 + + echo "fdt mknod $path module$addr" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr compatible \"multiboot,ramdisk\" \"multiboot,module\"" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr reg <0x0 "$addr" 0x0 "$size">" >> $UBOOT_SOURCE +} + +function add_device_tree_passthrough() +{ + local path=$1 + local addr=$2 + local size=$3 + + echo "fdt mknod $path module$addr" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr compatible \"multiboot,device-tree\" \"multiboot,module\"" >> $UBOOT_SOURCE + echo "fdt set $path/module$addr reg <0x0 "$addr" 0x0 "$size">" >> $UBOOT_SOURCE +} + +function device_tree_editing() +{ + local device_tree_addr=$1 + + echo "fdt addr $device_tree_addr" >> $UBOOT_SOURCE + echo "fdt resize" >> $UBOOT_SOURCE + echo "fdt set /chosen \#address-cells <0x2>" >> $UBOOT_SOURCE + echo "fdt set /chosen \#size-cells <0x2>" >> $UBOOT_SOURCE + echo "fdt set /chosen xen,xen-bootargs \"console=dtuart dtuart=serial0 dom0_mem=700M dom0_max_vcpus=1 bootscrub=0 serrors=forward vwfi=native sched=null\"" >> $UBOOT_SOURCE + 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 + 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 + echo "fdt mknod /chosen domU$i" >> $UBOOT_SOURCE + echo "fdt set /chosen/domU$i compatible \"xen,domain\"" >> $UBOOT_SOURCE + echo "fdt set /chosen/domU$i \#address-cells <0x2>" >> $UBOOT_SOURCE + echo "fdt set /chosen/domU$i \#size-cells <0x2>" >> $UBOOT_SOURCE + echo "fdt set /chosen/domU$i memory <0x0 0x40000>" >> $UBOOT_SOURCE + echo "fdt set /chosen/domU$i cpus <0x1>" >> $UBOOT_SOURCE + echo "fdt set /chosen/domU$i vpl011 <0x1>" >> $UBOOT_SOURCE + add_device_tree_kernel "/chosen/domU$i" ${domU_kernel_addr[$i]} ${domU_kernel_size[$i]} + if test "${domU_ramdisk_addr[$i]}" + then + add_device_tree_ramdisk "/chosen/domU$i" ${domU_ramdisk_addr[$i]} ${domU_ramdisk_size[$i]} + fi + if test "${domU_passthrough_dtb_addr[$i]}" + then + add_device_tree_passthrough "/chosen/domU$i" ${domU_passthrough_dtb_addr[$i]} ${domU_passthrough_dtb_size[$i]} + fi + i=$(( $i + 1 )) + done +} + +function add_size() +{ + local filename=$1 + local size=`stat --printf="%s" $filename` + memaddr=$(( $memaddr + $size + $offset - 1)) + memaddr=$(( $memaddr & ~($offset - 1) )) + memaddr=`printf "0x%X\n" $memaddr` + filesize=$size +} + +function load_file() +{ + local filename=$1 + + echo "$LOAD_CMD $memaddr $filename" >> $UBOOT_SOURCE + add_size $filename +} + +function check_file_type() +{ + local filename=$1 + local type="$2" + + file $filename | grep "$type" &> /dev/null + if test $? != 0 + then + echo Wrong file type "$filename". It shold be "$type". + fi +} + +function check_compressed_file_type() +{ + local filename=$1 + local type="$2" + + file $filename | grep "gzip compressed data" &> /dev/null + if test $? == 0 + then + local tmp=`mktemp` + cat $filename | gunzip > $tmp + filename=$tmp + fi + check_file_type $filename "$type" +} + +. 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 +load_file "$XEN".uboot + +check_compressed_file_type $DOM0_KERNEL "MS-DOS executable" +dom0_kernel_addr=$memaddr +load_file $DOM0_KERNEL +dom0_kernel_size=$(( $memaddr - $dom0_kernel_addr )) + +if test "$DOM0_RAMDISK" && [[ $LOAD_CMD = "tftpb" ]] +then + check_compressed_file_type $DOM0_RAMDISK "cpio archive" + dom0_ramdisk_addr=$memaddr + mkimage -A arm64 -T ramdisk -C gzip -a $dom0_ramdisk_addr -e $dom0_ramdisk_addr -d $DOM0_RAMDISK "$DOM0_RAMDISK".uboot &> /dev/null + load_file "$DOM0_RAMDISK".uboot +else + dom0_ramdisk_addr="-" +fi + +i=0 +while test $i -lt $NUM_DOMUS +do + check_compressed_file_type ${DOMU_KERNEL[$i]} "MS-DOS executable" + domU_kernel_addr[$i]=$memaddr + load_file ${DOMU_KERNEL[$i]} + domU_kernel_size[$i]=$filesize + if test "${DOMU_RAMDISK[$i]}" + then + check_compressed_file_type ${DOMU_RAMDISK[$i]} "cpio archive" + domU_ramdisk_addr[$i]=$memaddr + load_file ${DOMU_RAMDISK[$i]} + domU_ramdisk_size[$i]=$filesize + fi + if test "${DOMU_PASSTHROUGH_DTB[$i]}" + then + check_compressed_file_type ${DOMU_PASSTHROUGH_DTB[$i]} "Device Tree Blob" + domU_passthrough_dtb_addr[$i]=$memaddr + load_file ${DOMU_PASSTHROUGH_DTB[$i]} + domU_passthrough_dtb_size[$i]=$filesize + fi + i=$(( $i + 1 )) +done + +check_file_type $DEVICE_TREE "Device Tree Blob" +device_tree_addr=$memaddr +load_file $DEVICE_TREE +device_tree_editing $device_tree_addr + +memaddr=$(( $MEMORY_END - $memaddr )) +if test $memaddr -lt 0 +then + echo Error, not enough memory to load all binaries + exit 1 +fi + +echo "bootm $xen_addr $dom0_ramdisk_addr $device_tree_addr" >> $UBOOT_SOURCE + +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 "$LOAD_CMD $uboot_addr $UBOOT_SCRIPT; source $uboot_addr" -- cgit v1.2.3