ci: generate ext4 image after downloading artifacts

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

resources/rebuild.sh

@@ -18,24 +18,6 @@ function install_dependencies {
     sudo apt install -y bc flex bison gcc make libelf-dev libssl-dev squashfs-tools busybox-static tree cpio curl
 }
 
-function dir2ext4img {
-    # ext4
-    # https://unix.stackexchange.com/questions/503211/how-can-an-image-file-be-created-for-a-directory
-    local DIR=$1
-    local IMG=$2
-    # Default size for the resulting rootfs image is 300M
-    local SIZE=${3:-300M}
-    local TMP_MNT=$(mktemp -d)
-    truncate -s "$SIZE" "$IMG"
-    mkfs.ext4 -F "$IMG"
-    sudo mount "$IMG" "$TMP_MNT"
-    sudo tar c -C $DIR . |sudo tar x -C "$TMP_MNT"
-    # cleanup
-    sudo umount "$TMP_MNT"
-    rmdir $TMP_MNT
-}
-
-
 function compile_and_install {
     local C_FILE=$1
     local BIN_FILE=$2
@@ -89,8 +71,6 @@ EOF
     rootfs_img="$OUTPUT_DIR/$ROOTFS_NAME.squashfs"
     sudo mv $rootfs/root/manifest $OUTPUT_DIR/$ROOTFS_NAME.manifest
     sudo mksquashfs $rootfs $rootfs_img -all-root -noappend
-    rootfs_ext4=$OUTPUT_DIR/$ROOTFS_NAME.ext4
-    dir2ext4img $rootfs $rootfs_ext4
     sudo rm -rf $rootfs
     sudo chown -Rc $USER. $OUTPUT_DIR
 }

tools/test.sh

@@ -31,6 +31,19 @@ if [ -f $CGROUP/cgroup.controllers -a -e $CGROUP/cgroup.type ]; then
         > $CGROUP/cgroup.subtree_control
 fi
 
+cd build/img/$(uname -m)
+for SQUASHFS in *.squashfs; do
+    EXT4=$(basename $SQUASHFS .squashfs).ext4
+    # Create rw ext4 image from ro squashfs
+    [ -f $EXT4 ] && continue
+    say "Converting $SQUASHFS to $EXT4"
+    truncate -s 400M $EXT4
+    unsquashfs $SQUASHFS
+    mkfs.ext4 -F $EXT4 -d squashfs-root
+    rm -rf squashfs-root
+done
+cd -
+
 say "Copy CI artifacts to /srv, so hardlinks work"
 cp -ruvf build/img /srv