rootfiles: replace x86_64 with MACHINE

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/Locale-Country b/config/rootfiles/common/Locale-Country
index 6105dc2f1fd7d92b7719137edfd832e40839f5ee..80f319af3b570179fc8666ceba1e0b6f6525bfc5 100644 (file)
--- a/config/rootfiles/common/Locale-Country
+++ b/config/rootfiles/common/Locale-Country
@@ -41,9 +41,9 @@ 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/x86_64-linux-thread-multi/auto/Locale
-#usr/lib/perl5/5.30.0/x86_64-linux-thread-multi/auto/Locale/Codes
-#usr/lib/perl5/5.30.0/x86_64-linux-thread-multi/auto/Locale/Codes/.packlist
+#usr/lib/perl5/5.30.0/MACHINE-linux-thread-multi/auto/Locale
+#usr/lib/perl5/5.30.0/MACHINE-linux-thread-multi/auto/Locale/Codes
+#usr/lib/perl5/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

diff --git a/config/rootfiles/common/perl-Switch b/config/rootfiles/common/perl-Switch
index 7838dfed3cc4eb2cf36e88c6836c6936583bbff7..e7cc5b2a562c4388989827d7691de2342b85582c 100644 (file)
--- a/config/rootfiles/common/perl-Switch
+++ b/config/rootfiles/common/perl-Switch
@@ -1,4 +1,4 @@
 usr/lib/perl5/site_perl/5.30.0/Switch.pm
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Switch
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Switch/.packlist
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Switch
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Switch/.packlist
 #usr/share/man/man3/Switch.3

diff --git a/config/rootfiles/packages/perl-NetAddr-IP b/config/rootfiles/packages/perl-NetAddr-IP
index 95b69a2c2a340b08bb9bbb6319183f51ffd3a8e1..083d4b73f6cc62673fb292c3d6a901934942c4d5 100644 (file)
--- a/config/rootfiles/packages/perl-NetAddr-IP
+++ b/config/rootfiles/packages/perl-NetAddr-IP
@@ -1,73 +1,73 @@
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP.pm
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP/InetBase.pm
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP/Lite.pm
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP/Util.pm
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP/UtilPP.pm
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/NetAddr/IP/Util_IS.pm
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/.packlist
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/_inet_ntop.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/_inet_pton.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/_packzeros.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/autosplit.ix
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_any2n.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_n2ad.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_n2dx.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_ntoa.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/ipv6_aton.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/InetBase/ipv6_ntoa.al
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/Util
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/Util/Util.so
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/Util/autosplit.ix
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_128x10.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_128x2.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_bcd2bin.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_bcdcheck.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_bin2bcdn.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_deadlen.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/_sa128.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/add128.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/addconst.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/autosplit.ix
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/bcd2bin.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/bcdn2bin.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/bcdn2txt.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/bin2bcd.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/bin2bcdn.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/comp128.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/hasbits.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/ipanyto6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/ipv4to6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/ipv6to4.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/mask4to6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/maskanyto6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/notcontiguous.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/shiftleft.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/simple_pack.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/slowadd128.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/UtilPP/sub128.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/_compV6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/_compact_v6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/_splitplan.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/_splitref.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/autosplit.ix
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/canon.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/coalesce.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/compactref.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/do_prefix.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/hostenum.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/mod_version.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/nprefix.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/prefix.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/re.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/re6.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/short.al
-usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/NetAddr/IP/wildcard.al
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP.pm
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP/InetBase.pm
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP/Lite.pm
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP/Util.pm
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP/UtilPP.pm
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/NetAddr/IP/Util_IS.pm
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/.packlist
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/_inet_ntop.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/_inet_pton.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/_packzeros.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/autosplit.ix
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_any2n.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_n2ad.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_n2dx.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/inet_ntoa.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/ipv6_aton.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/InetBase/ipv6_ntoa.al
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/Util
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/Util/Util.so
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/Util/autosplit.ix
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_128x10.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_128x2.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_bcd2bin.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_bcdcheck.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_bin2bcdn.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_deadlen.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/_sa128.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/add128.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/addconst.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/autosplit.ix
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/bcd2bin.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/bcdn2bin.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/bcdn2txt.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/bin2bcd.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/bin2bcdn.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/comp128.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/hasbits.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/ipanyto6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/ipv4to6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/ipv6to4.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/mask4to6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/maskanyto6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/notcontiguous.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/shiftleft.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/simple_pack.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/slowadd128.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/UtilPP/sub128.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/_compV6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/_compact_v6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/_splitplan.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/_splitref.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/autosplit.ix
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/canon.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/coalesce.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/compactref.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/do_prefix.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/hostenum.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/mod_version.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/nprefix.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/prefix.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/re.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/re6.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/short.al
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/NetAddr/IP/wildcard.al
 #usr/share/man/man3/NetAddr::IP.3
 #usr/share/man/man3/NetAddr::IP::InetBase.3
 #usr/share/man/man3/NetAddr::IP::Lite.3

diff --git a/config/rootfiles/packages/spamassassin b/config/rootfiles/packages/spamassassin
index eb6dd668748e7f87392101f1fa1a4b745fb92f1e..ccccde9a94ff9d111157820768fdea1c1b5c9be6 100644 (file)
--- a/config/rootfiles/packages/spamassassin
+++ b/config/rootfiles/packages/spamassassin
@@ -135,8 +135,8 @@ usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin
 #usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/TieOneStringHash.pm
 #usr/lib/perl5/site_perl/5.30.0/Mail/SpamAssassin/Util/TinyRedis.pm
 #usr/lib/perl5/site_perl/5.30.0/spamassassin-run.pod
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Mail/SpamAssassin
-#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Mail/SpamAssassin
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
 #usr/share/man/man1/sa-awl.1
 #usr/share/man/man1/sa-compile.1
 #usr/share/man/man1/sa-learn.1