From: Arne Fitzenreiter Date: Sun, 31 Mar 2024 11:36:08 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d4f4ebfa2e374e06eb1600520d36618932cdd3f;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter --- 2d4f4ebfa2e374e06eb1600520d36618932cdd3f diff --cc config/rootfiles/oldcore/185/filelists/aarch64/boost index 000000000,807ad06be..807ad06be mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/aarch64/boost +++ b/config/rootfiles/oldcore/185/filelists/aarch64/boost diff --cc config/rootfiles/oldcore/185/filelists/aarch64/grub index 000000000,40ae85fb6..40ae85fb6 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/aarch64/grub +++ b/config/rootfiles/oldcore/185/filelists/aarch64/grub diff --cc config/rootfiles/oldcore/185/filelists/apache2 index 000000000,eef95efa7..eef95efa7 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/apache2 +++ b/config/rootfiles/oldcore/185/filelists/apache2 diff --cc config/rootfiles/oldcore/185/filelists/collectd index 000000000,871b32f14..871b32f14 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/collectd +++ b/config/rootfiles/oldcore/185/filelists/collectd diff --cc config/rootfiles/oldcore/185/filelists/kmod index 000000000,0020e197e..0020e197e mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/kmod +++ b/config/rootfiles/oldcore/185/filelists/kmod diff --cc config/rootfiles/oldcore/185/filelists/libarchive index 000000000,551f1f743..551f1f743 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/libarchive +++ b/config/rootfiles/oldcore/185/filelists/libarchive diff --cc config/rootfiles/oldcore/185/filelists/libtiff index 000000000,dd89e3cda..dd89e3cda mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/libtiff +++ b/config/rootfiles/oldcore/185/filelists/libtiff diff --cc config/rootfiles/oldcore/185/filelists/libxml2 index 000000000,242e69fa3..242e69fa3 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/libxml2 +++ b/config/rootfiles/oldcore/185/filelists/libxml2 diff --cc config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive index 000000000,328d7c70b..328d7c70b mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive +++ b/config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive diff --cc config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny index 000000000,d1f2184c5..d1f2184c5 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny +++ b/config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny diff --cc config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf index 000000000,d47aca341..d47aca341 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf +++ b/config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf diff --cc config/rootfiles/oldcore/185/filelists/perl-Object-Tiny index 000000000,3beaee613..3beaee613 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/perl-Object-Tiny +++ b/config/rootfiles/oldcore/185/filelists/perl-Object-Tiny diff --cc config/rootfiles/oldcore/185/filelists/riscv64/boost index 000000000,cbc461c2b..cbc461c2b mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/riscv64/boost +++ b/config/rootfiles/oldcore/185/filelists/riscv64/boost diff --cc config/rootfiles/oldcore/185/filelists/riscv64/grub index 000000000,7013c0be5..7013c0be5 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/riscv64/grub +++ b/config/rootfiles/oldcore/185/filelists/riscv64/grub diff --cc config/rootfiles/oldcore/185/filelists/x86_64/boost index 000000000,9ed31e1d5..9ed31e1d5 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/x86_64/boost +++ b/config/rootfiles/oldcore/185/filelists/x86_64/boost diff --cc config/rootfiles/oldcore/185/filelists/x86_64/grub index 000000000,78d3bd784..78d3bd784 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/x86_64/grub +++ b/config/rootfiles/oldcore/185/filelists/x86_64/grub