Drop /usr/lib/sse2

This is now unused

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 8556c9c284cf817976d319818c953f683619daa8..1db148203ba003ffb6b17d2fc33e7fed4b5c4b3a 100644 (file)
--- 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 2c4f715dd52b5d0cb0c9831255bf3e2db020a5dd..d7b454884f0623fbb1db215d691499ff3f5acbff 100644 (file)
--- 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 ee41d2fb0186ef3d1dd34a663b56ff964d1ed536..d0f013b1a970fc2c78ad8e8cb95360355840196b 100644 (file)
--- 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 722152c174a52576993b8dfa77491d0261f46fca..688cfb1ace9c764e139d70466d0da02a8360a0fd 100644 (file)
--- 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 f7b2e82794c5fdaae8a9577e2628015e475392ad..0f5d378482b189fd1e63b887dcfd3341b2229ad9 100644 (file)
--- 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 2863d6b697590bce5e6755302412af0df646e3b6..bacc9e0314625f7e132812bae82cdd08536b02c1 100644 (file)
--- 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 f4d4f7df2807c4f3a30091e98b16b20b599bd21f..932e7dc6cede98a250b7d81adf118551ec52645b 100644 (file)
--- a/src/scripts/filesystem-cleanup
+++ b/src/scripts/filesystem-cleanup
@@ -22,7 +22,6 @@
 ############################################################################
 
 PATHS=(
-       /usr/lib/sse2
        /usr/lib
        /lib
 )