Merge remote-tracking branch 'origin/master' into next

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

diff --cc config/rootfiles/oldcore/185/filelists/aarch64/boost
index 0000000000000000000000000000000000000000,807ad06be31181e0c37392bd240e99419b4dcbbe..807ad06be31181e0c37392bd240e99419b4dcbbe
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/aarch64/boost
+++ b/config/rootfiles/oldcore/185/filelists/aarch64/boost

diff --cc config/rootfiles/oldcore/185/filelists/aarch64/grub
index 0000000000000000000000000000000000000000,40ae85fb607ad2d40b9ca7a85b225ebfb5f40714..40ae85fb607ad2d40b9ca7a85b225ebfb5f40714
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/aarch64/grub
+++ b/config/rootfiles/oldcore/185/filelists/aarch64/grub

diff --cc config/rootfiles/oldcore/185/filelists/apache2
index 0000000000000000000000000000000000000000,eef95efa7298bf4772946054bc7e73985f8f5cbf..eef95efa7298bf4772946054bc7e73985f8f5cbf
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/apache2
+++ b/config/rootfiles/oldcore/185/filelists/apache2

diff --cc config/rootfiles/oldcore/185/filelists/collectd
index 0000000000000000000000000000000000000000,871b32f14b18b4d7e9131668bfd15dd2eb89d0a4..871b32f14b18b4d7e9131668bfd15dd2eb89d0a4
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/collectd
+++ b/config/rootfiles/oldcore/185/filelists/collectd

diff --cc config/rootfiles/oldcore/185/filelists/files
Simple merge

diff --cc config/rootfiles/oldcore/185/filelists/kmod
index 0000000000000000000000000000000000000000,0020e197e22761870ec18b2971c48e2e859bba81..0020e197e22761870ec18b2971c48e2e859bba81
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/kmod
+++ b/config/rootfiles/oldcore/185/filelists/kmod

diff --cc config/rootfiles/oldcore/185/filelists/libarchive
index 0000000000000000000000000000000000000000,551f1f74343a0bd3e7988e690473f719e5457564..551f1f74343a0bd3e7988e690473f719e5457564
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/libarchive
+++ b/config/rootfiles/oldcore/185/filelists/libarchive

diff --cc config/rootfiles/oldcore/185/filelists/libtiff
index 0000000000000000000000000000000000000000,dd89e3cdac00e33056e0b90925687576ba112d8c..dd89e3cdac00e33056e0b90925687576ba112d8c
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/libtiff
+++ b/config/rootfiles/oldcore/185/filelists/libtiff

diff --cc config/rootfiles/oldcore/185/filelists/libxml2
index 0000000000000000000000000000000000000000,242e69fa35316b0eb50cba05745b7861e30b6672..242e69fa35316b0eb50cba05745b7861e30b6672
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/libxml2
+++ b/config/rootfiles/oldcore/185/filelists/libxml2

diff --cc config/rootfiles/oldcore/185/filelists/perl-Archive-Peek-Libarchive
index 0000000000000000000000000000000000000000,328d7c70b09342f09de3ef0ff870ac90d0d9fe3f..328d7c70b09342f09de3ef0ff870ac90d0d9fe3f
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/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 0000000000000000000000000000000000000000,d1f2184c5934cb043d6724c9d593b8fd8e4eb6cc..d1f2184c5934cb043d6724c9d593b8fd8e4eb6cc
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/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 0000000000000000000000000000000000000000,d47aca3414e78a4c112806de3d6f464b6cd9b177..d47aca3414e78a4c112806de3d6f464b6cd9b177
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/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 0000000000000000000000000000000000000000,3beaee613bea76e6f09f64f66635022f181854ca..3beaee613bea76e6f09f64f66635022f181854ca
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/perl-Object-Tiny
+++ b/config/rootfiles/oldcore/185/filelists/perl-Object-Tiny

diff --cc config/rootfiles/oldcore/185/filelists/riscv64/boost
index 0000000000000000000000000000000000000000,cbc461c2baa02753a7a09fe5bb194d6e5bc516e0..cbc461c2baa02753a7a09fe5bb194d6e5bc516e0
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/riscv64/boost
+++ b/config/rootfiles/oldcore/185/filelists/riscv64/boost

diff --cc config/rootfiles/oldcore/185/filelists/riscv64/grub
index 0000000000000000000000000000000000000000,7013c0be5b2ac9c9c0661f5c63b3ea5b6a8f76e8..7013c0be5b2ac9c9c0661f5c63b3ea5b6a8f76e8
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/riscv64/grub
+++ b/config/rootfiles/oldcore/185/filelists/riscv64/grub

diff --cc config/rootfiles/oldcore/185/filelists/x86_64/boost
index 0000000000000000000000000000000000000000,9ed31e1d508b6aacf08104525a18cb7af1b8c9d3..9ed31e1d508b6aacf08104525a18cb7af1b8c9d3
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/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 0000000000000000000000000000000000000000,78d3bd78400d86b5df863ea06a7de5b65e3a78de..78d3bd78400d86b5df863ea06a7de5b65e3a78de
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/185/filelists/x86_64/grub
+++ b/config/rootfiles/oldcore/185/filelists/x86_64/grub

diff --cc config/rootfiles/oldcore/185/update.sh
Simple merge

diff --cc make.sh
Simple merge