From 501e07acd803df6f9264c4206b4b9529006f287a Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 30 Mar 2017 17:48:10 +0200 Subject: Merge from meta-agl-extra --- classes/image_types_ostree.bbclass | 9 +++-- classes/image_types_ota.bbclass | 53 ++++++++++++++--------------- classes/sdcard_image-dra7xx-evm-ota.bbclass | 3 ++ classes/sdcard_image-porter-ota.bbclass | 6 ++-- classes/sdcard_image-rpi-ota.bbclass | 15 ++++++-- 5 files changed, 51 insertions(+), 35 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 8b3cbcd..59d4510 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -68,6 +68,10 @@ IMAGE_CMD_ostree () { ln -s ../init.d/tmpfiles.sh usr/etc/rcS.d/S20tmpfiles.sh fi + # Preserve OSTREE_BRANCHNAME for future information + mkdir -p usr/share/sota/ + echo -n "${OSTREE_BRANCHNAME}" > usr/share/sota/branchname + # Preserve data in /home to be later copied to /sysroot/home by # sysroot generating procedure mkdir -p usr/homedirs @@ -122,7 +126,7 @@ IMAGE_CMD_ostree () { cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum} # Copy image manifest - cat ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest | cut -d " " -f1,3 > usr/package.manifest + cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest cd ${WORKDIR} @@ -154,6 +158,7 @@ IMAGE_CMD_ostreepush () { if [ ${OSTREE_PUSH_CREDENTIALS} ]; then garage-push --repo=${OSTREE_REPO} \ --ref=${OSTREE_BRANCHNAME} \ - --credentials=${OSTREE_PUSH_CREDENTIALS} + --credentials=${OSTREE_PUSH_CREDENTIALS} \ + --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt fi } diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index bee1ea4..74533dd 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -9,12 +9,9 @@ inherit image -IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot" - -# For qemux86 u-boot is not included in any live image and is built separately -IMAGE_DEPENDS_otaimg_append_qemux86 = " virtual/bootloader:do_deploy" -IMAGE_DEPENDS_otaimg_append_qemux86-64 = " virtual/bootloader:do_deploy" -IMAGE_DEPENDS_otaimg_append_corei7-64-intel-common = " virtual/bootloader:do_deploy" +IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \ + ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ + ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" calculate_size () { BASE=$1 @@ -52,6 +49,7 @@ calculate_size () { export OSTREE_OSNAME export OSTREE_BRANCHNAME export OSTREE_REPO +export OSTREE_BOOTLOADER IMAGE_CMD_otaimg () { if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then @@ -76,32 +74,31 @@ IMAGE_CMD_otaimg () { mkdir -p ${PHYS_SYSROOT}/boot/loader.0 ln -s loader.0 ${PHYS_SYSROOT}/boot/loader - touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt + if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then + mkdir -p ${PHYS_SYSROOT}/boot/grub2 + touch ${PHYS_SYSROOT}/boot/grub2/grub.cfg + elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then + touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt + else + bberror "Invalid bootloader: ${OSTREE_BOOTLOADER}" + fi; ostree --repo=${PHYS_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${OSTREE_BRANCHNAME} - ostree admin --sysroot=${PHYS_SYSROOT} deploy --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} - - # Copy deployment /home to sysroot + export OSTREE_BOOT_PARTITION="/boot" + kargs_list="" + for arg in ${OSTREE_KERNEL_ARGS}; do + kargs_list="${kargs_list} --karg-append=$arg" + done + + ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} + + # Copy deployment /home and /var/sota to sysroot HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` - tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs - mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ + tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true +> mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true + mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true rm -rf ${HOME_TMP} - # Deploy device credentials - if [ -n "$SOTA_CREDENTIALS" ]; then - if [ -f "$SOTA_CREDENTIALS" ]; then - EXT=`basename $SOTA_CREDENTIALS | cut -d'.' -f2` - if [ "$EXT" != "toml" ]; then - bbwarn "File\'s extension is not \'toml\', make sure you have the correct file" - fi - - cat $SOTA_CREDENTIALS | sed 's/^package_manager = .*$/package_manager = "ostree"/' > ${PHYS_SYSROOT}/boot/sota.toml - chmod 644 ${PHYS_SYSROOT}/boot/sota.toml - else - bberror "File $SOTA_CREDENTIALS does not exist" - fi - fi - # Calculate image type OTA_ROOTFS_SIZE=$(calculate_size `du -ks $PHYS_SYSROOT | cut -f 1` "${IMAGE_OVERHEAD_FACTOR}" "${IMAGE_ROOTFS_SIZE}" "${IMAGE_ROOTFS_MAXSIZE}" `expr ${IMAGE_ROOTFS_EXTRA_SPACE}` "${IMAGE_ROOTFS_ALIGNMENT}") @@ -118,7 +115,7 @@ IMAGE_CMD_otaimg () { rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg sync dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg seek=$OTA_ROOTFS_SIZE count=$COUNT bs=1024 - mkfs.ext4 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg -d ${PHYS_SYSROOT} + mkfs.ext4 -O ^64bit ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg -d ${PHYS_SYSROOT} rm -rf ${PHYS_SYSROOT} rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg diff --git a/classes/sdcard_image-dra7xx-evm-ota.bbclass b/classes/sdcard_image-dra7xx-evm-ota.bbclass index f023649..179ed10 100644 --- a/classes/sdcard_image-dra7xx-evm-ota.bbclass +++ b/classes/sdcard_image-dra7xx-evm-ota.bbclass @@ -68,5 +68,8 @@ IMAGE_CMD_dra7xx-evm-sdimg-ota () { xz -k "${SDIMG_OTA}" ;; esac + + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota + ln -s ${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota } diff --git a/classes/sdcard_image-porter-ota.bbclass b/classes/sdcard_image-porter-ota.bbclass index 5909b44..a9619dc 100644 --- a/classes/sdcard_image-porter-ota.bbclass +++ b/classes/sdcard_image-porter-ota.bbclass @@ -59,9 +59,6 @@ IMAGE_CMD_porter-sdimg-ota () { dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync fi - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.porter-sdimg-ota - ln -s ${IMAGE_NAME}.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.porter-sdimg-ota - # Optionally apply compression case "${SDIMG_OTA_COMPRESSION}" in "gzip") @@ -74,5 +71,8 @@ IMAGE_CMD_porter-sdimg-ota () { xz -k "${SDIMG_OTA}" ;; esac + + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota + ln -s ${IMAGE_NAME}.rootfs.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota } diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass index cb0c597..f5c35a2 100644 --- a/classes/sdcard_image-rpi-ota.bbclass +++ b/classes/sdcard_image-rpi-ota.bbclass @@ -72,6 +72,8 @@ SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. FATPAYLOAD ?= "" +IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" +IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP" IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME" IMAGE_CMD_rpi-sdimg-ota () { @@ -123,8 +125,10 @@ IMAGE_CMD_rpi-sdimg-ota () { # Copy device tree overlays to dedicated folder mmd -i ${WORKDIR}/boot.img overlays for DTB in ${DT_OVERLAYS}; do - DTB_BASE_NAME=`basename ${DTB} .dtb` - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtbo + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` + + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT} done fi @@ -145,6 +149,10 @@ IMAGE_CMD_rpi-sdimg-ota () { done fi + # Add stamp file + echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info + mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info :: + # Burn Partitions sync dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync @@ -171,6 +179,9 @@ IMAGE_CMD_rpi-sdimg-ota () { xz -k "${SDIMG_OTA}" ;; esac + + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota + ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota } ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " -- cgit v1.2.3-54-g00ecf From b49c2631b6bc48ead4d352e2bd00cdfbca7af5e8 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 3 Apr 2017 12:05:53 +0200 Subject: Replace sdcard_image* classes with wic --- classes/sdcard_image-dra7xx-evm-ota.bbclass | 75 -------------------------- classes/sdcard_image-minnowboard-ota.bbclass | 78 ---------------------------- classes/sdcard_image-porter-ota.bbclass | 78 ---------------------------- conf/distro/sota.conf.inc | 48 +++++------------ scripts/lib/wic/canned-wks/sdimage-sota.wks | 7 +++ scripts/lib/wic/plugins/otaimage.py | 69 ++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 267 deletions(-) delete mode 100644 classes/sdcard_image-dra7xx-evm-ota.bbclass delete mode 100644 classes/sdcard_image-minnowboard-ota.bbclass delete mode 100644 classes/sdcard_image-porter-ota.bbclass create mode 100644 scripts/lib/wic/canned-wks/sdimage-sota.wks create mode 100644 scripts/lib/wic/plugins/otaimage.py (limited to 'classes') diff --git a/classes/sdcard_image-dra7xx-evm-ota.bbclass b/classes/sdcard_image-dra7xx-evm-ota.bbclass deleted file mode 100644 index 179ed10..0000000 --- a/classes/sdcard_image-dra7xx-evm-ota.bbclass +++ /dev/null @@ -1,75 +0,0 @@ -inherit image_types - -# Boot partition volume id -BOOTDD_VOLUME_ID ?= "${MACHINE}" - -# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) -BOOT_SPACE ?= "4096" - -IMAGE_ROOTFS_ALIGNMENT = "4096" -SDIMG_OTA_ROOTFS_TYPE ?= "otaimg" -SDIMG_OTA_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${SDIMG_OTA_ROOTFS_TYPE}" - -IMAGE_TYPEDEP_dra7xx-evm-sdimg-ota = "${SDIMG_OTA_ROOTFS_TYPE}" -IMAGE_DEPENDS_dra7xx-evm-sdimg-ota = " \ - parted-native \ - mtools-native \ - dosfstools-native \ - " - -SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota" - -IMAGE_CMD_dra7xx-evm-sdimg-ota () { - OTAROOT_SIZE=`du -Lb ${SDIMG_OTA_ROOTFS} | cut -f1` - OTAROOT_SIZE=$(expr ${OTAROOT_SIZE} / 1024 + 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDIMG_OTA_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $OTAROOT_SIZE) - - echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $OTAROOT_SIZE KiB" - - # Initialize sdcard image file - dd if=/dev/zero of=${SDIMG_OTA} bs=1024 count=0 seek=${SDIMG_OTA_SIZE} - - # Create partition table - parted -s ${SDIMG_OTA} mklabel msdos - # Create boot partition and mark it as bootable - parted -s ${SDIMG_OTA} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) - parted -s ${SDIMG_OTA} set 1 boot on - # Create rootfs partition to the end of disk - parted -s ${SDIMG_OTA} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s - parted ${SDIMG_OTA} print - - # Create a vfat image with boot files - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG_OTA} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') - rm -f ${WORKDIR}/boot.img - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - sync - - sync - #dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - - if echo "${SDIMG_OTA_ROOTFS_TYPE}" | egrep -q "*\.xz" - then - xzcat ${SDIMG_OTA_ROOTFS} | dd of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - else - dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - fi - - # Optionally apply compression - case "${SDIMG_OTA_COMPRESSION}" in - "gzip") - gzip -k9 "${SDIMG_OTA}" - ;; - "bzip2") - bzip2 -k9 "${SDIMG_OTA}" - ;; - "xz") - xz -k "${SDIMG_OTA}" - ;; - esac - - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota - ln -s ${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota -} - diff --git a/classes/sdcard_image-minnowboard-ota.bbclass b/classes/sdcard_image-minnowboard-ota.bbclass deleted file mode 100644 index c49b3cd..0000000 --- a/classes/sdcard_image-minnowboard-ota.bbclass +++ /dev/null @@ -1,78 +0,0 @@ -inherit image_types - -# Boot partition volume id -BOOTDD_VOLUME_ID ?= "${MACHINE}" - -# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) -BOOT_SPACE ?= "4096" - -IMAGE_ROOTFS_ALIGNMENT = "4096" -SDIMG_OTA_ROOTFS_TYPE ?= "otaimg" -SDIMG_OTA_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${SDIMG_OTA_ROOTFS_TYPE}" - -IMAGE_TYPEDEP_minnowboard-sdimg-ota = "${SDIMG_OTA_ROOTFS_TYPE}" -IMAGE_DEPENDS_minnowboard-sdimg-ota = " \ - parted-native \ - mtools-native \ - dosfstools-native \ - minnowboard-bootfiles \ - " - -SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.minnowboard-sdimg-ota" - -IMAGE_CMD_minnowboard-sdimg-ota () { - OTAROOT_SIZE=`du -Lb ${SDIMG_OTA_ROOTFS} | cut -f1` - OTAROOT_SIZE=$(expr ${OTAROOT_SIZE} / 1024 + 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDIMG_OTA_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $OTAROOT_SIZE) - - echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $OTAROOT_SIZE KiB" - - # Initialize sdcard image file - dd if=/dev/zero of=${SDIMG_OTA} bs=1024 count=0 seek=${SDIMG_OTA_SIZE} - - # Create partition table - parted -s ${SDIMG_OTA} mklabel msdos - # Create boot partition and mark it as bootable - parted -s ${SDIMG_OTA} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) - parted -s ${SDIMG_OTA} set 1 boot on - # Create rootfs partition to the end of disk - parted -s ${SDIMG_OTA} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s - parted ${SDIMG_OTA} print - - # Create a vfat image with boot files - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG_OTA} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') - rm -f ${WORKDIR}/boot.img - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - sync - - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/minnowboard-bootfiles/* ::/ - - sync - dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - - if echo "${SDIMG_OTA_ROOTFS_TYPE}" | egrep -q "*\.xz" - then - xzcat ${SDIMG_OTA_ROOTFS} | dd of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - else - dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - fi - - # Optionally apply compression - case "${SDIMG_OTA_COMPRESSION}" in - "gzip") - gzip -k9 "${SDIMG_OTA}" - ;; - "bzip2") - bzip2 -k9 "${SDIMG_OTA}" - ;; - "xz") - xz -k "${SDIMG_OTA}" - ;; - esac - - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.minnowboard-sdimg-ota - ln -s ${IMAGE_NAME}.minnowboard-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.minnowboard-sdimg-ota -} - diff --git a/classes/sdcard_image-porter-ota.bbclass b/classes/sdcard_image-porter-ota.bbclass deleted file mode 100644 index a9619dc..0000000 --- a/classes/sdcard_image-porter-ota.bbclass +++ /dev/null @@ -1,78 +0,0 @@ -inherit image_types - -# Boot partition volume id -BOOTDD_VOLUME_ID ?= "${MACHINE}" - -# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) -BOOT_SPACE ?= "4096" - -IMAGE_ROOTFS_ALIGNMENT = "4096" -SDIMG_OTA_ROOTFS_TYPE ?= "otaimg" -SDIMG_OTA_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${SDIMG_OTA_ROOTFS_TYPE}" - -IMAGE_TYPEDEP_porter-sdimg-ota = "${SDIMG_OTA_ROOTFS_TYPE}" -IMAGE_DEPENDS_porter-sdimg-ota = " \ - parted-native \ - mtools-native \ - dosfstools-native \ - porter-bootfiles \ - " - -SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.porter-sdimg-ota" - -IMAGE_CMD_porter-sdimg-ota () { - OTAROOT_SIZE=`du -Lb ${SDIMG_OTA_ROOTFS} | cut -f1` - OTAROOT_SIZE=$(expr ${OTAROOT_SIZE} / 1024 + 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) - BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDIMG_OTA_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $OTAROOT_SIZE) - - echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $OTAROOT_SIZE KiB" - - # Initialize sdcard image file - dd if=/dev/zero of=${SDIMG_OTA} bs=1024 count=0 seek=${SDIMG_OTA_SIZE} - - # Create partition table - parted -s ${SDIMG_OTA} mklabel msdos - # Create boot partition and mark it as bootable - parted -s ${SDIMG_OTA} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) - parted -s ${SDIMG_OTA} set 1 boot on - # Create rootfs partition to the end of disk - parted -s ${SDIMG_OTA} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s - parted ${SDIMG_OTA} print - - # Create a vfat image with boot files - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG_OTA} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') - rm -f ${WORKDIR}/boot.img - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - sync - - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/porter-bootfiles/* ::/ - - sync - dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - - if echo "${SDIMG_OTA_ROOTFS_TYPE}" | egrep -q "*\.xz" - then - xzcat ${SDIMG_OTA_ROOTFS} | dd of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - else - dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - fi - - # Optionally apply compression - case "${SDIMG_OTA_COMPRESSION}" in - "gzip") - gzip -k9 "${SDIMG_OTA}" - ;; - "bzip2") - bzip2 -k9 "${SDIMG_OTA}" - ;; - "xz") - xz -k "${SDIMG_OTA}" - ;; - esac - - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota - ln -s ${IMAGE_NAME}.rootfs.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota -} - diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 23e5a43..c8b4388 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -1,8 +1,17 @@ -IMAGE_INSTALL_append = " ostree rvi-sota-client" +DISTRO_FEATURES_append = " sota" +OVERRIDES .= ":sota" + +IMAGE_INSTALL_append = " ostree" # live image for OSTree-enabled systems -IMAGE_CLASSES_append = " image_types_ostree image_types_ota" -IMAGE_FSTYPES += "ostreepush otaimg" +IMAGE_CLASSES += "image_types_ostree image_types_ota" +IMAGE_FSTYPES += "ostreepush otaimg wic" +WKS_FILE = "sdimage-sota.wks" +do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" + +# No working WKS for Raspberry Pi yet +IMAGE_FSTYPES_remove_raspberrypi3 = "wic" +IMAGE_FSTYPES_remove_raspberrypi2 = "wic" # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" @@ -10,36 +19,3 @@ OSTREE_BRANCHNAME ?= "ota-${MACHINE}" OSTREE_OSNAME ?= "poky" OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" -# Platform-specific configurations - -## RaspberryPi -IMAGE_CLASSES_append_raspberrypi2 = " image_types_uboot sdcard_image-rpi-ota" -IMAGE_CLASSES_append_raspberrypi3 = " image_types_uboot sdcard_image-rpi-ota" -IMAGE_FSTYPES += "${@'rpi-sdimg-ota' if d.getVar('MACHINE', True).startswith('raspberrypi') else ''}" -IMAGE_FSTYPES_remove = "rpi-sdimg" - -KERNEL_IMAGETYPE_raspberrypi2 = "uImage" -KERNEL_IMAGETYPE_raspberrypi3 = "uImage" - -UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig" -UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig" -PREFERRED_PROVIDER_virtual/bootloader_raspberrypi2 = "u-boot" -PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 = "u-boot" - -# Some BSPs (e.g. meta-raspberrypi) use this variable to turn debug on/off -DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "release",d)}" - -## Minnowboard -PREFERRED_PROVIDER_virtual/bootloader_intel-corei7-64 = "u-boot-ota" -UBOOT_MACHINE_intel-corei7-64 = "minnowmax_defconfig" -IMAGE_CLASSES_append_intel-corei7-64 = " sdcard_image-minnowboard-ota" -IMAGE_FSTYPES += "${@'minnowboard-sdimg-ota' if d.getVar('MACHINE', True).startswith('intel-corei7-64') else ''}" - -## QEMU -PREFERRED_PROVIDER_virtual/bootloader_qemux86 = "u-boot-ota" -UBOOT_MACHINE_qemux86 = "qemu-x86_defconfig" -PREFERRED_PROVIDER_virtual/bootloader_qemux86-64= "u-boot-ota" -UBOOT_MACHINE_qemux86-64 = "qemu-x86_defconfig" - -DISTROOVERRIDES_append = ":sota" -DISTRO_FEATURES_append = " sota" diff --git a/scripts/lib/wic/canned-wks/sdimage-sota.wks b/scripts/lib/wic/canned-wks/sdimage-sota.wks new file mode 100644 index 0000000..c31c3a5 --- /dev/null +++ b/scripts/lib/wic/canned-wks/sdimage-sota.wks @@ -0,0 +1,7 @@ +# short-description: Create OTA-enabled SD card image +# long-description: Creates a partitioned SD card image with OSTree +# physical sysroot as a payload. Boot files are located in the +# first vfat partition. + +part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 20 +part / --source otaimage --ondisk mmcblk --fstype=ext4 --label root --align 4096 diff --git a/scripts/lib/wic/plugins/otaimage.py b/scripts/lib/wic/plugins/otaimage.py new file mode 100644 index 0000000..016c996 --- /dev/null +++ b/scripts/lib/wic/plugins/otaimage.py @@ -0,0 +1,69 @@ +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +import os + +from wic import msger +from wic.pluginbase import SourcePlugin +from wic.utils.oe.misc import get_bitbake_var + +class OTAImagePlugin(SourcePlugin): + """ + Add an already existing filesystem image to the partition layout. + """ + + name = 'otaimage' + + @classmethod + def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, + bootimg_dir, kernel_dir, native_sysroot): + """ + Called after all partitions have been prepared and assembled into a + disk image. Do nothing. + """ + pass + + @classmethod + def do_configure_partition(cls, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + native_sysroot): + """ + Called before do_prepare_partition(). Possibly prepare + configuration files of some sort. + """ + pass + + @classmethod + def do_prepare_partition(cls, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + rootfs_dir, native_sysroot): + """ + Called to do the actual content population for a partition i.e. it + 'prepares' the partition to be incorporated into the image. + """ + if not bootimg_dir: + bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") + if not bootimg_dir: + msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") + + msger.debug('Bootimg dir: %s' % bootimg_dir) + + src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg" + + msger.debug('Preparing partition using image %s' % (src)) + part.prepare_rootfs_from_fs_image(cr_workdir, src, "") + -- cgit v1.2.3-54-g00ecf