Revert "python-six: Removal of python2 & 3 addon versions of six"

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

diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index 1378f328d1ac3763b349ba2ce510b5d5d7e317a5..08383f6803c5ed1ea69fba3db4f937de9fb58e34 100644 (file)
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        = 78535e8
+VER        = 20210511
 
 THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a4cafb924fbcaeb34d1b464be0e4d089
+$(DL_FILE)_MD5 = 3c024cca702aa71fe24fc374c53581fa
 
 install : $(TARGET)
 
@@ -71,6 +71,12 @@ $(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) && 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 "* *")
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)