From 1d01a7bd01e03ec6afe518329296216621404894 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 23 Dec 2020 10:00:36 -0700
Subject: [PATCH] Also remove unused initfs bins from coreboot and live initfs

---
 mk/initfs.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mk/initfs.mk b/mk/initfs.mk
index 426868c..a568b7c 100644
--- a/mk/initfs.mk
+++ b/mk/initfs.mk
@@ -1,3 +1,5 @@
+INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid
+
 build/initfs.tag: initfs.toml prefix
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cargo build --manifest-path installer/Cargo.toml --release
@@ -6,7 +8,7 @@ build/initfs.tag: initfs.toml prefix
 	mkdir -p build/initfs
 	$(INSTALLER) -c $< build/initfs/
 	#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
-	for bin in alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid; do \
+	for bin in $(INITFS_RM_BINS); do \
 		rm -f build/initfs/bin/$$bin; \
 	done
 	touch $@
@@ -18,6 +20,10 @@ build/initfs_coreboot.tag: initfs_coreboot.toml prefix
 	rm -rf build/initfs_coreboot
 	mkdir -p build/initfs_coreboot
 	$(INSTALLER) -c $< build/initfs_coreboot/
+	#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
+	for bin in $(INITFS_RM_BINS); do \
+		rm -f build/initfs_coreboot/bin/$$bin; \
+	done
 	touch $@
 
 build/initfs_live.tag: initfs_live.toml prefix
@@ -27,4 +33,8 @@ build/initfs_live.tag: initfs_live.toml prefix
 	rm -rf build/initfs_live
 	mkdir -p build/initfs_live
 	$(INSTALLER) -c $< build/initfs_live/
+	#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
+	for bin in $(INITFS_RM_BINS); do \
+		rm -f build/initfs_live/bin/$$bin; \
+	done
 	touch $@