sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (801137d50e45b6b2bc800dc8085870c7f655741a)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (801137d50e45b6b2bc800dc8085870c7f655741a)
Date: Mon, 3 Oct 2022 17:26:44 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

kernels/linux/CONFIGURE | 2 +-
kernels/linux/HISTORY | 4 ++++
kernels/linux/INSTALL | 2 +-
kernels/linux/PREPARE | 4 ++--
kernels/linux/liblinux | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 801137d50e45b6b2bc800dc8085870c7f655741a
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

kernels/linux: adapt to Linux 6.0

diff --git a/kernels/linux/CONFIGURE b/kernels/linux/CONFIGURE
index 7e510fa..08dd8b1 100755
--- a/kernels/linux/CONFIGURE
+++ b/kernels/linux/CONFIGURE
@@ -1,4 +1,4 @@
- config_query_list MAKEMODE "What make configuration tool
would you like to use?" \
+config_query_list MAKEMODE "What make configuration tool would you like to
use?" \
"menuconfig" \
"oldconfig" \
"silentoldconfig" \
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index c4a5b03..cb4edbe 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2022-10-03 Florian Franzmann <bwlf AT bandrate.org>
+ * CONFIGURE, INSTALL, PREPARE, liblinux: adapt various places that
+ detect the kernel version for Linux 6.0
+
2022-10-03 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: latest_maintenance_patches_6=patch-6.0.0
* info/patches/maintenance_patches_6/patch-6.0.0: added
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index 5a7f057..9f3cf52 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -4,7 +4,7 @@ mkdir -p ${INSTALL_ROOT}/boot &&
if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
if grep 'CONFIG_MODULES=y' ./.config ; then
case "$VERSION" in
- 5*|4*|3*)
+ 6*|5*|4*|3*)
message "${MESSAGE_COLOR}installing for a
$VERSION kernel${DEFAULT_COLOR}" &&
local strip_modules
if list_find "$OPTIMIZATIONS" strip; then
diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index e8634a1..dbecc0d 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -280,7 +280,7 @@ function new_tree_menu()
do
menu="${menu}${version} Linux_Kernel Select_one "
done
- menu="$( awk -F= '$1 ~ /LATEST_3|LATEST_4|LATEST_5/ {print $1 "
Linux_Kernel " $2 }' $LATEST_KDEFAULTS ) ${menu}"
+ menu="$( awk -F= '$1 ~ /LATEST_3|LATEST_4|LATEST_5|LATEST_6/ {print
$1 " Linux_Kernel " $2 }' $LATEST_KDEFAULTS ) ${menu}"
command=$( "${dialog[@]}" --title "Select Kernel Version" \
--item-help --cancel-label "Exit" --default-item "$BASE_KVER" --menu \
"Select a kernel version to use" 0 0 0 \
@@ -289,7 +289,7 @@ function new_tree_menu()
if [ "$retval" == "0" ]
then
case "$command" in
- 4*|3*)
+ 6*|5*|4*|3*)
BASE_KVER=$command
;;
LATEST*)
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index 3fac2b7..fd70ab3 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -377,7 +377,8 @@ function create_details()
echo "SOURCE2_URL=\$source2_url"
echo "SOURCE2_IGNORE=signature"
;;
- 5*)
+ 5*|6*)
+ message "${MESSAGE_COLOR}version 5 or 6 kernel${DEFAULT_COLOR}"
. $KERNELS_DIRECTORY/${BASE_KVER}
echo ".
\${SPELL_DIRECTORY}/info/kernels/${BASE_KVER}"
echo "SOURCE=\$source"

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (801137d50e45b6b2bc800dc8085870c7f655741a), Florian Franzmann, 10/03/2022