* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7d7f6104cdba2f52e71a83ed1372c5742304f3f4
@ 2020-02-08 10:52 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2020-02-08 10:52 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7905 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 7d7f6104cdba2f52e71a83ed1372c5742304f3f4 (commit)
from 975f78f7108aa558932a2d9c8c4015ac33be484e (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 7d7f6104cdba2f52e71a83ed1372c5742304f3f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 8 11:51:43 2020 +0100
core142: add kernel to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../124 => core/142}/filelists/aarch64/linux | 0
.../142}/filelists/aarch64/linux-initrd | 0
.../142}/filelists/armv5tel/linux-initrd-multi | 0
.../142}/filelists/armv5tel/linux-multi | 0
.../{oldcore/100 => core/142}/filelists/i586/linux | 0
.../100 => core/142}/filelists/i586/linux-initrd | 0
.../100 => core/142}/filelists/x86_64/linux | 0
.../100 => core/142}/filelists/x86_64/linux-initrd | 0
config/rootfiles/core/142/update.sh | 77 +++++++++++++++++++++-
9 files changed, 74 insertions(+), 3 deletions(-)
copy config/rootfiles/{oldcore/124 => core/142}/filelists/aarch64/linux (100%)
copy config/rootfiles/{oldcore/124 => core/142}/filelists/aarch64/linux-initrd (100%)
copy config/rootfiles/{oldcore/121 => core/142}/filelists/armv5tel/linux-initrd-multi (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/i586/linux (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/i586/linux-initrd (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/x86_64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/142}/filelists/x86_64/linux-initrd (100%)
Difference in files:
diff --git a/config/rootfiles/core/142/filelists/aarch64/linux b/config/rootfiles/core/142/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/aarch64/linux-initrd b/config/rootfiles/core/142/filelists/aarch64/linux-initrd
new file mode 120000
index 000000000..8acdb0f31
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/142/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/142/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/142/filelists/armv5tel/linux-multi b/config/rootfiles/core/142/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/i586/linux b/config/rootfiles/core/142/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/i586/linux-initrd b/config/rootfiles/core/142/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/x86_64/linux b/config/rootfiles/core/142/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/x86_64/linux-initrd b/config/rootfiles/core/142/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/142/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/142/update.sh b/config/rootfiles/core/142/update.sh
index f71a01250..daf0082c6 100644
--- a/config/rootfiles/core/142/update.sh
+++ b/config/rootfiles/core/142/update.sh
@@ -43,13 +43,46 @@ 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-kirkwood)
+ exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1
+ ;;
+ *-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 50000 ]; then
+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
+
# Remove files
# Stop services
@@ -68,8 +101,46 @@ ldconfig
# Start services
-# This update needs a reboot...
-# touch /var/run/need_reboot
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f /etc/sysconfig/lm_sensors
+
+# 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 25000 -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:[~2020-02-08 10:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-08 10:52 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7d7f6104cdba2f52e71a83ed1372c5742304f3f4 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox