* [PATCH 1/3] Config: Support rootfiles with spaces in filenames
@ 2023-01-18 11:36 Michael Tremer
2023-01-18 11:36 ` [PATCH 2/3] linux-firmware: Drop hack to remove " Michael Tremer
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Michael Tremer @ 2023-01-18 11:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2346 bytes --]
Our build scripts can't handle any spaces in filenames. This is being
fixed by this patch with only a slightly changed set of shell commands.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/Config | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lfs/Config b/lfs/Config
index 1d02e969c..2b2e9f569 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -294,9 +294,8 @@ define POSTBUILD
@rm -rf $(GOPATH) /root/.cargo
@$(FIND_FILES) > $(DIR_SRC)/lsalrnew
@diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
- @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
- @rm -f $(DIR_SRC)/lsalrnew
- sed -i -e 's+.\/++' $(TARGET)_diff
+ @mv -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
+ @sed -i -e 's+.\/++' $(TARGET)_diff
# compare roofile ( same name as lfs script) with the list of installed files
# special cases
# - if the corresponding rootfile is not found, touch $(TARGET)_missing_rootfile
@@ -305,7 +304,7 @@ define POSTBUILD
# ROOTFILE : reference of include/exclude files
# $(TARGET)_rootfile : ROOTFILE with KVER replacement
# $(TARGET) : log result with {commented|include|added} files
- if [ -s "$(TARGET)_diff" ]; then \
+ @if [ -s "$(TARGET)_diff" ]; then \
LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
echo $(LFS_SCRIPT); \
ROOTFILE=$$(find -L $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
@@ -315,13 +314,13 @@ define POSTBUILD
echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
fi; \
sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/xxxMACHINExxx/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \
- for line in `cat $(TARGET)_diff`; do \
+ while read -r line; do \
if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
else echo "+$$line" >> $(TARGET); \
fi; \
- done; \
- for line in `grep -v "^#" $(TARGET)_rootfile`; do \
+ done < $(TARGET)_diff; \
+ grep -v "^#" $(TARGET)_rootfile | while read -r line; do \
if ! grep -qG "^$$line$$" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \
fi; \
done; \
--
2.30.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] linux-firmware: Drop hack to remove spaces in filenames
2023-01-18 11:36 [PATCH 1/3] Config: Support rootfiles with spaces in filenames Michael Tremer
@ 2023-01-18 11:36 ` Michael Tremer
2023-01-18 23:25 ` Peter Müller
2023-01-18 11:36 ` [PATCH 3/3] rootfiles: Remove further spaces Michael Tremer
2023-01-18 23:25 ` [PATCH 1/3] Config: Support rootfiles with spaces in filenames Peter Müller
2 siblings, 1 reply; 6+ messages in thread
From: Michael Tremer @ 2023-01-18 11:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3680 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/linux-firmware | 14 +++++++-------
lfs/linux-firmware | 5 -----
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index 4d73cc060..2e147afd1 100644
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -824,7 +824,7 @@ lib/firmware/brcm/brcmfmac43143-sdio.bin
lib/firmware/brcm/brcmfmac43143.bin
lib/firmware/brcm/brcmfmac43236b.bin
lib/firmware/brcm/brcmfmac43241b0-sdio.bin
-lib/firmware/brcm/brcmfmac43241b4-sdio.Intel_Corp.-VALLEYVIEW_C0_PLATFORM.txt
+lib/firmware/brcm/brcmfmac43241b4-sdio.Intel Corp.-VALLEYVIEW C0 PLATFORM.txt
lib/firmware/brcm/brcmfmac43241b4-sdio.bin
lib/firmware/brcm/brcmfmac43241b5-sdio.bin
lib/firmware/brcm/brcmfmac43242a.bin
@@ -832,7 +832,7 @@ lib/firmware/brcm/brcmfmac4329-sdio.bin
lib/firmware/brcm/brcmfmac4330-sdio.Prowise-PT301.txt
lib/firmware/brcm/brcmfmac4330-sdio.bin
lib/firmware/brcm/brcmfmac4334-sdio.bin
-lib/firmware/brcm/brcmfmac43340-sdio.ASUSTeK_COMPUTER_INC.-TF103CE.txt
+lib/firmware/brcm/brcmfmac43340-sdio.ASUSTeK COMPUTER INC.-TF103CE.txt
lib/firmware/brcm/brcmfmac43340-sdio.bin
lib/firmware/brcm/brcmfmac43340-sdio.meegopad-t08.txt
lib/firmware/brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt
@@ -858,14 +858,14 @@ lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt
-lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80_PLUS.txt
+lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt
lib/firmware/brcm/brcmfmac43430a0-sdio.bin
lib/firmware/brcm/brcmfmac43430a0-sdio.ilife-S806.txt
lib/firmware/brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
lib/firmware/brcm/brcmfmac43455-sdio.AW-CM256SM.txt
-lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO_Z83-4.txt
-lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_4_Model_B.txt
-lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_Compute_Module_4.txt
+lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
+lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
+lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
lib/firmware/brcm/brcmfmac43455-sdio.acepc-t8.txt
lib/firmware/brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt
lib/firmware/brcm/brcmfmac43455-sdio.bin
@@ -880,7 +880,7 @@ lib/firmware/brcm/brcmfmac4350-pcie.bin
lib/firmware/brcm/brcmfmac4350c2-pcie.bin
lib/firmware/brcm/brcmfmac4354-sdio.bin
lib/firmware/brcm/brcmfmac4354-sdio.clm_blob
-lib/firmware/brcm/brcmfmac4356-pcie.Xiaomi_Inc-Mipad2.txt
+lib/firmware/brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
lib/firmware/brcm/brcmfmac4356-pcie.bin
lib/firmware/brcm/brcmfmac4356-pcie.clm_blob
lib/firmware/brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
diff --git a/lfs/linux-firmware b/lfs/linux-firmware
index 0a11eef8c..f234dce62 100644
--- a/lfs/linux-firmware
+++ b/lfs/linux-firmware
@@ -73,11 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
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
--
2.30.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] rootfiles: Remove further spaces
2023-01-18 11:36 [PATCH 1/3] Config: Support rootfiles with spaces in filenames Michael Tremer
2023-01-18 11:36 ` [PATCH 2/3] linux-firmware: Drop hack to remove " Michael Tremer
@ 2023-01-18 11:36 ` Michael Tremer
2023-01-18 23:26 ` Peter Müller
2023-01-18 23:25 ` [PATCH 1/3] Config: Support rootfiles with spaces in filenames Peter Müller
2 siblings, 1 reply; 6+ messages in thread
From: Michael Tremer @ 2023-01-18 11:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4758 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/boost | 3 +--
config/rootfiles/common/x86_64/boost | 3 +--
config/rootfiles/packages/python3-setuptools | 8 +++-----
config/rootfiles/packages/tshark | 6 ++----
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost
index 78e114983..944101a8b 100644
--- a/config/rootfiles/common/aarch64/boost
+++ b/config/rootfiles/common/aarch64/boost
@@ -12774,8 +12774,7 @@
#usr/include/boost/serialization/boost_array.hpp
#usr/include/boost/serialization/boost_unordered_map.hpp
#usr/include/boost/serialization/boost_unordered_set.hpp
-#usr/include/boost/serialization/collection_size_type
-#copy.hpp
+#usr/include/boost/serialization/collection_size_type copy.hpp
#usr/include/boost/serialization/collection_size_type.hpp
#usr/include/boost/serialization/collection_traits.hpp
#usr/include/boost/serialization/collections_load_imp.hpp
diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
index fe77e6f8c..50166badc 100644
--- a/config/rootfiles/common/x86_64/boost
+++ b/config/rootfiles/common/x86_64/boost
@@ -12774,8 +12774,7 @@
#usr/include/boost/serialization/boost_array.hpp
#usr/include/boost/serialization/boost_unordered_map.hpp
#usr/include/boost/serialization/boost_unordered_set.hpp
-#usr/include/boost/serialization/collection_size_type
-#copy.hpp
+#usr/include/boost/serialization/collection_size_type copy.hpp
#usr/include/boost/serialization/collection_size_type.hpp
#usr/include/boost/serialization/collection_traits.hpp
#usr/include/boost/serialization/collections_load_imp.hpp
diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
index 3e303605d..686d8da2c 100644
--- a/config/rootfiles/packages/python3-setuptools
+++ b/config/rootfiles/packages/python3-setuptools
@@ -219,8 +219,7 @@ usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_egg_info.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_lib.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_scripts.py
-#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher
-#manifest.xml
+usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher manifest.xml
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/py36compat.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/register.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/rotate.py
@@ -265,12 +264,11 @@ usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/namespa
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/package_index.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/py34compat.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/sandbox.py
-#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script
-#(dev).tmpl
+usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script (dev).tmpl
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script.tmpl
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/unicode_utils.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/version.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/wheel.py
usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/windows_support.py
#usr/lib/python3.10/site-packages/setuptools.pth
-
+-
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index 937ddd3d6..9fa09eed4 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -755,10 +755,8 @@ usr/share/wireshark/enterprises.tsv
#usr/share/wireshark/profiles/Bluetooth/preferences
#usr/share/wireshark/profiles/Classic
#usr/share/wireshark/profiles/Classic/colorfilters
-#usr/share/wireshark/profiles/No
-#Reassembly
-#usr/share/wireshark/profiles/No
-#Reassembly/preferences
+#usr/share/wireshark/profiles/No Reassembly
+#usr/share/wireshark/profiles/No Reassembly/preferences
#usr/share/wireshark/radius
#usr/share/wireshark/radius/README.radius_dictionary
usr/share/wireshark/radius/custom.includes
--
2.30.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Config: Support rootfiles with spaces in filenames
2023-01-18 11:36 [PATCH 1/3] Config: Support rootfiles with spaces in filenames Michael Tremer
2023-01-18 11:36 ` [PATCH 2/3] linux-firmware: Drop hack to remove " Michael Tremer
2023-01-18 11:36 ` [PATCH 3/3] rootfiles: Remove further spaces Michael Tremer
@ 2023-01-18 23:25 ` Peter Müller
2 siblings, 0 replies; 6+ messages in thread
From: Peter Müller @ 2023-01-18 23:25 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2487 bytes --]
Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
> Our build scripts can't handle any spaces in filenames. This is being
> fixed by this patch with only a slightly changed set of shell commands.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> lfs/Config | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/lfs/Config b/lfs/Config
> index 1d02e969c..2b2e9f569 100644
> --- a/lfs/Config
> +++ b/lfs/Config
> @@ -294,9 +294,8 @@ define POSTBUILD
> @rm -rf $(GOPATH) /root/.cargo
> @$(FIND_FILES) > $(DIR_SRC)/lsalrnew
> @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
> - @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
> - @rm -f $(DIR_SRC)/lsalrnew
> - sed -i -e 's+.\/++' $(TARGET)_diff
> + @mv -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
> + @sed -i -e 's+.\/++' $(TARGET)_diff
> # compare roofile ( same name as lfs script) with the list of installed files
> # special cases
> # - if the corresponding rootfile is not found, touch $(TARGET)_missing_rootfile
> @@ -305,7 +304,7 @@ define POSTBUILD
> # ROOTFILE : reference of include/exclude files
> # $(TARGET)_rootfile : ROOTFILE with KVER replacement
> # $(TARGET) : log result with {commented|include|added} files
> - if [ -s "$(TARGET)_diff" ]; then \
> + @if [ -s "$(TARGET)_diff" ]; then \
> LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
> echo $(LFS_SCRIPT); \
> ROOTFILE=$$(find -L $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
> @@ -315,13 +314,13 @@ define POSTBUILD
> echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
> fi; \
> sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/xxxMACHINExxx/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \
> - for line in `cat $(TARGET)_diff`; do \
> + while read -r line; do \
> if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
> elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
> else echo "+$$line" >> $(TARGET); \
> fi; \
> - done; \
> - for line in `grep -v "^#" $(TARGET)_rootfile`; do \
> + done < $(TARGET)_diff; \
> + grep -v "^#" $(TARGET)_rootfile | while read -r line; do \
> if ! grep -qG "^$$line$$" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \
> fi; \
> done; \
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] linux-firmware: Drop hack to remove spaces in filenames
2023-01-18 11:36 ` [PATCH 2/3] linux-firmware: Drop hack to remove " Michael Tremer
@ 2023-01-18 23:25 ` Peter Müller
0 siblings, 0 replies; 6+ messages in thread
From: Peter Müller @ 2023-01-18 23:25 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3868 bytes --]
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> config/rootfiles/common/linux-firmware | 14 +++++++-------
> lfs/linux-firmware | 5 -----
> 2 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
> index 4d73cc060..2e147afd1 100644
> --- a/config/rootfiles/common/linux-firmware
> +++ b/config/rootfiles/common/linux-firmware
> @@ -824,7 +824,7 @@ lib/firmware/brcm/brcmfmac43143-sdio.bin
> lib/firmware/brcm/brcmfmac43143.bin
> lib/firmware/brcm/brcmfmac43236b.bin
> lib/firmware/brcm/brcmfmac43241b0-sdio.bin
> -lib/firmware/brcm/brcmfmac43241b4-sdio.Intel_Corp.-VALLEYVIEW_C0_PLATFORM.txt
> +lib/firmware/brcm/brcmfmac43241b4-sdio.Intel Corp.-VALLEYVIEW C0 PLATFORM.txt
> lib/firmware/brcm/brcmfmac43241b4-sdio.bin
> lib/firmware/brcm/brcmfmac43241b5-sdio.bin
> lib/firmware/brcm/brcmfmac43242a.bin
> @@ -832,7 +832,7 @@ lib/firmware/brcm/brcmfmac4329-sdio.bin
> lib/firmware/brcm/brcmfmac4330-sdio.Prowise-PT301.txt
> lib/firmware/brcm/brcmfmac4330-sdio.bin
> lib/firmware/brcm/brcmfmac4334-sdio.bin
> -lib/firmware/brcm/brcmfmac43340-sdio.ASUSTeK_COMPUTER_INC.-TF103CE.txt
> +lib/firmware/brcm/brcmfmac43340-sdio.ASUSTeK COMPUTER INC.-TF103CE.txt
> lib/firmware/brcm/brcmfmac43340-sdio.bin
> lib/firmware/brcm/brcmfmac43340-sdio.meegopad-t08.txt
> lib/firmware/brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt
> @@ -858,14 +858,14 @@ lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
> lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
> lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
> lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt
> -lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80_PLUS.txt
> +lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt
> lib/firmware/brcm/brcmfmac43430a0-sdio.bin
> lib/firmware/brcm/brcmfmac43430a0-sdio.ilife-S806.txt
> lib/firmware/brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
> lib/firmware/brcm/brcmfmac43455-sdio.AW-CM256SM.txt
> -lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO_Z83-4.txt
> -lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_4_Model_B.txt
> -lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_Compute_Module_4.txt
> +lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
> +lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
> +lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
> lib/firmware/brcm/brcmfmac43455-sdio.acepc-t8.txt
> lib/firmware/brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt
> lib/firmware/brcm/brcmfmac43455-sdio.bin
> @@ -880,7 +880,7 @@ lib/firmware/brcm/brcmfmac4350-pcie.bin
> lib/firmware/brcm/brcmfmac4350c2-pcie.bin
> lib/firmware/brcm/brcmfmac4354-sdio.bin
> lib/firmware/brcm/brcmfmac4354-sdio.clm_blob
> -lib/firmware/brcm/brcmfmac4356-pcie.Xiaomi_Inc-Mipad2.txt
> +lib/firmware/brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
> lib/firmware/brcm/brcmfmac4356-pcie.bin
> lib/firmware/brcm/brcmfmac4356-pcie.clm_blob
> lib/firmware/brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
> diff --git a/lfs/linux-firmware b/lfs/linux-firmware
> index 0a11eef8c..f234dce62 100644
> --- a/lfs/linux-firmware
> +++ b/lfs/linux-firmware
> @@ -73,11 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] rootfiles: Remove further spaces
2023-01-18 11:36 ` [PATCH 3/3] rootfiles: Remove further spaces Michael Tremer
@ 2023-01-18 23:26 ` Peter Müller
0 siblings, 0 replies; 6+ messages in thread
From: Peter Müller @ 2023-01-18 23:26 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4966 bytes --]
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> config/rootfiles/common/aarch64/boost | 3 +--
> config/rootfiles/common/x86_64/boost | 3 +--
> config/rootfiles/packages/python3-setuptools | 8 +++-----
> config/rootfiles/packages/tshark | 6 ++----
> 4 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/config/rootfiles/common/aarch64/boost b/config/rootfiles/common/aarch64/boost
> index 78e114983..944101a8b 100644
> --- a/config/rootfiles/common/aarch64/boost
> +++ b/config/rootfiles/common/aarch64/boost
> @@ -12774,8 +12774,7 @@
> #usr/include/boost/serialization/boost_array.hpp
> #usr/include/boost/serialization/boost_unordered_map.hpp
> #usr/include/boost/serialization/boost_unordered_set.hpp
> -#usr/include/boost/serialization/collection_size_type
> -#copy.hpp
> +#usr/include/boost/serialization/collection_size_type copy.hpp
> #usr/include/boost/serialization/collection_size_type.hpp
> #usr/include/boost/serialization/collection_traits.hpp
> #usr/include/boost/serialization/collections_load_imp.hpp
> diff --git a/config/rootfiles/common/x86_64/boost b/config/rootfiles/common/x86_64/boost
> index fe77e6f8c..50166badc 100644
> --- a/config/rootfiles/common/x86_64/boost
> +++ b/config/rootfiles/common/x86_64/boost
> @@ -12774,8 +12774,7 @@
> #usr/include/boost/serialization/boost_array.hpp
> #usr/include/boost/serialization/boost_unordered_map.hpp
> #usr/include/boost/serialization/boost_unordered_set.hpp
> -#usr/include/boost/serialization/collection_size_type
> -#copy.hpp
> +#usr/include/boost/serialization/collection_size_type copy.hpp
> #usr/include/boost/serialization/collection_size_type.hpp
> #usr/include/boost/serialization/collection_traits.hpp
> #usr/include/boost/serialization/collections_load_imp.hpp
> diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools
> index 3e303605d..686d8da2c 100644
> --- a/config/rootfiles/packages/python3-setuptools
> +++ b/config/rootfiles/packages/python3-setuptools
> @@ -219,8 +219,7 @@ usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_egg_info.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_lib.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_scripts.py
> -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher
> -#manifest.xml
> +usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher manifest.xml
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/py36compat.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/register.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/rotate.py
> @@ -265,12 +264,11 @@ usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/namespa
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/package_index.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/py34compat.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/sandbox.py
> -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script
> -#(dev).tmpl
> +usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script (dev).tmpl
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script.tmpl
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/unicode_utils.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/version.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/wheel.py
> usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/windows_support.py
> #usr/lib/python3.10/site-packages/setuptools.pth
> -
> +-
> diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
> index 937ddd3d6..9fa09eed4 100644
> --- a/config/rootfiles/packages/tshark
> +++ b/config/rootfiles/packages/tshark
> @@ -755,10 +755,8 @@ usr/share/wireshark/enterprises.tsv
> #usr/share/wireshark/profiles/Bluetooth/preferences
> #usr/share/wireshark/profiles/Classic
> #usr/share/wireshark/profiles/Classic/colorfilters
> -#usr/share/wireshark/profiles/No
> -#Reassembly
> -#usr/share/wireshark/profiles/No
> -#Reassembly/preferences
> +#usr/share/wireshark/profiles/No Reassembly
> +#usr/share/wireshark/profiles/No Reassembly/preferences
> #usr/share/wireshark/radius
> #usr/share/wireshark/radius/README.radius_dictionary
> usr/share/wireshark/radius/custom.includes
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-18 23:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-18 11:36 [PATCH 1/3] Config: Support rootfiles with spaces in filenames Michael Tremer
2023-01-18 11:36 ` [PATCH 2/3] linux-firmware: Drop hack to remove " Michael Tremer
2023-01-18 23:25 ` Peter Müller
2023-01-18 11:36 ` [PATCH 3/3] rootfiles: Remove further spaces Michael Tremer
2023-01-18 23:26 ` Peter Müller
2023-01-18 23:25 ` [PATCH 1/3] Config: Support rootfiles with spaces in filenames Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox