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 a04eedfe7da2719452d6f683c05ca644cda71195 (commit) via 15ca18a3d9efbe8879e8b22f1f72eaeb596ca2f9 (commit) via 82c279a518613a2a9ba200e14629c0171d0c4233 (commit) via 1a129822af7e4e574ee5ca8e6c973b560d563324 (commit) from 7516e8b7f1edff1ff59c1e8ac3f342c66bada85d (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 a04eedfe7da2719452d6f683c05ca644cda71195 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 18 18:49:46 2019 +0200
core134: add kernel to updater
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 15ca18a3d9efbe8879e8b22f1f72eaeb596ca2f9 Merge: 82c279a51 7516e8b7f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 18 18:42:02 2019 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 82c279a518613a2a9ba200e14629c0171d0c4233 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 18 18:41:19 2019 +0200
kernel: update to 4.14.127
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1a129822af7e4e574ee5ca8e6c973b560d563324 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 18 14:36:02 2019 +0200
linux-pae: fix grub.conf creation on pv machines
on some systems it seems that grub2 and it config also exist.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/aarch64/linux | 1 + config/rootfiles/common/armv5tel/linux-kirkwood | 1 + config/rootfiles/common/armv5tel/linux-multi | 1 + config/rootfiles/common/i586/linux | 1 + config/rootfiles/common/x86_64/linux | 1 + .../124 => core/134}/filelists/aarch64/linux | 0 .../134}/filelists/aarch64/linux-initrd | 0 .../134}/filelists/armv5tel/linux-initrd-kirkwood | 0 .../134}/filelists/armv5tel/linux-initrd-multi | 0 .../134}/filelists/armv5tel/linux-kirkwood | 0 .../134}/filelists/armv5tel/linux-multi | 0 .../{oldcore/100 => core/134}/filelists/i586/linux | 0 .../100 => core/134}/filelists/i586/linux-initrd | 0 .../100 => core/134}/filelists/x86_64/linux | 0 .../100 => core/134}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/134/update.sh | 88 ++++++++++++++++++++++ config/rootfiles/packages/linux-pae | 1 + lfs/linux | 10 +-- src/paks/linux-pae/install.sh | 4 +- 19 files changed, 102 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/124 => core/134}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/124 => core/134}/filelists/aarch64/linux-initrd (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/armv5tel/linux-initrd-kirkwood (100%) copy config/rootfiles/{oldcore/121 => core/134}/filelists/armv5tel/linux-initrd-multi (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/134}/filelists/x86_64/linux-initrd (100%)
Difference in files: diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 3c5f6d08d..0451cadcd 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -16173,6 +16173,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/free #lib/modules/KVER-ipfire/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 98cec076a..78d0050de 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -15469,6 +15469,7 @@ boot/vmlinuz-KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/free #lib/modules/KVER-ipfire-kirkwood/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 986de4972..ec260e8c9 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -17207,6 +17207,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/free #lib/modules/KVER-ipfire-multi/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 22056e63e..d19bef11d 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -17469,6 +17469,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/free #lib/modules/KVER-ipfire/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 49937b655..41a78c213 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -17484,6 +17484,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire/build/scripts/coccinelle/free #lib/modules/KVER-ipfire/build/scripts/coccinelle/free/clk_put.cocci diff --git a/config/rootfiles/core/134/filelists/aarch64/linux b/config/rootfiles/core/134/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/134/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/aarch64/linux-initrd b/config/rootfiles/core/134/filelists/aarch64/linux-initrd new file mode 120000 index 000000000..8acdb0f31 --- /dev/null +++ b/config/rootfiles/core/134/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-kirkwood new file mode 120000 index 000000000..39c5591b7 --- /dev/null +++ b/config/rootfiles/core/134/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/134/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/134/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 000000000..0b1b4530a --- /dev/null +++ b/config/rootfiles/core/134/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/134/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/134/filelists/armv5tel/linux-kirkwood new file mode 120000 index 000000000..72171071e --- /dev/null +++ b/config/rootfiles/core/134/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/armv5tel/linux-multi b/config/rootfiles/core/134/filelists/armv5tel/linux-multi new file mode 120000 index 000000000..204eb4c43 --- /dev/null +++ b/config/rootfiles/core/134/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/i586/linux b/config/rootfiles/core/134/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/i586/linux-initrd b/config/rootfiles/core/134/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/134/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/linux b/config/rootfiles/core/134/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/134/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/x86_64/linux-initrd b/config/rootfiles/core/134/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/134/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/134/update.sh b/config/rootfiles/core/134/update.sh index 30fe9c529..655dfe68e 100644 --- a/config/rootfiles/core/134/update.sh +++ b/config/rootfiles/core/134/update.sh @@ -26,11 +26,59 @@
core=134
+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
# Extract files @@ -45,6 +93,46 @@ ldconfig # Start services /etc/init.d/unbound restart
+# Search sensors again after reboot into the new 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 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 sendprofile diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 02212f52b..143184570 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -17539,6 +17539,7 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/resource_size.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/setup_timer.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/simple_open.cocci +#lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/stream_open.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/api/vma_pages.cocci #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/free #lib/modules/KVER-ipfire-pae/build/scripts/coccinelle/free/clk_put.cocci diff --git a/lfs/linux b/lfs/linux index c7a475553..c45e459bb 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@
include Config
-VER = 4.14.121 -ARM_PATCHES = 4.14.121-ipfire0 +VER = 4.14.127 +ARM_PATCHES = 4.14.127-ipfire0
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =
-PAK_VER = 83 +PAK_VER = 84 DEPS = ""
HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 619cfc35e376eaa1f05d835624bbb432 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = ac64bdb78fbecba032b92df61c928d3f +$(DL_FILE)_MD5 = 93056cac81d24cf48f548f65963fded0 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5c5f6da89606e63701cdcd84a500aca1
install : $(TARGET)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index fd71621d5..fa84c801c 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -67,7 +67,9 @@ if [ -e /boot/grub/grub.cfg ]; then # Update grub2 config # grub-mkconfig > /boot/grub/grub.cfg -else +fi + +if [ -e /boot/grub/grub.conf ]; then # # xen pv with pygrub need grub.conf / menu.lst #
hooks/post-receive -- IPFire 2.x development tree