Add an empty u-boot environment to mx6qsabrelite images

The Apertis update manager needs a valid u-boot environment to handle
the rollback. Do it an image generation so that every image
distributed already have a valid env.

Signed-off-by: Frédéric Dalleau <frederic.dalleau@collabora.com>

apertis-image-mx6qsabrelite.yaml

@@ -100,6 +100,12 @@ actions:
     source: /usr/lib/u-boot/mx6qsabrelite/u-boot.imx
     offset: {{ sector 2 }}
 
+  - action: raw
+    description: Install U-Boot environment
+    origin: filesystem
+    source: /usr/share/u-boot-env-imx6/u-boot.env
+    offset: 0xC0000
+
   - action: run
     description: "Save installed package status"
     chroot: false

apertis-ospack-minimal.yaml

@@ -93,6 +93,9 @@ actions:
 {{ if eq $architecture "armhf" }}
   - action: overlay
     source: overlays/initramfs-modules-imx6
+
+  - action: overlay
+    source: overlays/u-boot-env-imx6
 {{ end }}
 
   - action: overlay

apertis-ostree-rollback-commit.yaml

@@ -6,7 +6,7 @@
 {{ $board := or .board "uefi" }}
 {{ $repourl := or .repourl "https://images.apertis.org/ostree/repo" }}
 {{ $osname := or .osname "apertis" }}
-{{ $branch := or .branch (printf "%s/%s/%s-%s/%s-rollback" $osname $suite $architecture $board $type) }}
+{{ $branch := or .branch (printf "%s/%s/%s-%s/%s" $osname $suite $architecture $board $type) }}
 {{ $ostree := or .ostree "repo" }}
 {{ $message := or .message "Update" }}
 
@@ -15,6 +15,40 @@
 architecture: {{ $architecture }}
 
 actions:
+  - action: image-partition
+    imagename: {{ $image }}.img
+{{ if eq $type "minimal" }}
+    imagesize: 4G
+{{end}}
+{{ if eq $type "target" "development" }}
+    imagesize: 15G
+{{end}}
+    partitiontype: gpt
+    gpt_gap: {{ sector 6144 }}b
+
+    mountpoints:
+      - mountpoint: /
+        partition: system
+      - mountpoint: /boot
+        partition: boot
+      - mountpoint: /home
+        partition: general_storage
+
+    partitions:
+      - name: boot
+        fs: ext2
+        start: 6176s
+        end: 1024M
+        flags: [ boot ]
+      - name: system
+        fs: ext4
+        start: 1024M
+        end: 3000M
+      - name: general_storage
+        fs: btrfs
+        start: 3000M
+        end: 100%
+
   - action: ostree-deploy
     description: Deploying ostree onto image
     repository: {{ $ostree }}
@@ -25,10 +59,14 @@ actions:
 
   - action: run
     chroot: false
-    command: "rm ${ROOTDIR}/usr/bin/updatectl"
+    command: "find ${ROOTDIR} -name updatectl 2>/dev/null"
+
+  - action: run
+    chroot: false
+    command: "rm ${ROOTDIR}/ostree/deploy/apertis/deploy/*/usr/bin/updatectl"
 
   - action: ostree-commit
     repository: {{ $ostree }}
-    branch: {{ $branch }}
+    branch: {{ $branch }}-rollback
     subject: {{ $message }} rollback test commit
 

overlays/u-boot-env-imx6/usr/share/u-boot-env-imx6/u-boot-env.txt

+bootcount=0