[gnome-build-meta/tpollard/raspi4] Patch prepare-image.sh inline with GBM commit b426d93f8b1b065

[Tom Pollard <tpollard src gnome org>]

commit 246c70d1394915300d9b489487f5eead9f8a7ebc
Author: Tom Pollard <tom pollard codethink co uk>
Date:   Wed May 13 17:21:39 2020 +0100

    Patch prepare-image.sh inline with GBM commit b426d93f8b1b065

 elements/freedesktop-sdk.bst                       |  2 ++
 ...image.sh-Add-setup-machine-id-to-systemd-.patch | 26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 3a060277..ec9b294f 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -3,6 +3,8 @@ sources:
 - kind: git_tag
   url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
   track: master
+- kind: patch
+  path: patches/0001-vm-prepare-image.sh-Add-setup-machine-id-to-systemd-.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/patches/0001-vm-prepare-image.sh-Add-setup-machine-id-to-systemd-.patch 
b/patches/0001-vm-prepare-image.sh-Add-setup-machine-id-to-systemd-.patch
new file mode 100644
index 00000000..deacf431
--- /dev/null
+++ b/patches/0001-vm-prepare-image.sh-Add-setup-machine-id-to-systemd-.patch
@@ -0,0 +1,26 @@
+From 7b9bf20c41d5b21b110499b3ebff12cddec335ef Mon Sep 17 00:00:00 2001
+From: Tom Pollard <tom pollard codethink co uk>
+Date: Wed, 13 May 2020 17:19:03 +0100
+Subject: [PATCH] vm/prepare-image.sh: Add --setup-machine-id to
+ systemd-firstboot
+
+---
+ files/vm/prepare-image.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/vm/prepare-image.sh b/files/vm/prepare-image.sh
+index a91344bc..01dd09d1 100755
+--- a/files/vm/prepare-image.sh
++++ b/files/vm/prepare-image.sh
+@@ -86,7 +86,7 @@ for i in $(ls "${initial_scripts}"/*); do
+ done
+ 
+ echo "Running systemd-firstboot" 1>&2
+-systemd-firstboot --root "${sysroot}" ${rootpasswd:+--root-password ${rootpasswd}} --locale en_US.UTF-8 
--timezone UTC
++systemd-firstboot --root "${sysroot}" ${rootpasswd:+--root-password ${rootpasswd}} --locale en_US.UTF-8 
--timezone UTC --setup-machine-id
+ 
+ echo "Running systemctl preset-all" 1>&2
+ systemctl --root "${sysroot}" preset-all
+-- 
+2.25.1
+