From: Arne Fitzenreiter Date: Sun, 31 Mar 2024 11:36:08 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Tag: v2.29-core186~126 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d4f4ebfa2e374e06eb1600520d36618932cdd3f;p=ipfire-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 0000000000,807ad06be3..807ad06be3 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 0000000000,40ae85fb60..40ae85fb60 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 0000000000,eef95efa72..eef95efa72 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 0000000000,871b32f14b..871b32f14b 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 0000000000,0020e197e2..0020e197e2 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 0000000000,551f1f7434..551f1f7434 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 0000000000,dd89e3cdac..dd89e3cdac 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 0000000000,242e69fa35..242e69fa35 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 0000000000,328d7c70b0..328d7c70b0 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 0000000000,d1f2184c59..d1f2184c59 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 0000000000,d47aca3414..d47aca3414 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 0000000000,3beaee613b..3beaee613b 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 0000000000,cbc461c2ba..cbc461c2ba 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 0000000000,7013c0be5b..7013c0be5b 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 0000000000,9ed31e1d50..9ed31e1d50 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 0000000000,78d3bd7840..78d3bd7840 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/185/filelists/x86_64/grub +++ b/config/rootfiles/oldcore/185/filelists/x86_64/grub