Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / lfs / linux-firmware

diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index f08dffb628529b3a1de0dbd17593b98b27f6f2c1..7c53f2816421e21c5c0ab8352227feabf6aafa44 100644 (file)
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  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,7 +24,7 @@
 
 include Config
 
-VER        = 20211216
+VER        = 20231030
 
 THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = eadc09197f2e22b527cbd0b5f4a59ebd
+$(DL_FILE)_BLAKE2 = cf9430012c1e9007da633aba7440918b0aeb6a2845ebe39adad2a5e02e4b83df1014733a9797f81084b5179cb239b11b5fc020f582993a7badd0a22cdb289d7f
 
 install : $(TARGET)
 
@@ -48,10 +48,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -60,8 +60,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -70,14 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
        mkdir -p /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