Merge branch 'aarch64' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jul 2018 10:52:05 +0000 (11:52 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jul 2018 10:52:05 +0000 (11:52 +0100)
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

48 files changed:
1  2 
config/rootfiles/common/aarch64/initscripts
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
config/rootfiles/common/x86_64/initscripts
config/rootfiles/core/123/update.sh
config/rootfiles/oldcore/121/filelists/files
config/rootfiles/oldcore/121/update.sh
config/rootfiles/oldcore/122/exclude
config/rootfiles/oldcore/122/filelists/acpid
config/rootfiles/oldcore/122/filelists/apache2
config/rootfiles/oldcore/122/filelists/apr
config/rootfiles/oldcore/122/filelists/aprutil
config/rootfiles/oldcore/122/filelists/armv5tel/files
config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-kirkwood
config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-multi
config/rootfiles/oldcore/122/filelists/armv5tel/linux-kirkwood
config/rootfiles/oldcore/122/filelists/armv5tel/linux-multi
config/rootfiles/oldcore/122/filelists/armv5tel/rpi-firmware
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-kirkwood
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-mkimage
config/rootfiles/oldcore/122/filelists/beep
config/rootfiles/oldcore/122/filelists/cmake
config/rootfiles/oldcore/122/filelists/crda
config/rootfiles/oldcore/122/filelists/dhcp
config/rootfiles/oldcore/122/filelists/files
config/rootfiles/oldcore/122/filelists/flex
config/rootfiles/oldcore/122/filelists/i586/grub
config/rootfiles/oldcore/122/filelists/i586/intel-microcode
config/rootfiles/oldcore/122/filelists/i586/linux
config/rootfiles/oldcore/122/filelists/i586/linux-initrd
config/rootfiles/oldcore/122/filelists/iw
config/rootfiles/oldcore/122/filelists/jwhois
config/rootfiles/oldcore/122/filelists/libidn
config/rootfiles/oldcore/122/filelists/multipath-tools
config/rootfiles/oldcore/122/filelists/pcre
config/rootfiles/oldcore/122/filelists/tar
config/rootfiles/oldcore/122/filelists/unbound
config/rootfiles/oldcore/122/filelists/wget
config/rootfiles/oldcore/122/filelists/x86_64/grub
config/rootfiles/oldcore/122/filelists/x86_64/intel-microcode
config/rootfiles/oldcore/122/filelists/x86_64/linux
config/rootfiles/oldcore/122/filelists/x86_64/linux-initrd
config/rootfiles/oldcore/122/filelists/xtables-addons
config/rootfiles/oldcore/122/meta
config/rootfiles/oldcore/122/update.sh
lfs/initscripts
make.sh

index 1e9b1d1,0000000..ee8a5ec
mode 100644,000000..100644
--- /dev/null
@@@ -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 <info@ipfire.org>.                        #
 +#                                                                          #
 +############################################################################
 +#
 +. /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
++
index 0000000,0000000..d6fd053
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -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
index 0000000,0000000..73f1b7b
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/acpid
index 0000000,0000000..eef95ef
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apache2
index 0000000,0000000..87dd197
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apr
index 0000000,0000000..999f9f8
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/aprutil
index 0000000,0000000..39c5591
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-initrd-kirkwood
index 0000000,0000000..0b1b453
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-initrd-multi
index 0000000,0000000..7217107
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-kirkwood
index 0000000,0000000..204eb4c
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-multi
index 0000000,0000000..428fdf8
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/rpi-firmware
index 0000000,0000000..3df31a8
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot
index 0000000,0000000..eebbdb1
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot-kirkwood
index 0000000,0000000..65fe960
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot-mkimage
index 0000000,0000000..6db094e
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/beep
index 0000000,0000000..491d25f
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/cmake
index 0000000,0000000..d68c46e
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/crda
index 0000000,0000000..32d8da4
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/dhcp
index 0000000,0000000..feb0390
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/flex
index 0000000,0000000..feb236a
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/grub
index 0000000,0000000..f03e847
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/intel-microcode
index 0000000,0000000..693ec4b
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/linux
index 0000000,0000000..32a03e6
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/linux-initrd
index 0000000,0000000..7c58a20
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/iw
index 0000000,0000000..b984a7f
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/jwhois
index 0000000,0000000..7e35489
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/libidn
index 0000000,0000000..9ff6323
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/multipath-tools
index 0000000,0000000..b390d9a
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/pcre
index 0000000,0000000..3e585d2
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/tar
index 0000000,0000000..66adf09
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/unbound
index 0000000,0000000..fcb57df
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/wget
index 0000000,0000000..78d3bd7
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/grub
index 0000000,0000000..d5ac074
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/intel-microcode
index 0000000,0000000..0615b5b
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/linux
index 0000000,0000000..1b9fff7
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/linux-initrd
index 0000000,d547fa8..d547fa8
mode 000000,100644..100644
--- /dev/null
diff --cc lfs/initscripts
Simple merge
diff --cc make.sh
Simple merge