From: Stefan Schantl Date: Fri, 3 Jul 2020 16:48:30 +0000 (+0200) Subject: :xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch... X-Git-Tag: v2.25-core148~29 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=af7f9fc43d84cdce163a699992d8cf3ff74817dc :xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to-libloc Signed-off-by: Stefan Schantl --- af7f9fc43d84cdce163a699992d8cf3ff74817dc diff --cc lfs/configroot index e8626c8129,ee320d8cf2..0afacebaf7 --- a/lfs/configroot +++ b/lfs/configroot @@@ -78,8 -78,7 +78,7 @@@ $(TARGET) cp $(DIR_SRC)/config/cfgroot/header.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/general-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/network-functions.pl $(CONFIG_ROOT)/ - cp $(DIR_SRC)/config/cfgroot/geoip-functions.pl $(CONFIG_ROOT)/ + cp $(DIR_SRC)/config/cfgroot/location-functions.pl $(CONFIG_ROOT)/ - cp $(DIR_SRC)/config/cfgroot/aws-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/ids-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/lang.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/countries.pl $(CONFIG_ROOT)/