* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5109f8ee7fad608b9e85e61a1ab1a2608f09b106
@ 2023-12-08 15:12 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2023-12-08 15:12 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6530 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 5109f8ee7fad608b9e85e61a1ab1a2608f09b106 (commit)
via 9d77a9a5cb558c0b6aeda0752de9c9d2fdd2b582 (commit)
via 935e7e115e515aae442983ffafa596f916fc9720 (commit)
via 365306f5e504f0de56e786dd505c5cb92da9ead3 (commit)
via e3544476b9c42dc8b50a9dee342549a3b01bb3f4 (commit)
from 185217edbcea3327a877bd5d90aa901b79b9c363 (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 5109f8ee7fad608b9e85e61a1ab1a2608f09b106
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Dec 8 16:12:17 2023 +0100
kernel: update to 6.6.5
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9d77a9a5cb558c0b6aeda0752de9c9d2fdd2b582
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 7 10:19:37 2023 +0100
installer: update filecount
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 935e7e115e515aae442983ffafa596f916fc9720
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 7 10:07:07 2023 +0100
core183: update disk-space/size check
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 365306f5e504f0de56e786dd505c5cb92da9ead3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 7 08:11:08 2023 +0100
core183: ship kbd
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e3544476b9c42dc8b50a9dee342549a3b01bb3f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 7 08:08:05 2023 +0100
kbd: imclude eurlatgr font
this font is now default for european languages.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.aarch64-ipfire | 2 +-
config/kernel/kernel.config.x86_64-ipfire | 2 +-
config/rootfiles/common/kbd | 2 +-
config/rootfiles/{oldcore/112 => core/183}/filelists/kbd | 0
config/rootfiles/core/183/update.sh | 10 ++++++----
lfs/linux | 4 ++--
src/installer/main.c | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
copy config/rootfiles/{oldcore/112 => core/183}/filelists/kbd (100%)
Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 9fc4e33b2..3aa84cda0 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.4-ipfire Kernel Configuration
+# Linux/arm64 6.6.5-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 090cf0ef4..4e8831f68 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.4-ipfire Kernel Configuration
+# Linux/x86 6.6.5-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 3c18ff27e..a50a252a9 100644
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -85,7 +85,7 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
#lib/kbd/consolefonts/drdos8x16.psfu.gz
#lib/kbd/consolefonts/drdos8x6.psfu.gz
#lib/kbd/consolefonts/drdos8x8.psfu.gz
-#lib/kbd/consolefonts/eurlatgr.psfu.gz
+lib/kbd/consolefonts/eurlatgr.psfu.gz
#lib/kbd/consolefonts/gr737a-8x8.psfu.gz
#lib/kbd/consolefonts/gr737a-9x14.psfu.gz
#lib/kbd/consolefonts/gr737a-9x16.psfu.gz
diff --git a/config/rootfiles/core/183/filelists/kbd b/config/rootfiles/core/183/filelists/kbd
new file mode 120000
index 000000000..9b85839b1
--- /dev/null
+++ b/config/rootfiles/core/183/filelists/kbd
@@ -0,0 +1 @@
+../../../common/kbd
\ No newline at end of file
diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh
index 842e6f638..8eaab80c2 100644
--- a/config/rootfiles/core/183/update.sh
+++ b/config/rootfiles/core/183/update.sh
@@ -62,12 +62,14 @@ case $(uname -r) in
;;
esac
-# Check diskspace on root
+# Check diskspace on root and size of boot
ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 )
-
-if [ $ROOTSPACE -lt 100000 ]; then
+if [ $ROOTSPACE -lt 200000 ]; then
exit_with_error "ERROR cannot update because not enough free space on root." 2
- exit 2
+fi
+BOOTSIZE=$( df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1 )
+if [ $BOOTSIZE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update. BOOT partition is to small." 3
fi
# Remove the old kernel
diff --git a/lfs/linux b/lfs/linux
index e558d1272..71ed83ad6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER = 6.6.4
+VER = 6.6.5
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -72,7 +72,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 75f20de7474f45966a32f7a1e5f9beadb2b4e111fe9c0ab769ccaa203e798f1a1b0ee05c3cb14de6bb609e2e9df1e238deeadfc21dbf08c6b407c9530bac11ef
+$(DL_FILE)_BLAKE2 = 9d66d720f2f037cfd480835ab38807fe5aabcff09bd210c5cb0dc80bd3e1182434df9f04a286df4e8cbc508ac984ecba12d2098a3296e3aac60afad94c085876
install : $(TARGET)
diff --git a/src/installer/main.c b/src/installer/main.c
index 51e69751a..cddb0d91a 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -23,7 +23,7 @@
#include <libintl.h>
#define _(x) dgettext("installer", x)
-#define INST_FILECOUNT 28000
+#define INST_FILECOUNT 30000
#define LICENSE_FILE "/cdrom/COPYING"
#define SOURCE_TEMPFILE "/tmp/downloads/image.iso"
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-12-08 15:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-08 15:12 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5109f8ee7fad608b9e85e61a1ab1a2608f09b106 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox