From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 15 Oct 2024 17:56:03 +0000 (+0100)
Subject: make: separate installation and de-duplication targets
X-Git-Tag: 20241017~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=515022675f815d454ac95e60fd0587887f5ad1a6;p=thirdparty%2Flinux-firmware.git

make: separate installation and de-duplication targets

For better or worse some distributions cannot have the firmware
de-duplication happen automatically.

In addition, when it was introduced it changed the default behaviour
leaving people with no firmware in their systems.

Revert to the original behaviour: in the worst case, people will have a
few MB extra of duplicate firmware, yet their systems will continue to
work.

To make things stand out, we print a message at the end of install so
that everyone can opt-in as needed.

In addition, I've went ahead and opened tentative MR/PR with Alpine,
Arch, CentOS Stream, Debian, Gentoo, informing them of this change.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/Makefile b/Makefile
index 216dd488..033e3fb6 100644
--- a/Makefile
+++ b/Makefile
@@ -26,22 +26,23 @@ deb:
 rpm:
 	./build_packages.py --rpm
 
-install: install-nodedup
+dedup:
 	./dedup-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
 
-install-nodedup:
+install:
 	install -d $(DESTDIR)$(FIRMWAREDIR)
 	./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
+	@echo "Now run \"make dedup\" to de-duplicate any firmware files"
 
 install-xz:
 	install -d $(DESTDIR)$(FIRMWAREDIR)
 	./copy-firmware.sh --xz $(DESTDIR)$(FIRMWAREDIR)
-	./dedup-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
+	@echo "Now run \"make dedup\" to de-duplicate any firmware files"
 
 install-zst:
 	install -d $(DESTDIR)$(FIRMWAREDIR)
 	./copy-firmware.sh --zstd $(DESTDIR)$(FIRMWAREDIR)
-	./dedup-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
+	@echo "Now run \"make dedup\" to de-duplicate any firmware files"
 
 clean:
 	rm -rf release dist