]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
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 1e9b1d1937c3f52404a09675cfc1c2369dd7c6c6,0000000000000000000000000000000000000000..ee8a5ec0b7f05dbdd4b830d003877d42828eaabf
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 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d6fd053b6eb6108a7776ec908ba20f3ccae5347f
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 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..73f1b7b0d976a3b26b4eb332ede90a6674f20b41
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/acpid
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..eef95efa7298bf4772946054bc7e73985f8f5cbf
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apache2
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..87dd1974f2dcc9bb4a5f068e6811fa97c2679f75
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apr
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..999f9f84bc4c1153d5655ef602ed952b46e98cb7
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/aprutil
index 0000000000000000000000000000000000000000,d2712ba533e5e8bd733fb01bbdaf865e75feaf41..d2712ba533e5e8bd733fb01bbdaf865e75feaf41
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..39c5591b7163e4a98c143f4aeda1df507f5a295a
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-initrd-kirkwood
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0b1b4530a84e72769f3c9372b53bf53779ada334
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-initrd-multi
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..72171071e6eaa99abe646f1fbe6e16096e0ee97d
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-kirkwood
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..204eb4c437e85a878d7bc0be00a770db44219b39
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-multi
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..428fdf88fefba8c62ba66ba63890a9522e248ba2
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/rpi-firmware
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3df31a883d6686b2aa8df5788a54f4aa87bd179a
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..eebbdb14a89ffa62d1274126976270f2bc2cea86
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot-kirkwood
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..65fe960aead734639c476ab9ddc7f868d47c6e01
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot-mkimage
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6db094efa700f771d54f08d7e8a8b813e1ce77e6
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/beep
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..491d25f727ca1055c3f1a038b0743540e47e2ade
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/cmake
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d68c46e55b16a8e4bf93eaf066a47af70aa7f561
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/crda
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..32d8da443dc96a791394dc5a2e978c4908586192
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/dhcp
index 0000000000000000000000000000000000000000,d87145961edc0b59a4050d9a245c4afc922d3947..d87145961edc0b59a4050d9a245c4afc922d3947
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..feb0390ffef9c448f9adeaa53a2e9815c22a76a4
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/flex
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..feb236a22403463643570f8c9d6e8bf1f29980d1
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/grub
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f03e84778a19c63c5755cf29400c17fd503719c6
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/intel-microcode
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..693ec4bbf9b5812b1eb469704861dfd92bac1450
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/linux
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..32a03e6a905bbb3947f92a31d20ee242f15dd2db
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/linux-initrd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7c58a2089aa48875fc503eb559f54212da44ab87
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/iw
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b984a7f3f63abb5afaf3095b6a0768e50033c515
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/jwhois
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7e35489571e2a4c026be2c6534b090531cc90f43
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/libidn
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9ff63237c5d642ec4450301171a2da953095018d
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/multipath-tools
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b390d9a367aec8304b9133902958e277d5481380
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/pcre
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3e585d2ebea80fb18e885bb492401c4a977f716c
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/tar
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..66adf092425150267d45d8378f8e0316a161de9e
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/unbound
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..fcb57dfec80be999cd45ddd214463ed3debf86d0
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/wget
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..78d3bd78400d86b5df863ea06a7de5b65e3a78de
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/grub
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d5ac074e2eee75bd7f0860ede7b07e76d746cc04
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/intel-microcode
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0615b5b9ad53f8af33b76b63e087941e7b64c36c
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/linux
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1b9fff70ff1b7694940bb7ee65d8da704a0fd0d2
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/linux-initrd
index 0000000000000000000000000000000000000000,2e24c4298bf0cc1f403ce5e52014319d3a86fb63..2e24c4298bf0cc1f403ce5e52014319d3a86fb63
mode 000000,120000..120000
--- /dev/null
index 0000000000000000000000000000000000000000,d547fa86fa8487654281f4d5309d6733f66a323c..d547fa86fa8487654281f4d5309d6733f66a323c
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,bb38696c40069ed3410f6555d6577f1bedca6a68..bb38696c40069ed3410f6555d6577f1bedca6a68
mode 000000,100644..100644
--- /dev/null
diff --cc lfs/initscripts
Simple merge
diff --cc make.sh
Simple merge