From 6dc206ab6943aff5820a462d42e827d3e7852990 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 16 Feb 2021 18:00:16 +0000 Subject: [PATCH] Drop /usr/lib/sse2 This is now unused Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/stage2 | 2 -- config/rootfiles/common/stage2 | 2 -- config/rootfiles/common/x86_64/stage2 | 2 -- config/rootfiles/core/155/filelists/files | 1 + config/rootfiles/core/155/update.sh | 4 +++- lfs/stage2 | 2 +- src/scripts/filesystem-cleanup | 1 - 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 8556c9c284..1db148203b 100644 --- a/config/rootfiles/common/aarch64/stage2 +++ b/config/rootfiles/common/aarch64/stage2 @@ -84,7 +84,6 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 -#usr/lib/sse2 usr/lib64 #usr/local #usr/local/bin @@ -112,7 +111,6 @@ usr/local/bin/update-lang-cache usr/local/bin/update-location-database #usr/local/include #usr/local/lib -#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 2c4f715dd5..d7b454884f 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -84,7 +84,6 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 -#usr/lib/sse2 #usr/local #usr/local/bin #usr/local/bin/archive.files @@ -111,7 +110,6 @@ usr/local/bin/update-ids-ruleset usr/local/bin/update-location-database #usr/local/include #usr/local/lib -#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index ee41d2fb01..d0f013b1a9 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -84,7 +84,6 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 -#usr/lib/sse2 usr/lib64 #usr/local #usr/local/bin @@ -112,7 +111,6 @@ usr/local/bin/update-lang-cache usr/local/bin/update-location-database #usr/local/include #usr/local/lib -#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index 722152c174..688cfb1ace 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -1,2 +1,3 @@ srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi +usr/local/bin/filesystem-cleanup diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index f7b2e82794..0f5d378482 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -32,7 +32,9 @@ for (( i=1; i<=$core; i++ )); do done # Remove files -rm -vf \ +rm -vrf \ + /usr/lib/sse2 \ + /usr/local/lib/sse2 \ /lib/libpcre.so.0 \ /lib/libpcre.so.0.0.1 diff --git a/lfs/stage2 b/lfs/stage2 index 2863d6b697..bacc9e0314 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -53,7 +53,7 @@ $(TARGET) : -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp - -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src} + -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} -mkdir -v /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo} -mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup index f4d4f7df28..932e7dc6ce 100644 --- a/src/scripts/filesystem-cleanup +++ b/src/scripts/filesystem-cleanup @@ -22,7 +22,6 @@ ############################################################################ PATHS=( - /usr/lib/sse2 /usr/lib /lib ) -- 2.39.5