Merge branch 'switch-to-libloc' into next-switch-to-libloc

diff --cc config/firewall/rules.pl
Simple merge

diff --cc config/rootfiles/common/Locale-Country
index 07d8144c7de8cb38d81393698f838a496c8503e1,8e3fe715bfe8fee85c17a071385c343527fe3e21..24b152dd84761a1cfa91e571761294a4e2af2857
--- 1/config/rootfiles/common/Locale-Country
--- 2/config/rootfiles/common/Locale-Country
+++ b/config/rootfiles/common/Locale-Country
@@@ -1,53 -1,51 +1,51 @@@
- #usr/lib/perl5/5.30.0/Locale/Codes
- usr/lib/perl5/5.30.0/Locale/Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes.pod
- usr/lib/perl5/5.30.0/Locale/Codes/API.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Changes.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Constants.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Constants.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Country.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Country.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Country_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Country_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Currency.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Currency.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Currency_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Currency_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangExt.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangExt.pod
- usr/lib/perl5/5.30.0/Locale/Codes/LangExt_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangExt_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangFam.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangFam.pod
- usr/lib/perl5/5.30.0/Locale/Codes/LangFam_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangFam_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangVar.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangVar.pod
- usr/lib/perl5/5.30.0/Locale/Codes/LangVar_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/LangVar_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Language.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Language.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Language_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Language_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Script.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Script.pod
- usr/lib/perl5/5.30.0/Locale/Codes/Script_Codes.pm
- usr/lib/perl5/5.30.0/Locale/Codes/Script_Retired.pm
- usr/lib/perl5/5.30.0/Locale/Country.pm
- #usr/lib/perl5/5.30.0/Locale/Country.pod
- usr/lib/perl5/5.30.0/Locale/Currency.pm
- #usr/lib/perl5/5.30.0/Locale/Currency.pod
- usr/lib/perl5/5.30.0/Locale/Language.pm
- #usr/lib/perl5/5.30.0/Locale/Language.pod
- usr/lib/perl5/5.30.0/Locale/Script.pm
- #usr/lib/perl5/5.30.0/Locale/Script.pod
- #usr/lib/perl5/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale
- #usr/lib/perl5/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale/Codes
- #usr/lib/perl5/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale/Codes/.packlist
+ #usr/lib/perl5/site_perl/5.30.0/Locale
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes.pod
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Changes.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Constants.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country_Retired.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency_Retired.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt_Retired.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam_Retired.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar_Retired.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language_Retired.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script_Codes.pm
+ usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script_Retired.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Types.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Country.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Country.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Currency.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Currency.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Language.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Language.pod
+ usr/lib/perl5/site_perl/5.30.0/Locale/Script.pm
+ #usr/lib/perl5/site_perl/5.30.0/Locale/Script.pod
 -#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Locale
 -#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Locale/Codes
 -#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Locale/Codes/.packlist
++#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Locale
++#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Locale/Codes
++#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Locale/Codes/.packlist
  #usr/share/man/man3/Locale::Codes.3
- #usr/share/man/man3/Locale::Codes::API.3
  #usr/share/man/man3/Locale::Codes::Changes.3
- #usr/share/man/man3/Locale::Codes::Constants.3
  #usr/share/man/man3/Locale::Codes::Country.3
  #usr/share/man/man3/Locale::Codes::Currency.3
  #usr/share/man/man3/Locale::Codes::LangExt.3

diff --cc config/rootfiles/common/aarch64/initscripts
Simple merge

diff --cc config/rootfiles/common/aarch64/stage2
Simple merge

diff --cc config/rootfiles/common/armv5tel/initscripts
Simple merge

diff --cc config/rootfiles/common/i586/initscripts
Simple merge

diff --cc config/rootfiles/common/stage2
Simple merge

diff --cc config/rootfiles/common/x86_64/initscripts
Simple merge

diff --cc config/rootfiles/common/x86_64/stage2
Simple merge

diff --cc html/cgi-bin/netexternal.cgi
Simple merge

diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge

diff --cc lfs/xtables-addons
Simple merge

diff --cc make.sh
index 4acce807feb3b78beb952d14d42cc297a541a924,b03438c53897e2aa3ee66b7fa07ef7763ac19408..7286e4ad65cb6b0ccc7037f37bb493dbcffd423f
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -1643,10 -1628,8 +1641,10 @@@ buildipfire() 
    lfsmake2 flashrom
    lfsmake2 firmware-update
    lfsmake2 tshark
-   lfsmake2 geoip-generator
    lfsmake2 speedtest-cli
 +  lfsmake2 rfkill
 +  lfsmake2 amazon-ssm-agent
+   lfsmake2 libloc
  }
  
  buildinstaller() {