berkeley-compat: Drop package

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

diff --git a/config/rootfiles/common/berkeley-compat b/config/rootfiles/common/berkeley-compat
deleted file mode 100644 (file)
index 1b14991..0000000
--- a/config/rootfiles/common/berkeley-compat
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libdb-4.4.so
-usr/lib/libdb-4.so
-usr/lib/libdb_cxx-4.4.so
-usr/lib/libdb_cxx-4.so

diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
index 81144f0a7c7e0f14150a32f0b8cc28fed32b720f..8995bd02ed76bbb518f11b56b66d2db003e3d9a4 100644 (file)
--- a/config/rootfiles/core/155/update.sh
+++ b/config/rootfiles/core/155/update.sh
@@ -35,6 +35,10 @@ done
 rm -vrf \
        /usr/lib/sse2 \
        /usr/local/lib/sse2 \
+       /usr/lib/libdb-4.so \
+       /usr/lib/libdb-4.4.so \
+       /usr/lib/libdb_cxx-4.so \
+       /usr/lib/libdb_cxx-4.4.so \
        /usr/lib/libgmp.so.3 \
        /usr/lib/libgmp.so.3.5.2 \
        /lib/libpcre.so.0 \

diff --git a/lfs/berkeley-compat b/lfs/berkeley-compat
deleted file mode 100644 (file)
index 1e35f0f..0000000
--- a/lfs/berkeley-compat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  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        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 4.4.20
-
-THISAPP    = db-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = d84dff288a19186b136b0daf7067ade3
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       $(UPDATE_AUTOMAKE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/db-4.4.20-fixes-1.patch
-       cd $(DIR_APP)/build_unix && ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx
-       cd $(DIR_APP)/build_unix && make $(MAKETUNING)
-
-       # Install the libraries inly
-       cd $(DIR_APP)/build_unix && install -v -m 755 .libs/{libdb-4.4.so,libdb_cxx-4.4.so} /usr/lib/
-       ln -svf libdb-4.4.so /usr/lib/libdb-4.so
-       ln -svf libdb_cxx-4.4.so /usr/lib/libdb_cxx-4.so
-
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 25929605a39c02966c219cf243983c148c0074b7..43d7f5359c461896a124d6044fa31942173085cb 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1087,7 +1087,6 @@ buildbase() {
        lfsmake2 gcc
        lfsmake2 sed
        lfsmake2 berkeley
-       lfsmake2 berkeley-compat
        lfsmake2 coreutils
        lfsmake2 iana-etc
        lfsmake2 m4