[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6dc206ab6943aff5820a462d42e827d3e7852990 - IPFire-SCM

16 Feb 2021

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  6dc206ab6943aff5820a462d42e827d3e7852990 (commit)
       via  44558ee19c46d2d4bdefb16d5d65ae04b069b104 (commit)
       via  a810c2ae8f5f2a77303bca7c5f896297c48b4ca0 (commit)
      from  5459c8a4b792d26c5963df2f3e33c44effc825f2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6dc206ab6943aff5820a462d42e827d3e7852990
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Feb 16 18:00:16 2021 +0000
Drop /usr/lib/sse2
This is now unused
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 44558ee19c46d2d4bdefb16d5d65ae04b069b104
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Feb 16 17:55:29 2021 +0000
openssl: Drop SSE2-optimized version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a810c2ae8f5f2a77303bca7c5f896297c48b4ca0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Feb 16 17:43:12 2021 +0000
gmp: Drop SSE2-optimized version on i586
The next version of glibc has removed support for this and this patch
    removes it.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/aarch64/stage2             |  2 --
 config/rootfiles/common/armv5tel/gmp               | 17 --------------
 config/rootfiles/common/{aarch64 => }/gmp          |  0
 config/rootfiles/common/i586/gmp                   | 19 ----------------
 config/rootfiles/common/i586/openssl-sse2          |  1 -
 config/rootfiles/common/stage2                     |  2 --
 config/rootfiles/common/x86_64/gmp                 | 17 --------------
 config/rootfiles/common/x86_64/stage2              |  2 --
 config/rootfiles/core/155/filelists/files          |  1 +
 .../rootfiles/core/155/filelists/i586/openssl-sse2 |  1 -
 config/rootfiles/core/155/update.sh                |  4 +++-
 lfs/gmp                                            | 26 ++--------------------
 lfs/openssl                                        | 19 ++--------------
 lfs/stage2                                         |  2 +-
 make.sh                                            |  1 -
 src/scripts/filesystem-cleanup                     |  1 -
 16 files changed, 9 insertions(+), 106 deletions(-)
 delete mode 100644 config/rootfiles/common/armv5tel/gmp
 rename config/rootfiles/common/{aarch64 => }/gmp (100%)
 delete mode 100644 config/rootfiles/common/i586/gmp
 delete mode 100644 config/rootfiles/common/i586/openssl-sse2
 delete mode 100644 config/rootfiles/common/x86_64/gmp
 delete mode 120000 config/rootfiles/core/155/filelists/i586/openssl-sse2
Difference in files:

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 8556c9c28..1db148203 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/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp
deleted file mode 100644
index c1d6a7d9d..000000000
--- a/config/rootfiles/common/armv5tel/gmp
+++ /dev/null
@@ -1,17 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.4.0
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.6.0
-#usr/lib/pkgconfig/gmp.pc
-#usr/lib/pkgconfig/gmpxx.pc
-#usr/share/info/gmp.info
-#usr/share/info/gmp.info-1
-#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/aarch64/gmp b/config/rootfiles/common/gmp
similarity index 100%
rename from config/rootfiles/common/aarch64/gmp
rename to config/rootfiles/common/gmp
diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp
deleted file mode 100644
index c0ec9a9b6..000000000
--- a/config/rootfiles/common/i586/gmp
+++ /dev/null
@@ -1,19 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.4.0
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.6.0
-#usr/lib/pkgconfig/gmp.pc
-#usr/lib/pkgconfig/gmpxx.pc
-usr/lib/sse2/libgmp.so.10
-usr/lib/sse2/libgmp.so.10.4.0
-#usr/share/info/gmp.info
-#usr/share/info/gmp.info-1
-#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2
deleted file mode 100644
index d366bd47f..000000000
--- a/config/rootfiles/common/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/sse2/libcrypto.so.1.1
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 2c4f715dd..d7b454884 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/gmp b/config/rootfiles/common/x86_64/gmp
deleted file mode 100644
index c1d6a7d9d..000000000
--- a/config/rootfiles/common/x86_64/gmp
+++ /dev/null
@@ -1,17 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.4.0
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.6.0
-#usr/lib/pkgconfig/gmp.pc
-#usr/lib/pkgconfig/gmpxx.pc
-#usr/share/info/gmp.info
-#usr/share/info/gmp.info-1
-#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index ee41d2fb0..d0f013b1a 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 722152c17..688cfb1ac 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/filelists/i586/openssl-sse2 b/config/rootfiles/core/155/filelists/i586/openssl-sse2
deleted file mode 120000
index f424713d6..000000000
--- a/config/rootfiles/core/155/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
index f7b2e8279..0f5d37848 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/gmp b/lfs/gmp
index d09100981..ed92cf30e 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -34,13 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
ifeq "$(BUILD_ARCH)" "i586"
    CONFIGURE_ARGS = ABI=32
-	BUILDTARGET_PENTIUM4 = $(patsubst $(BUILD_ARCH)-%,pentium4-%,$(BUILDTARGET))
 endif
-CONFIGURE_OPTIONS = \
-	--prefix=/usr \
-	--enable-cxx
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -82,26 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && \
    	$(CONFIGURE_ARGS) \
    	./configure \
-			--build=$(BUILDTARGET) \
-			$(CONFIGURE_OPTIONS)
+			--prefix=/usr \
+			--enable-cxx
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
-
-ifeq "$(BUILD_ARCH)" "i586"
-	# Build SSE/SSE2 optimised version for x86
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && \
-		$(CONFIGURE_ARGS) \
-		./configure \
-			--build=$(BUILDTARGET_PENTIUM4) \
-			$(CONFIGURE_OPTIONS) \
-			CFLAGS="$(CFLAGS) -march=pentium4" \
-			CXXFLAGS="$(CXXFLAGS) -march=pentium4"
-	cd $(DIR_APP) && make $(MAKETUNING)
-
-	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.4.0 /usr/lib/sse2
-endif
-
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/openssl b/lfs/openssl
index ea7eff135..a50d686f0 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -35,11 +35,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
CFLAGS += -DPURIFY -Wa,--noexecstack
-# Enable SSE2 for this build
-ifeq "$(KCFG)" "-sse2"
-  CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
-endif
-
 export RPM_OPT_FLAGS = $(CFLAGS)
CONFIGURE_OPTIONS = \
@@ -72,11 +67,7 @@ ifeq "$(BUILD_ARCH)" "x86_64"
 endif
ifeq "$(BUILD_ARCH)" "i586"
-	OPENSSL_ARCH = linux-elf
-
-  ifneq "$(KCFG)" "-sse2"
-	OPENSSL_ARCH += no-sse2
-  endif
+	OPENSSL_ARCH = linux-elf no-sse2
 endif
###############################################################################
@@ -132,15 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && make depend
    cd $(DIR_APP) && make $(MAKETUNING)
-ifeq "$(KCFG)" "-sse2"
-	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -m 755 \
-		libcrypto.so.1.1 /usr/lib/sse2
-else
-	# Install everything.
+	# Install everything
    cd $(DIR_APP) && make install
    install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
-endif
@rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/stage2 b/lfs/stage2
index 2863d6b69..bacc9e031 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/make.sh b/make.sh
index a0c71ce73..eb00087f6 100755
--- a/make.sh
+++ b/make.sh
@@ -1145,7 +1145,6 @@ buildipfire() {
   lfsmake2 initscripts
   lfsmake2 backup
   lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 kmod
   lfsmake2 udev
   lfsmake2 popt
diff --git a/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup
index f4d4f7df2..932e7dc6c 100644
--- a/src/scripts/filesystem-cleanup
+++ b/src/scripts/filesystem-cleanup
@@ -22,7 +22,6 @@
 ############################################################################
PATHS=(
-	/usr/lib/sse2
    /usr/lib
    /lib
 )
hooks/post-receive
--
IPFire 2.x development tree

    