ebtables: Drop package

This is now being provided by iptables as a wrapper to nftables.

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

diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
deleted file mode 100644 (file)
index fac1cec..0000000
--- a/config/rootfiles/packages/ebtables
+++ /dev/null
@@ -1,11 +0,0 @@
-etc/ethertypes
-usr/lib/libebtc.la
-usr/lib/libebtc.so
-usr/lib/libebtc.so.0
-usr/lib/libebtc.so.0.0.0
-usr/sbin/ebtables-legacy
-usr/sbin/ebtables-legacy-restore
-usr/sbin/ebtables-legacy-save
-usr/sbin/ebtablesd
-usr/sbin/ebtablesu
-#usr/share/man/man8/ebtables-legacy.8

diff --git a/lfs/ebtables b/lfs/ebtables
deleted file mode 100644 (file)
index 35f1580..0000000
--- a/lfs/ebtables
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  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
-
-SUMMARY    = Ethernet Bridge Tables
-
-VER        = 2.0.11
-
-THISAPP    = ebtables-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = ebtables
-PAK_VER    = 4
-
-DEPS       =
-
-SERVICES   =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-       @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure \
-                               --prefix=/usr \
-                               --sysconfdir=/etc
-       cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/libvirt b/lfs/libvirt
index 659b42c586eb54c631eceeed3415a87dd258b9d1..86b2166acbb45143fb6a6e363648077bdb406342 100644 (file)
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,9 +35,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 43
+PAK_VER    = 44
 
-DEPS       = ebtables libpciaccess ovmf swtpm qemu
+DEPS       = libpciaccess ovmf swtpm qemu
 
 SERVICES   = libvirtd virtlogd
 

diff --git a/make.sh b/make.sh
index d6565845ced7692be86c7fab394cf906ba410417..6f189615521d22441f80f39d158a11e10de0e90e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1923,7 +1923,6 @@ build_system() {
        lfsmake2 nagios_nrpe
        lfsmake2 nagios-plugins
        lfsmake2 observium-agent
-       lfsmake2 ebtables
        lfsmake2 faad2
        lfsmake2 alac
        lfsmake2 ffmpeg