* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 83c956c3c8d0bc60c2c6fa23f53bd68f6ac6d3ff
@ 2019-04-07 15:01 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2019-04-07 15:01 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9133 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 83c956c3c8d0bc60c2c6fa23f53bd68f6ac6d3ff (commit)
from f40cd26de2a0353fca1fdee407cfce153b16c76d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 83c956c3c8d0bc60c2c6fa23f53bd68f6ac6d3ff
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 7 17:01:08 2019 +0200
core130: add kernel to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../124 => core/130}/filelists/aarch64/linux | 0
.../130}/filelists/aarch64/linux-initrd | 0
.../130}/filelists/armv5tel/linux-initrd-kirkwood | 0
.../130}/filelists/armv5tel/linux-initrd-multi | 0
.../130}/filelists/armv5tel/linux-kirkwood | 0
.../130}/filelists/armv5tel/linux-multi | 0
.../{oldcore/100 => core/130}/filelists/i586/linux | 0
.../100 => core/130}/filelists/i586/linux-initrd | 0
.../100 => core/130}/filelists/x86_64/linux | 0
.../100 => core/130}/filelists/x86_64/linux-initrd | 0
config/rootfiles/core/130/update.sh | 86 +++++++++++++++++++++-
11 files changed, 84 insertions(+), 2 deletions(-)
copy config/rootfiles/{oldcore/124 => core/130}/filelists/aarch64/linux (100%)
copy config/rootfiles/{oldcore/124 => core/130}/filelists/aarch64/linux-initrd (100%)
copy config/rootfiles/{oldcore/121 => core/130}/filelists/armv5tel/linux-initrd-kirkwood (100%)
copy config/rootfiles/{oldcore/121 => core/130}/filelists/armv5tel/linux-initrd-multi (100%)
copy config/rootfiles/{oldcore/100 => core/130}/filelists/armv5tel/linux-kirkwood (100%)
copy config/rootfiles/{oldcore/100 => core/130}/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/{oldcore/100 => core/130}/filelists/i586/linux (100%)
copy config/rootfiles/{oldcore/100 => core/130}/filelists/i586/linux-initrd (100%)
copy config/rootfiles/{oldcore/100 => core/130}/filelists/x86_64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/130}/filelists/x86_64/linux-initrd (100%)
Difference in files:
diff --git a/config/rootfiles/core/130/filelists/aarch64/linux b/config/rootfiles/core/130/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/aarch64/linux-initrd b/config/rootfiles/core/130/filelists/aarch64/linux-initrd
new file mode 120000
index 000000000..8acdb0f31
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-kirkwood
new file mode 120000
index 000000000..39c5591b7
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/130/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 000000000..72171071e
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-multi b/config/rootfiles/core/130/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/i586/linux b/config/rootfiles/core/130/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/i586/linux-initrd b/config/rootfiles/core/130/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/x86_64/linux b/config/rootfiles/core/130/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/130/filelists/x86_64/linux-initrd b/config/rootfiles/core/130/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh
index f2252ccd8..33bcafa23 100644
--- a/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/core/130/update.sh
@@ -26,11 +26,59 @@
core=130
+exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ # don't start pakfire again at error
+ killall -KILL pak_update
+ /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
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+ cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# 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 80000 ]; 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
+rm -f /etc/sysconfig/lm_sensors
+
# Stop services
/etc/init.d/snort stop
if [ -e "/etc/init.d/suricata" ]; then
@@ -82,8 +130,42 @@ rm -rfv \
/etc/init.d/unbound restart
/etc/init.d/suricata start
-# This update needs a reboot...
-touch /var/run/need_reboot
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+ /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+ i?86)
+ # Force (re)install pae kernel if pae is supported
+ rm -rf /opt/pakfire/db/installed/meta-linux-pae
+ rm -rf /opt/pakfire/db/rootfiles/linux-pae
+ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ touch /var/run/need_reboot
+ else
+ echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ fi
+ else
+ touch /var/run/need_reboot
+ fi
+ ;;
+ *)
+ # This update needs a reboot...
+ touch /var/run/need_reboot
+ ;;
+esac
# Finish
/etc/init.d/fireinfo start
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-04-07 15:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-07 15:01 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 83c956c3c8d0bc60c2c6fa23f53bd68f6ac6d3ff Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox