]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
core121: split into core121 and 122
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 15 Jun 2018 06:52:51 +0000 (08:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 15 Jun 2018 06:52:51 +0000 (08:52 +0200)
linux firmware and kernel is too large for one core update

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
44 files changed:
config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi [deleted symlink]
config/rootfiles/core/121/filelists/armv5tel/linux-rpi [deleted symlink]
config/rootfiles/core/121/filelists/files
config/rootfiles/core/121/update.sh
config/rootfiles/core/122/exclude [new file with mode: 0644]
config/rootfiles/core/122/filelists/acpid [moved from config/rootfiles/core/121/filelists/acpid with 100% similarity]
config/rootfiles/core/122/filelists/apache2 [moved from config/rootfiles/core/121/filelists/apache2 with 100% similarity]
config/rootfiles/core/122/filelists/apr [moved from config/rootfiles/core/121/filelists/apr with 100% similarity]
config/rootfiles/core/122/filelists/aprutil [moved from config/rootfiles/core/121/filelists/aprutil with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/files [moved from config/rootfiles/core/121/filelists/armv5tel/files with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood [moved from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi [moved from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/121/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/rpi-firmware [moved from config/rootfiles/core/121/filelists/armv5tel/rpi-firmware with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/u-boot [moved from config/rootfiles/core/121/filelists/armv5tel/u-boot with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood [moved from config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood with 100% similarity]
config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage [moved from config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage with 100% similarity]
config/rootfiles/core/122/filelists/beep [moved from config/rootfiles/core/121/filelists/beep with 100% similarity]
config/rootfiles/core/122/filelists/cmake [moved from config/rootfiles/core/121/filelists/cmake with 100% similarity]
config/rootfiles/core/122/filelists/crda [moved from config/rootfiles/core/121/filelists/crda with 100% similarity]
config/rootfiles/core/122/filelists/dhcp [moved from config/rootfiles/core/121/filelists/dhcp with 100% similarity]
config/rootfiles/core/122/filelists/files [new file with mode: 0644]
config/rootfiles/core/122/filelists/flex [moved from config/rootfiles/core/121/filelists/flex with 100% similarity]
config/rootfiles/core/122/filelists/i586/grub [moved from config/rootfiles/core/121/filelists/i586/grub with 100% similarity]
config/rootfiles/core/122/filelists/i586/intel-microcode [moved from config/rootfiles/core/121/filelists/i586/intel-microcode with 100% similarity]
config/rootfiles/core/122/filelists/i586/linux [moved from config/rootfiles/core/121/filelists/i586/linux with 100% similarity]
config/rootfiles/core/122/filelists/i586/linux-initrd [moved from config/rootfiles/core/121/filelists/i586/linux-initrd with 100% similarity]
config/rootfiles/core/122/filelists/iw [moved from config/rootfiles/core/121/filelists/iw with 100% similarity]
config/rootfiles/core/122/filelists/jwhois [moved from config/rootfiles/core/121/filelists/jwhois with 100% similarity]
config/rootfiles/core/122/filelists/libidn [moved from config/rootfiles/core/121/filelists/libidn with 100% similarity]
config/rootfiles/core/122/filelists/multipath-tools [moved from config/rootfiles/core/121/filelists/multipath-tools with 100% similarity]
config/rootfiles/core/122/filelists/pcre [moved from config/rootfiles/core/121/filelists/pcre with 100% similarity]
config/rootfiles/core/122/filelists/tar [moved from config/rootfiles/core/121/filelists/tar with 100% similarity]
config/rootfiles/core/122/filelists/unbound [moved from config/rootfiles/core/121/filelists/unbound with 100% similarity]
config/rootfiles/core/122/filelists/wget [moved from config/rootfiles/core/121/filelists/wget with 100% similarity]
config/rootfiles/core/122/filelists/x86_64/grub [moved from config/rootfiles/core/121/filelists/x86_64/grub with 100% similarity]
config/rootfiles/core/122/filelists/x86_64/intel-microcode [moved from config/rootfiles/core/121/filelists/x86_64/intel-microcode with 100% similarity]
config/rootfiles/core/122/filelists/x86_64/linux [moved from config/rootfiles/core/121/filelists/x86_64/linux with 100% similarity]
config/rootfiles/core/122/filelists/x86_64/linux-initrd [moved from config/rootfiles/core/121/filelists/x86_64/linux-initrd with 100% similarity]
config/rootfiles/core/122/filelists/xtables-addons [new symlink]
config/rootfiles/core/122/meta [new file with mode: 0644]
config/rootfiles/core/122/update.sh [new file with mode: 0644]
make.sh

diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi
deleted file mode 120000 (symlink)
index 8281067..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-initrd-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-rpi
deleted file mode 120000 (symlink)
index a651a49..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-rpi
\ No newline at end of file
index a0bb9423cfc746c77c2d055c34163e5d84c0a20a..b72f127ce5f4f60fe8e83de72fe01d734d345379 100644 (file)
@@ -1,20 +1,4 @@
 etc/system-release
 etc/issue
-etc/rc.d/init.d/acpid
-etc/rc.d/init.d/collectd
-etc/rc.d/init.d/firstsetup
-etc/rc.d/init.d/leds
-etc/rc.d/init.d/partresize
 etc/rc.d/init.d/rngd
-etc/rc.d/rc0.d/K87acpid
-etc/rc.d/rc3.d/S12acpid
-etc/rc.d/rc6.d/K87acpid
 etc/ssl/certs/ca-bundle.crt
-srv/web/ipfire/cgi-bin/entropy.cgi
-srv/web/ipfire/cgi-bin/firewall.cgi
-srv/web/ipfire/cgi-bin/fwhosts.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/remote.cgi
-usr/lib/firewall/firewall-lib.pl
-var/ipfire/langs
-var/ipfire/qos/bin/makeqosscripts.pl
index f0eb15911be8844cbca91dd70281676b109fb629..4d1b43cdcefa58422045258e44b46a8af19e044f 100644 (file)
@@ -39,42 +39,6 @@ for (( i=1; i<=$core; i++ )); do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
-# This update cannot be applied on ARM
-case "$(uname -a)" in
-       arm*)
-               exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1
-               ;;
-esac
-
-# Do some sanity checks.
-case $(uname -r) in
-       *-ipfire*)
-               # Ok.
-               ;;
-       *)
-               exit_with_error "ERROR cannot update. No IPFire Kernel." 1
-               ;;
-esac
-
-# Check diskspace on root
-ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $ROOTSPACE -lt 100000 ]; then
-       exit_with_error "ERROR cannot update because not enough free space on root." 2
-       exit 2
-fi
-
-# Remove the old kernel
-rm -rf /boot/System.map-*
-rm -rf /boot/config-*
-rm -rf /boot/ipfirerd-*
-rm -rf /boot/initramfs-*
-rm -rf /boot/vmlinuz-*
-rm -rf /boot/uImage-ipfire-*
-rm -rf /boot/zImage-ipfire-*
-rm -rf /boot/uInit-ipfire-*
-rm -rf /boot/dtb-*-ipfire-*
-rm -rf /lib/modules
 
 # Stop services
 
@@ -85,27 +49,12 @@ extract_files
 ldconfig
 
 # Update Language cache
-/usr/local/bin/update-lang-cache
-
-# Remove Nagios files, if any...
-rm -rvf \
-       /etc/rc.d/init.d/nagios \
-       /usr/bin/nagios \
-       /etc/rc.d/rc6.d/K33nagios \
-       /etc/rc.d/rc3.d/off/S67nagios \
-       /etc/rc.d/rc0.d/K33nagios \
-       /etc/httpd/conf/conf.d/nagios.conf \
-       /etc/nagios/nagios.cfg \
-       /usr/bin/p1.pl \
-       /usr/bin/nagiostats \
-       /usr/share/nagios/ \
-       /var/nagios/
 
 # Start services
 /etc/init.d/apache restart
 
 # This update needs a reboot...
-touch /var/run/need_reboot
+#touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
@@ -118,11 +67,5 @@ fi
 
 sync
 
-# Reload microcode
-modprobe microcode
-if [ -w "/sys/devices/system/cpu/microcode/reload" ];
-       echo 1 > /sys/devices/system/cpu/microcode/reload
-fi
-
 # Don't report the exitcode last command
 exit 0
diff --git a/config/rootfiles/core/122/exclude b/config/rootfiles/core/122/exclude
new file mode 100644 (file)
index 0000000..d6fd053
--- /dev/null
@@ -0,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 --git a/config/rootfiles/core/122/filelists/files b/config/rootfiles/core/122/filelists/files
new file mode 100644 (file)
index 0000000..f7c692d
--- /dev/null
@@ -0,0 +1,18 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/acpid
+etc/rc.d/init.d/collectd
+etc/rc.d/init.d/firstsetup
+etc/rc.d/init.d/leds
+etc/rc.d/init.d/partresize
+etc/rc.d/rc0.d/K87acpid
+etc/rc.d/rc3.d/S12acpid
+etc/rc.d/rc6.d/K87acpid
+srv/web/ipfire/cgi-bin/entropy.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/remote.cgi
+usr/lib/firewall/firewall-lib.pl
+var/ipfire/langs
+var/ipfire/qos/bin/makeqosscripts.pl
diff --git a/config/rootfiles/core/122/filelists/xtables-addons b/config/rootfiles/core/122/filelists/xtables-addons
new file mode 120000 (symlink)
index 0000000..2e24c42
--- /dev/null
@@ -0,0 +1 @@
+../../../common/xtables-addons
\ No newline at end of file
diff --git a/config/rootfiles/core/122/meta b/config/rootfiles/core/122/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh
new file mode 100644 (file)
index 0000000..4c2e56e
--- /dev/null
@@ -0,0 +1,128 @@
+#!/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) 2018 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=122
+
+exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+}
+
+# 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
+
+# This update cannot be applied on ARM
+case "$(uname -a)" in
+       arm*)
+               exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1
+               ;;
+esac
+
+# Do some sanity checks.
+case $(uname -r) in
+       *-ipfire*)
+               # Ok.
+               ;;
+       *)
+               exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+               ;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+       exit_with_error "ERROR cannot update because not enough free space on root." 2
+       exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/zImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Remove Nagios files, if any...
+rm -rvf \
+       /etc/rc.d/init.d/nagios \
+       /usr/bin/nagios \
+       /etc/rc.d/rc6.d/K33nagios \
+       /etc/rc.d/rc3.d/off/S67nagios \
+       /etc/rc.d/rc0.d/K33nagios \
+       /etc/httpd/conf/conf.d/nagios.conf \
+       /etc/nagios/nagios.cfg \
+       /usr/bin/p1.pl \
+       /usr/bin/nagiostats \
+       /usr/share/nagios/ \
+       /var/nagios/
+
+# Start services
+/etc/init.d/apache 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
+
+# Reload microcode
+modprobe microcode
+if [ -w "/sys/devices/system/cpu/microcode/reload" ];
+       echo 1 > /sys/devices/system/cpu/microcode/reload
+fi
+
+# Don't report the exitcode last command
+exit 0
diff --git a/make.sh b/make.sh
index e8591f363bc179ddd711a894d78a53bc8543017a..d9752756a707d68699fe091b17a2f6b04104954d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.21"                                                 # Version number
-CORE="121"                                                     # Core Level (Filename)
+CORE="122"                                                     # Core Level (Filename)
 PAKFIRE_CORE="120"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan