ospack: Store more information in /etc/os-release

Add the timestamp as `BUILD_ID` and the image type as `VARIANT_ID`
in `/etc/os-release`, so at some point we'll be able to phase
out `/etc/image_version`.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

apertis-ospack-basesdk.yaml

@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run

apertis-ospack-devroot.yaml

@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run

apertis-ospack-minimal.yaml

@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run

apertis-ospack-sdk.yaml

@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run

apertis-ospack-sysroot.yaml

@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run

apertis-ospack-target.yaml

@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run

scripts/setup_image_version.sh

@@ -6,5 +6,11 @@ distro=$1
 rel=$2
 timestamp=$3
 vendor=$4
+variant=$5
 
 echo "${distro} ${rel} ${timestamp} ${vendor}" > /etc/image_version
+
+if [ -n "$variant" ]; then
+    echo "VARIANT_ID=$variant" >> /etc/os-release
+fi
+echo "BUILD_ID=$timestamp" >> /etc/os-release