From a1a2f1580c25fe1669eafbcbbdda951d1d7fd5a6 Mon Sep 17 00:00:00 2001
From: Anton Bambura <jenneron@protonmail.com>
Date: Sun, 29 Oct 2023 18:20:23 +0200
Subject: [PATCH] lenovo-yoga-5g: switch to systemd-boot (MR 4522)

---
 device/testing/device-lenovo-yoga-5g/APKBUILD | 40 +++----------------
 .../testing/device-lenovo-yoga-5g/deviceinfo  |  2 +-
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/device/testing/device-lenovo-yoga-5g/APKBUILD b/device/testing/device-lenovo-yoga-5g/APKBUILD
index 71c09e383..7f3031313 100644
--- a/device/testing/device-lenovo-yoga-5g/APKBUILD
+++ b/device/testing/device-lenovo-yoga-5g/APKBUILD
@@ -2,56 +2,28 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-lenovo-yoga-5g
 pkgdesc="Lenovo Yoga 5G"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
-options="!check !archcheck pmb:strict"
+options="!check !archcheck"
 depends="
 	linux-postmarketos-qcom-sc8180x
 	postmarketos-base
 	soc-qcom-sc8180x
+	systemd-boot
 "
-makedepends="devicepkg-dev grub grub-efi"
+makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
-
-	grub-mkimage \
-		--prefix="/grub" \
-		--output="bootaa64.efi" \
-		--format="arm64-efi" \
-		--compression="xz" \
-		\
-		all_video \
-		cat \
-		configfile \
-		disk \
-		echo \
-		efi_gop \
-		fat \
-		gzio \
-		help \
-		iso9660 \
-		linux \
-		ls \
-		normal \
-		part_gpt \
-		part_msdos \
-		search \
-		search_label \
-		test \
-		true
 }
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/bootaa64.efi \
-		-t "$pkgdir"/boot/EFI/Boot
 }
 
 nonfree_firmware() {
@@ -62,6 +34,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-5c3c5e29d0d41c78d99f6474621eedea8df7e2f6c3ea7d51287f9b696839597d02eb6383e6dd37411141d8e1050664baa6830f82abec0c539475c60e5bb71291  deviceinfo
+1e5b4af16ebd8bfd383df43ee8b31567f2cb32be7f26e283ee8f7a176f938aafe13aee8a0c2390662fde43ffdef584126cd8b6836368a86c6c3aafcc01ff5ce8  deviceinfo
 a78aab94f673cb68a194d914fa0209366af4bfd6c610a1b923efb3fbc62efb34605d24b23f51b49ee1564975a32ef29c51f986ff63490dd604dd4869bbeadbbd  modules-initfs
 "
diff --git a/device/testing/device-lenovo-yoga-5g/deviceinfo b/device/testing/device-lenovo-yoga-5g/deviceinfo
index 51e285e77..48332dbda 100644
--- a/device/testing/device-lenovo-yoga-5g/deviceinfo
+++ b/device/testing/device-lenovo-yoga-5g/deviceinfo
@@ -20,6 +20,6 @@ deviceinfo_screen_height="1080"
 # Bootloader related
 deviceinfo_flash_method="none"
 deviceinfo_kernel_cmdline="efi=novamap clk_ignore_unused pd_ignore_unused console=null"
-deviceinfo_generate_grub_config="true"
+deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_partition_type="gpt"