X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux-firmware;h=f08dffb628529b3a1de0dbd17593b98b27f6f2c1;hp=6a7f956527ef330258aa94ece94bd75ca58b439d;hb=8a4780de645a5b3ab42054eaf022c57d6849ae9a;hpb=0df2024f29c9e955dd0bfe4df84afce757d40e26

diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index 6a7f956527..f08dffb628 100644
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 20110518
+VER        = 20211216
 
 THISAPP    = linux-firmware-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3b215b5ec9a5e8784dd971c039e9b948
+$(DL_FILE)_MD5 = eadc09197f2e22b527cbd0b5f4a59ebd
 
 install : $(TARGET)
 
@@ -69,8 +69,17 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	mkdir -p /lib/firmware
-	cd $(DIR_APP) && cp -vr * /lib/firmware
+	cd $(DIR_APP) && make install
+
+	# Remove any spaces in filenames
+	while read -r file; do \
+		mv "$${file}" "$${file// /_}" || exit 1; \
+	done < <(find /lib/firmware -name "* *")
+
+	# Hardlink any identical files
+	hardlink -c -vv /lib/firmware
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)