[elbe-devel] [PATCH v2 1/2] examples: convert from stretch to buster

[Christian Teklenborg]

As buster is the latest stable release move examples to buster.
Drop stretch-backports.

For the UEFI example add the necessary packages for secure boot.
This leads Elbe to duplicate files in /boot/efi, so we have to
provide for a bigger uefi partition size (and a bigger image).

Signed-off-by: Christian Teklenborg <chris at linutronix.de>
---
 examples/elbe-init-big-machine.xml            | 26 +++++++------------
 .../x86_64-pc-hdimg-grub-uefi-stretch.xml     | 17 ++++++------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/examples/elbe-init-big-machine.xml b/examples/elbe-init-big-machine.xml
index ca24d174..f14831ef 100644
--- a/examples/elbe-init-big-machine.xml
+++ b/examples/elbe-init-big-machine.xml
@@ -8,18 +8,18 @@
 			<url-list>
 				<url>
 					<binary>
-						http://security.debian.org/debian-security stretch/updates main
+						http://security.debian.org/debian-security buster/updates main
 					</binary>
 					<source>
-						http://security.debian.org/debian-security stretch/updates main
+						http://security.debian.org/debian-security buster/updates main
 					</source>
 				</url>
 				<url>
 					<binary>
-						http://debian.linutronix.de/elbe stretch main
+						http://debian.linutronix.de/elbe buster main
 					</binary>
 					<source>
-						http://debian.linutronix.de/elbe stretch main
+						http://debian.linutronix.de/elbe buster main
 					</source>
 					<key>
 						http://debian.linutronix.de/elbe/elbe-repo.pub
@@ -27,30 +27,22 @@
 				</url>
 				<url>
 					<binary>
-						http://debian.linutronix.de/elbe-common stretch main
+						http://debian.linutronix.de/elbe-common buster main
 					</binary>
 					<source>
-						http://debian.linutronix.de/elbe-common stretch main
+						http://debian.linutronix.de/elbe-common buster main
 					</source>
 					<key>
 						http://debian.linutronix.de/elbe-common/elbe-repo.pub
 					</key>
 				</url>
-				<url>
-					<binary>
-						http://ftp.de.debian.org/debian stretch-backports main
-					</binary>
-					<source>
-						http://ftp.de.debian.org/debian stretch-backports main
-					</source>
-				</url>
 			</url-list>
 		</mirror>
-		<suite>stretch</suite>
+		<suite>buster</suite>
 		<pkg-list>
 			<pkg>openssh-server</pkg>
-			<pkg pin="stretch-backports">debootstrap</pkg>
-			<pkg pin="stretch-backports">pbuilder</pkg>
+			<pkg>debootstrap</pkg>
+			<pkg>pbuilder</pkg>
 		</pkg-list>
 		<preseed>
 			<conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://ftp.de.debian.org/debian"/>
diff --git a/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml b/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml
index 0ebbf79f..cf3f70d9 100644
--- a/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml
+++ b/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml
@@ -1,6 +1,6 @@
 <ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" created="2009-05-20T08:50:56" revision="6" xsi:schemaLocation="https://www.linutronix.de/projects/Elbe dbsfed.xsd">
 	<project>
-		<name>amd64-grub-uefi-stretch</name>
+		<name>amd64-grub-uefi-buster</name>
 		<version>1.0</version>
 		<description>
 			verify successful UEFI boot by checking
@@ -17,12 +17,12 @@
 			<primary_proto>http</primary_proto>
 			<url-list>
 				<url>
-					<binary>http://security.debian.org stretch/updates main</binary>
-					<source>http://security.debian.org stretch/updates main</source>
+					<binary>http://security.debian.org buster/updates main</binary>
+					<source>http://security.debian.org buster/updates main</source>
 				</url>
 			</url-list>
 		</mirror>
-		<suite>stretch</suite>
+		<suite>buster</suite>
 	</project>
 	<target>
 		<hostname>lxvm</hostname>
@@ -38,12 +38,12 @@
 			<!-- use GPT for UEFI -->
 			<gpthd>
 				<name>sda.img</name>
-				<size>1GiB</size>
+				<size>2GiB</size>
 				<!-- install grub -->
 				<grub-install/>
 				<!-- the EFI system partition -->
 				<partition> 
-					<size>100MiB</size>
+					<size>200MiB</size>
 					<label>uefi</label>
 					<bootable>true</bootable>
 				</partition>
@@ -73,8 +73,9 @@
 		</fstab>
 		<install-recommends />
 		<pkg-list>
-			<!-- install the EFI version of grub -->
-			<pkg>grub-efi-amd64</pkg>
+			<!-- install the signed EFI version of grub -->
+			<pkg>grub-efi-amd64-signed</pkg>
+			<pkg>shim-signed</pkg>
 			<pkg>linux-image-amd64</pkg>
 		</pkg-list>
 		<project-finetuning>
-- 
2.20.1