Added initramfs image and fixed several error to make AGL rootfs

bootable as an OSTree deployment

Bug-AGL: SPEC-253

Change-Id: If636a282d51a64c73c46ce70a361518c1f70cdd6
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>

2 files changed, 145 insertions, 83 deletions

diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass
index 5b9ac97..a180721 100644
--- a/meta-sota/classes/image_types_ostree.bbclass
+++ b/meta-sota/classes/image_types_ostree.bbclass
@@ -1,33 +1,40 @@
 # OSTree deployment
 
-inherit image_types
+inherit image
 
 IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ 
 			virtual/kernel:do_deploy \
-			${INITRAMFS_IMAGE}:do_image_cpio"
+			${OSTREE_INITRAMFS_IMAGE}:do_image_cpio"
 
-# Please redefine OSTREE_REPO in your local.conf in order to have a persistent
-#   OSTree repo
-OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
 export OSTREE_REPO
-
-# OSTREE_BRANCHNAME can also be redefined
-OSTREE_BRANCHNAME ?= "${IMAGE_BASENAME}"
 export OSTREE_BRANCHNAME
 
 IMAGE_CMD_ostree () {
-	OSTREE_ROOTFS=`mktemp -d ${WORKDIR}/ostree-root-XXXXX`
-	cp -rp ${IMAGE_ROOTFS}/* ${OSTREE_ROOTFS}
+	if [ -z "$OSTREE_REPO" ]; then
+		bbfatal "OSTREE_REPO should be set in your local.conf"
+	fi
+
+	if [ -z "$OSTREE_BRANCHNAME" ]; then
+		bbfatal "OSTREE_BRANCHNAME should be set in your local.conf"
+	fi
+
+	OSTREE_ROOTFS=`mktemp -du ${WORKDIR}/ostree-root-XXXXX`
+	cp -a ${IMAGE_ROOTFS} ${OSTREE_ROOTFS}
+	chmod a+rx ${OSTREE_ROOTFS}
+	sync
+
 	cd ${OSTREE_ROOTFS}
 
 	# Create sysroot directory to which physical sysroot will be mounted
 	mkdir sysroot
-	ln -sf /sysroot/ostree ostree
-	ln -sf /sysroot/tmp tmp
+	ln -sf sysroot/ostree ostree
+
+	rm -rf tmp/*
+	ln -sf sysroot/tmp tmp
 
 	mkdir -p usr/rootdirs
-	mkdir -p var/rootdirs
 
+	mv etc usr/
 	# Implement UsrMove
 	dirs="bin sbin lib"
 
@@ -35,23 +42,46 @@ IMAGE_CMD_ostree () {
 		if [ -d ${dir} ] && [ ! -L ${dir} ] ; then 
 			mv ${dir} usr/rootdirs/
 			rm -rf ${dir}
-			ln -sf /usr/rootdirs/${dir} ${dir}
+			ln -sf usr/rootdirs/${dir} ${dir}
 		fi
 	done
+	
+	if [ ! -d "usr/etc/tmpfiles.d" ]; then
+		mkdir usr/etc/tmpfiles.d
+	fi
+	tmpfiles_conf=usr/etc/tmpfiles.d/00ostree-tmpfiles.conf
+
+	echo "d /var/rootdirs 0755 root root -" >>${tmpfiles_conf}
+	echo "L /var/rootdirs/home - - - - /sysroot/home" >>${tmpfiles_conf}
+	# Preserve data in /home to be later copied to /sysroot/home by
+	#   sysroot generating procedure
+	mkdir -p usr/homedirs
+	if [ -d "home" ] && [ ! -L "home" ]; then
+		mv home usr/homedirs/home
+		ln -sf var/rootdirs/home home
+	fi
 
 	# Move persistent directories to /var
-	dirs="home opt mnt media srv"
+	dirs="opt mnt media srv"
 
 	for dir in ${dirs}; do
 		if [ -d ${dir} ] && [ ! -L ${dir} ]; then
-			mv ${dir} var/rootdirs/
-			ln -sf /var/rootdirs/${dir} ${dir}
+			if [ "$(ls -A $dir)" ]; then
+				bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr"
+			fi
+			echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf}
+			rm -rf ${dir}
+			ln -sf var/rootdirs/${dir} ${dir}
 		fi
 	done
 
 	if [ -d root ] && [ ! -L root ]; then
-		mv root var/roothome
-		ln -sf /var/roothome root
+		if [ "$(ls -A root)" ]; then
+			bberror "Data in /root directory is not preserved by OSTree."
+		fi
+		echo "d /var/roothome 0755 root root -" >>${tmpfiles_conf}
+		rm -rf root
+		ln -sf var/roothome root
 	fi
 
 	# Creating boot directories is required for "ostree admin deploy"
@@ -63,14 +93,17 @@ IMAGE_CMD_ostree () {
 	checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} | cut -f 1 -d " "`
 
 	cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} boot/vmlinuz-${checksum}
-	cp ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz boot/initramfs-${checksum}
+	cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}.cpio.gz boot/initramfs-${checksum}
 
 	cd ${WORKDIR}
 
 	# Create a tarball that can be then commited to OSTree repo
 	OSTREE_TAR=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ostree.tar.bz2 
-	tar -C ${OSTREE_ROOTFS} -cjf ${OSTREE_TAR} .
-	rm -rf ${OSTREE_ROOTFS}
+	tar -C ${OSTREE_ROOTFS} --xattrs --xattrs-include='*' -cjf ${OSTREE_TAR} .
+	sync
+
+	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2
+	ln -s ${IMAGE_NAME}.rootfs.ostree.tar.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2
 	
 	if [ ! -d ${OSTREE_REPO} ]; then
 		ostree --repo=${OSTREE_REPO} init --mode=archive-z2
@@ -78,10 +111,11 @@ IMAGE_CMD_ostree () {
 
 	# Commit the result
 	ostree --repo=${OSTREE_REPO} commit \
-	       --tree=tar=${OSTREE_TAR} \
+	       --tree=dir=${OSTREE_ROOTFS} \
 	       --skip-if-unchanged \
 	       --branch=${OSTREE_BRANCHNAME} \
 	       --subject="Commit-id: ${IMAGE_NAME}"
 
+	rm -rf ${OSTREE_ROOTFS}
 }
 
diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass
index bb55e61..b9126ec 100644
--- a/meta-sota/classes/image_types_ota.bbclass
+++ b/meta-sota/classes/image_types_ota.bbclass
@@ -6,75 +6,103 @@
 # OSTree updates may require some space on boot file system for
 # boot scripts, kernel and initramfs images
 #
-BOOTFS_EXTRA_SIZE ?= "512"
-export BOOTFS_EXTRA_SIZE
-
-do_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \
-		       parted-native:do_populate_sysroot \
-		       virtual/kernel:do_deploy \
-		       virtual/bootloader:do_deploy \
-		       ${INITRD_IMAGE}:do_image_cpio \
-		       ${PN}:do_image_ext4"
-
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4"
-INITRD_IMAGE ?= "core-image-minimal-initramfs"
-INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
-
-build_bootfs () {
-	KERNEL_FILE=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} 
-	KERNEL_SIZE=`du -Lbs ${KERNEL_FILE} | cut -f 1`
-
-	RAMDISK_FILE=${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz 
-	RAMDISK_SIZE=`du -Lbs ${RAMDISK_FILE} | cut -f 1`
-
-	EXTRA_BYTES=$(expr $BOOTFS_EXTRA_SIZE \* 1024 \* 1024)
-
-	TOTAL_SIZE=$(expr ${KERNEL_SIZE} \+ ${RAMDISK_SIZE} \+ ${EXTRA_BYTES})
-	TOTAL_BLOCKS=$(expr 1 \+ $TOTAL_SIZE / 1024)
-
-	dd if=/dev/zero of=$1 bs=1024 count=${TOTAL_BLOCKS}
-	BOOTTMP=$(mktemp -d mkotaboot-XXX) 
-	cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ${BOOTTMP}
-	cp ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz ${BOOTTMP}
-	mkfs.ext4 $1 -d ${BOOTTMP}
-	rm -rf $BOOTTMP
+
+inherit image
+
+IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \
+			virtual/bootloader:do_deploy"
+
+calculate_size () {
+	BASE=$1
+	SCALE=$2
+	MIN=$3
+	MAX=$4
+	EXTRA=$5
+	ALIGN=$6
+
+	SIZE=`echo "$BASE * $SCALE" | bc -l`
+	REM=`echo $SIZE | cut -d "." -f 2`
+	SIZE=`echo $SIZE | cut -d "." -f 1`
+
+	if [ -n "$REM" -o ! "$REM" -eq 0 ]; then
+		SIZE=`expr $SIZE \+ 1`
+	fi
+
+	if [ "$SIZE" -lt "$MIN" ]; then
+		$SIZE=$MIN
+	fi
+
+	SIZE=`expr $SIZE \+ $EXTRA`
+	SIZE=`expr $SIZE \+ $ALIGN \- 1`
+	SIZE=`expr $SIZE \- $SIZE \% $ALIGN`
+
+	if [ -n "$MAX" ]; then
+		if [ "$SIZE" -gt "$MAX" ]; then
+			return -1
+		fi
+	fi
+	
+	echo "${SIZE}"
 }
 
-do_otaimg () {
-	BOOTIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaboot.ext4
-	rm -f $BOOTIMG
-	build_bootfs $BOOTIMG
+export OSTREE_OSNAME
+export OSTREE_BRANCHNAME
+export OSTREE_REPO
 
-	ROOTIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4
+IMAGE_CMD_otaimg () {
+	if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then
+		if [ -z "$OSTREE_REPO" ]; then
+			bbfatal "OSTREE_REPO should be set in your local.conf"
+		fi
 
-	BOOTFSBLOCKS=`du -bks ${BOOTIMG} | cut -f 1`
+		if [ -z "$OSTREE_OSNAME" ]; then
+			bbfatal "OSTREE_OSNAME should be set in your local.conf"
+		fi
 
-	ROOTFSBLOCKS=`du -bks ${ROOTIMG} | cut -f 1`
-	TOTALSIZE=`expr $BOOTFSBLOCKS \+ $ROOTFSBLOCKS`
-	END1=`expr $BOOTFSBLOCKS \* 1024`
-	END2=`expr $END1 + 512`
-	END3=`expr \( $ROOTFSBLOCKS \* 1024 \) + $END1`
+		if [ -z "$OSTREE_BRANCHNAME" ]; then
+			bbfatal "OSTREE_BRANCHNAME should be set in your local.conf"
+		fi
 
-	FULLIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg
-	rm -rf ${FULLIMG}
 
-	dd if=/dev/zero of=${FULLIMG} bs=1024 seek=${TOTALSIZE} count=1
-	parted ${FULLIMG} mklabel msdos 
-	parted ${FULLIMG} mkpart primary ext4 0 ${END1}B
-	parted ${FULLIMG} unit B mkpart primary ext4 ${END2}B ${END3}B
+		PHYS_SYSROOT=`mktemp -d ${WORKDIR}/ota-sysroot-XXXXX`
 
-	OFFSET=`expr $END2 / 512`
+		ostree admin --sysroot=${PHYS_SYSROOT} init-fs ${PHYS_SYSROOT}
+		ostree admin --sysroot=${PHYS_SYSROOT} os-init ${OSTREE_OSNAME}
 
-	dd if=${BOOTIMG} of=${FULLIMG} conv=notrunc seek=1 bs=512
-	dd if=${ROOTIMG} of=${FULLIMG} conv=notrunc seek=$OFFSET bs=512
+		mkdir -p ${PHYS_SYSROOT}/boot/loader.0
+		ln -s loader.0 ${PHYS_SYSROOT}/boot/loader
 
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${IMAGE_LINK_NAME}.otaimg
-	ln -s ${IMAGE_NAME}.otaimg ${IMAGE_LINK_NAME}.otaimg
-}
+		touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt
+
+		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
+		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}/
+		rm -rf ${HOME_TMP}
+
+		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}")
 
-addtask otaimg before do_build
+		if [ $OTA_ROOTFS_SIZE -lt 0 ]; then
+			exit -1
+		fi
+		eval local COUNT=\"0\"
+		eval local MIN_COUNT=\"60\"
+		if [ $OTA_ROOTFS_SIZE -lt $MIN_COUNT ]; then
+			eval COUNT=\"$MIN_COUNT\"
+		fi
+
+		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}
+		rm -rf ${PHYS_SYSROOT}
+
+		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
+		ln -s ${IMAGE_NAME}.otaimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
+	fi
+}
 
-IMAGE_TYPES += " otaimg"
-IMAGE_TYPES_MASKED += "otaimg"
-IMAGE_TYPEDEP_otaimg = "ext4"
+IMAGE_TYPEDEP_otaimg = "ostree"