Drop update-vendor-firmware

This is no longer needed, since we can just unconditionally unpack
the firmware.cpio in the initramfs hook the same way the kernel would
have. We still need the functions.sh for the ESP mount functionality.

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

Makefile

@@ -1,7 +1,7 @@
 PREFIX=/usr/local
 CONFIG_DIR=/etc/default
 BIN_DIR=$(PREFIX)/bin
-SCRIPTS=update-vendor-firmware update-m1n1
+SCRIPTS=update-m1n1
 ARCH_SCRIPTS=update-grub first-boot
 UNITS=first-boot.service
 MULTI_USER_WANTS=first-boot.service

initcpio/hooks/asahi

@@ -27,9 +27,26 @@ run_earlyhook() {
     fi
 
     # If the above exists, hopefully the /dev device exists and this will work
+
     msg ":: Asahi: Unpacking vendor firmware into initramfs..."
-    mkdir -p /vendorfw
-    TARGET=/vendorfw ash /usr/bin/update-vendor-firmware
+
+    VENDORFW="/run/.system-efi/vendorfw/"
+
+    (
+        . /usr/share/asahi-scripts/functions.sh
+        mount_sys_esp /run/.system-efi
+    )
+
+    if [ ! -e "$VENDORFW/firmware.cpio" ]; then
+        msg ":: Asahi: Vendor firmware not available in ESP!"
+        umount /run/.system-efi
+        return 1
+    fi
+
+    ( cd /; cpio -i < "$VENDORFW/firmware.cpio" )
+    umount /run/.system-efi
+
+    msg ":: Asahi: Vendor firmware unpacked successfully"
 }
 
 run_latehook() {

initcpio/install/asahi

@@ -30,10 +30,8 @@ build() {
     # For MTP HID
     map add_module apple-dockchannel? dockchannel-hid? apple-rtkit-helper?
 
-    # asahi-scripts dependencies
+    # Hook dependencies
     add_full_dir /usr/share/asahi-scripts
-    add_binary /usr/bin/update-vendor-firmware
-    add_binary /usr/bin/comm
 
     # Firmware update script
     add_runscript