From: Arne Fitzenreiter Date: Tue, 3 Jul 2018 10:52:05 +0000 (+0100) Subject: Merge branch 'aarch64' into next X-Git-Tag: v2.21-core123~77 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1ac0d5c598f6a7a2151b4cafed0120b8d8f1a2d6 Merge branch 'aarch64' into next Conflicts: config/rootfiles/core/121/filelists/acpid config/rootfiles/core/121/filelists/apache2 config/rootfiles/core/121/filelists/apr config/rootfiles/core/121/filelists/aprutil config/rootfiles/core/121/filelists/armv5tel/files config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-multi config/rootfiles/core/121/filelists/armv5tel/rpi-firmware config/rootfiles/core/121/filelists/armv5tel/u-boot config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/121/filelists/beep config/rootfiles/core/121/filelists/cmake config/rootfiles/core/121/filelists/crda config/rootfiles/core/121/filelists/dhcp config/rootfiles/core/121/filelists/flex config/rootfiles/core/121/filelists/i586/grub config/rootfiles/core/121/filelists/i586/intel-microcode config/rootfiles/core/121/filelists/i586/linux config/rootfiles/core/121/filelists/i586/linux-initrd config/rootfiles/core/121/filelists/iw config/rootfiles/core/121/filelists/jwhois config/rootfiles/core/121/filelists/libidn config/rootfiles/core/121/filelists/multipath-tools config/rootfiles/core/121/filelists/pcre config/rootfiles/core/121/filelists/tar config/rootfiles/core/121/filelists/unbound config/rootfiles/core/121/filelists/wget config/rootfiles/core/121/filelists/x86_64/grub config/rootfiles/core/121/filelists/x86_64/intel-microcode config/rootfiles/core/121/filelists/x86_64/linux config/rootfiles/core/121/filelists/x86_64/linux-initrd config/rootfiles/core/122/filelists/aarch64/files config/rootfiles/core/122/filelists/acpid config/rootfiles/core/122/filelists/apache2 config/rootfiles/core/122/filelists/apr config/rootfiles/core/122/filelists/aprutil config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-multi config/rootfiles/core/122/filelists/armv5tel/rpi-firmware config/rootfiles/core/122/filelists/armv5tel/u-boot config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/122/filelists/beep config/rootfiles/core/122/filelists/cmake config/rootfiles/core/122/filelists/crda config/rootfiles/core/122/filelists/dhcp config/rootfiles/core/122/filelists/flex config/rootfiles/core/122/filelists/i586/grub config/rootfiles/core/122/filelists/i586/intel-microcode config/rootfiles/core/122/filelists/i586/linux config/rootfiles/core/122/filelists/i586/linux-initrd config/rootfiles/core/122/filelists/iw config/rootfiles/core/122/filelists/jwhois config/rootfiles/core/122/filelists/libidn config/rootfiles/core/122/filelists/multipath-tools config/rootfiles/core/122/filelists/pcre config/rootfiles/core/122/filelists/tar config/rootfiles/core/122/filelists/unbound config/rootfiles/core/122/filelists/wget config/rootfiles/core/122/filelists/x86_64/grub config/rootfiles/core/122/filelists/x86_64/intel-microcode config/rootfiles/core/122/filelists/x86_64/linux config/rootfiles/core/122/filelists/x86_64/linux-initrd config/rootfiles/core/123/filelists/unbound config/rootfiles/oldcore/121/filelists/acpid config/rootfiles/oldcore/121/filelists/apache2 config/rootfiles/oldcore/121/filelists/apr config/rootfiles/oldcore/121/filelists/aprutil config/rootfiles/oldcore/121/filelists/armv5tel/files config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware config/rootfiles/oldcore/121/filelists/armv5tel/u-boot config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/oldcore/121/filelists/beep config/rootfiles/oldcore/121/filelists/cmake config/rootfiles/oldcore/121/filelists/crda config/rootfiles/oldcore/121/filelists/dhcp config/rootfiles/oldcore/121/filelists/flex config/rootfiles/oldcore/121/filelists/i586/grub config/rootfiles/oldcore/121/filelists/i586/intel-microcode config/rootfiles/oldcore/121/filelists/i586/linux config/rootfiles/oldcore/121/filelists/i586/linux-initrd config/rootfiles/oldcore/121/filelists/iw config/rootfiles/oldcore/121/filelists/jwhois config/rootfiles/oldcore/121/filelists/libidn config/rootfiles/oldcore/121/filelists/multipath-tools config/rootfiles/oldcore/121/filelists/pcre config/rootfiles/oldcore/121/filelists/tar config/rootfiles/oldcore/121/filelists/wget config/rootfiles/oldcore/121/filelists/x86_64/grub config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode config/rootfiles/oldcore/121/filelists/x86_64/linux config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd make.sh --- 1ac0d5c598f6a7a2151b4cafed0120b8d8f1a2d6 diff --cc config/rootfiles/core/123/update.sh index 1e9b1d1937,0000000000..ee8a5ec0b7 mode 100644,000000..100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@@ -1,63 -1,0 +1,67 @@@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2017 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=123 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + ++# move exec random initskript earlier ++mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random ++ +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound restart + +# This update needs a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 ++ diff --cc config/rootfiles/oldcore/122/exclude index 0000000000,0000000000..d6fd053b6e new file mode 100644 --- /dev/null +++ b/config/rootfiles/oldcore/122/exclude @@@ -1,0 -1,0 +1,30 @@@ ++boot/config.txt ++boot/grub/grub.cfg ++boot/grub/grubenv ++etc/alternatives ++etc/collectd.custom ++etc/default/grub ++etc/ipsec.conf ++etc/ipsec.secrets ++etc/ipsec.user.conf ++etc/ipsec.user.secrets ++etc/localtime ++etc/shadow ++etc/snort/snort.conf ++etc/ssh/ssh_config ++etc/ssh/sshd_config ++etc/ssl/openssl.cnf ++etc/sudoers ++etc/sysconfig/firewall.local ++etc/sysconfig/rc.local ++etc/udev/rules.d/30-persistent-network.rules ++srv/web/ipfire/html/proxy.pac ++var/ipfire/dma ++var/ipfire/time ++var/ipfire/ovpn ++var/lib/alternatives ++var/log/cache ++var/log/dhcpcd.log ++var/log/messages ++var/state/dhcp/dhcpd.leases ++var/updatecache diff --cc config/rootfiles/oldcore/122/filelists/acpid index 0000000000,0000000000..73f1b7b0d9 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/acpid @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/acpid diff --cc config/rootfiles/oldcore/122/filelists/apache2 index 0000000000,0000000000..eef95efa72 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/apache2 @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/apache2 diff --cc config/rootfiles/oldcore/122/filelists/apr index 0000000000,0000000000..87dd1974f2 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/apr @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/apr diff --cc config/rootfiles/oldcore/122/filelists/aprutil index 0000000000,0000000000..999f9f84bc new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/aprutil @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/aprutil diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/files index 0000000000,d2712ba533..d2712ba533 mode 000000,100644..100644 --- a/config/rootfiles/oldcore/122/filelists/armv5tel/files +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/files diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-kirkwood index 0000000000,0000000000..39c5591b71 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-kirkwood @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/linux-initrd-kirkwood diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-multi index 0000000000,0000000000..0b1b4530a8 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-multi @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/linux-initrd-multi diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/linux-kirkwood index 0000000000,0000000000..72171071e6 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/linux-kirkwood @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/linux-kirkwood diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/linux-multi index 0000000000,0000000000..204eb4c437 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/linux-multi @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/linux-multi diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/rpi-firmware index 0000000000,0000000000..428fdf88fe new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/rpi-firmware @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/rpi-firmware diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/u-boot index 0000000000,0000000000..3df31a883d new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/u-boot @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/u-boot diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-kirkwood index 0000000000,0000000000..eebbdb14a8 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-kirkwood @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/u-boot-kirkwood diff --cc config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-mkimage index 0000000000,0000000000..65fe960aea new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-mkimage @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/armv5tel/u-boot-mkimage diff --cc config/rootfiles/oldcore/122/filelists/beep index 0000000000,0000000000..6db094efa7 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/beep @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/beep diff --cc config/rootfiles/oldcore/122/filelists/cmake index 0000000000,0000000000..491d25f727 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/cmake @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/cmake diff --cc config/rootfiles/oldcore/122/filelists/crda index 0000000000,0000000000..d68c46e55b new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/crda @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/crda diff --cc config/rootfiles/oldcore/122/filelists/dhcp index 0000000000,0000000000..32d8da443d new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/dhcp @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/dhcp diff --cc config/rootfiles/oldcore/122/filelists/files index 0000000000,d87145961e..d87145961e mode 000000,100644..100644 --- a/config/rootfiles/oldcore/122/filelists/files +++ b/config/rootfiles/oldcore/122/filelists/files diff --cc config/rootfiles/oldcore/122/filelists/flex index 0000000000,0000000000..feb0390ffe new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/flex @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/flex diff --cc config/rootfiles/oldcore/122/filelists/i586/grub index 0000000000,0000000000..feb236a224 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/i586/grub @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/i586/grub diff --cc config/rootfiles/oldcore/122/filelists/i586/intel-microcode index 0000000000,0000000000..f03e84778a new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/i586/intel-microcode @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/i586/intel-microcode diff --cc config/rootfiles/oldcore/122/filelists/i586/linux index 0000000000,0000000000..693ec4bbf9 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/i586/linux @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/i586/linux diff --cc config/rootfiles/oldcore/122/filelists/i586/linux-initrd index 0000000000,0000000000..32a03e6a90 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/i586/linux-initrd @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/i586/linux-initrd diff --cc config/rootfiles/oldcore/122/filelists/iw index 0000000000,0000000000..7c58a2089a new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/iw @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/iw diff --cc config/rootfiles/oldcore/122/filelists/jwhois index 0000000000,0000000000..b984a7f3f6 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/jwhois @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/jwhois diff --cc config/rootfiles/oldcore/122/filelists/libidn index 0000000000,0000000000..7e35489571 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/libidn @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/libidn diff --cc config/rootfiles/oldcore/122/filelists/multipath-tools index 0000000000,0000000000..9ff63237c5 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/multipath-tools @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/multipath-tools diff --cc config/rootfiles/oldcore/122/filelists/pcre index 0000000000,0000000000..b390d9a367 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/pcre @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/pcre diff --cc config/rootfiles/oldcore/122/filelists/tar index 0000000000,0000000000..3e585d2ebe new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/tar @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/tar diff --cc config/rootfiles/oldcore/122/filelists/unbound index 0000000000,0000000000..66adf09242 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/unbound @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/unbound diff --cc config/rootfiles/oldcore/122/filelists/wget index 0000000000,0000000000..fcb57dfec8 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/wget @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/wget diff --cc config/rootfiles/oldcore/122/filelists/x86_64/grub index 0000000000,0000000000..78d3bd7840 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/x86_64/grub @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/x86_64/grub diff --cc config/rootfiles/oldcore/122/filelists/x86_64/intel-microcode index 0000000000,0000000000..d5ac074e2e new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/x86_64/intel-microcode @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/x86_64/intel-microcode diff --cc config/rootfiles/oldcore/122/filelists/x86_64/linux index 0000000000,0000000000..0615b5b9ad new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/x86_64/linux @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/x86_64/linux diff --cc config/rootfiles/oldcore/122/filelists/x86_64/linux-initrd index 0000000000,0000000000..1b9fff70ff new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/122/filelists/x86_64/linux-initrd @@@ -1,0 -1,0 +1,1 @@@ ++../../../../common/x86_64/linux-initrd diff --cc config/rootfiles/oldcore/122/filelists/xtables-addons index 0000000000,2e24c4298b..2e24c4298b mode 000000,120000..120000 --- a/config/rootfiles/oldcore/122/filelists/xtables-addons +++ b/config/rootfiles/oldcore/122/filelists/xtables-addons diff --cc config/rootfiles/oldcore/122/meta index 0000000000,d547fa86fa..d547fa86fa mode 000000,100644..100644 --- a/config/rootfiles/oldcore/122/meta +++ b/config/rootfiles/oldcore/122/meta diff --cc config/rootfiles/oldcore/122/update.sh index 0000000000,bb38696c40..bb38696c40 mode 000000,100644..100644 --- a/config/rootfiles/oldcore/122/update.sh +++ b/config/rootfiles/oldcore/122/update.sh