Finally get rid of orphaned xt_geoip directories

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index e328a4526a1935b7099f1a187ab5ee93f2cdde72..d528b788cdabbd83287011bf93e51769e032ce3c 100644 (file)
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -126,7 +126,6 @@ usr/local/bin/update-location-database
 #usr/local/share/man/man8
 #usr/local/share/misc
 #usr/local/share/terminfo
-#usr/local/share/xt_geoip
 #usr/local/share/zoneinfo
 #usr/local/src
 #usr/sbin
@@ -148,7 +147,6 @@ usr/share/doc/licenses/GPLv3
 #usr/share/man/man8
 #usr/share/misc
 #usr/share/terminfo
-#usr/share/xt_geoip
 #usr/share/zoneinfo
 #var
 #var/cache

diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
index 2bd00d9683f7b07daf2430f1b25ab04284b9ee9a..047591d2b46495b508ae1d6039ed54585341c454 100644 (file)
--- a/config/rootfiles/common/armv6l/stage2
+++ b/config/rootfiles/common/armv6l/stage2
@@ -124,7 +124,6 @@ usr/local/bin/update-location-database
 #usr/local/share/man/man8
 #usr/local/share/misc
 #usr/local/share/terminfo
-#usr/local/share/xt_geoip
 #usr/local/share/zoneinfo
 #usr/local/src
 #usr/sbin
@@ -146,7 +145,6 @@ usr/share/doc/licenses/GPLv3
 #usr/share/man/man8
 #usr/share/misc
 #usr/share/terminfo
-#usr/share/xt_geoip
 #usr/share/zoneinfo
 #var
 #var/cache

diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index 586b88e3d005b11844700b6d3eb624023fb55ee3..5fa1fb44f10d37fb57f9dd68b20e286e82638bcc 100644 (file)
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -126,7 +126,6 @@ usr/local/bin/update-location-database
 #usr/local/share/man/man8
 #usr/local/share/misc
 #usr/local/share/terminfo
-#usr/local/share/xt_geoip
 #usr/local/share/zoneinfo
 #usr/local/src
 #usr/sbin
@@ -148,7 +147,6 @@ usr/share/doc/licenses/GPLv3
 #usr/share/man/man8
 #usr/share/misc
 #usr/share/terminfo
-#usr/share/xt_geoip
 #usr/share/zoneinfo
 #var
 #var/cache

diff --git a/config/rootfiles/core/170/exclude b/config/rootfiles/core/170/exclude
index b22e5e943cae4d8b2ec8e72da2d8b747f42e9832..378c2d5632fcb78995d2639006b965e3a9ef2088 100644 (file)
--- a/config/rootfiles/core/170/exclude
+++ b/config/rootfiles/core/170/exclude
@@ -18,7 +18,6 @@ etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
 etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
-usr/share/xt_geoip
 var/ipfire/dma
 var/ipfire/time
 var/ipfire/firewall/locationblock

diff --git a/lfs/stage2 b/lfs/stage2
index 39697a848d76afeac31f38822b91d8d90cc241e4..3de871fdb93bcb0a7ff8b0fcfdbb99262a3fa5ad 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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        #
@@ -55,7 +55,7 @@ $(TARGET) :
        -install -dv -m 1777 /tmp /var/tmp
        -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 -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
        -mkdir -pv /usr/{,local/}share/man/man{1..8}
        #-for dir in /usr /usr/local; do \
        #  ln -sv share/{man,doc,info} $$dir; \