Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5de4fe5c678a935950721fa022a3dd5b793be026)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5de4fe5c678a935950721fa022a3dd5b793be026)
  • Date: Wed, 9 Aug 2023 00:51:44 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

kernels/linux/HISTORY | 6 ++
kernels/linux/PREPARE | 28
+++++------
kernels/linux/PRE_BUILD | 2
kernels/linux/info/patches/maintenance_patches_6/patch-6.4.8 | 5 -
kernels/linux/info/patches/maintenance_patches_6/patch-6.4.9 | 5 +
kernels/linux/latest.defaults | 2
kernels/linux/liblinux | 16 +++---
7 files changed, 35 insertions(+), 29 deletions(-)

New commits:
commit 5de4fe5c678a935950721fa022a3dd5b793be026
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

kernels/linux: version 6.4.9

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 01c8223..3be0989 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2023-08-08 Pavel Vinogradov <public AT sourcemage.org>
+ * latest.defaults: latest_maintenance_patches_5=patch-6.4.9
+ * info/patches/maintenance_patches_6/patch-6.4.9: added
+ * info/patches/maintenance_patches_6/patch-6.4.8: removed
+ * liblinux, PRE_BUILD, PREPARE: removed 'function' keyword
+
2023-08-03 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: latest_maintenance_patches_5=patch-6.4.8
* info/patches/maintenance_patches_6/patch-6.4.8: added
diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index dbecc0d..2ad22a0 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -3,7 +3,7 @@
. ${SPELL_DIRECTORY}/liblinux

# Create the default KERNEL_ARCH variable
-function arch_default()
+arch_default()
{
if [ -z "$KERNEL_ARCH" ]
then
@@ -32,7 +32,7 @@ function arch_default()

# create the defaults file from scratch
# do this with every command
-function create_defaults()
+create_defaults()
{
arch_default
# add variables that I need
@@ -132,7 +132,7 @@ dialog=( "dialog" "--stdout" )
# spell
# output is the kernel version that is the updated version of the spell...
# might need to be modified...
-function get_usr_src_kver()
+get_usr_src_kver()
{
local spell_config=$1
local newkver
@@ -168,7 +168,7 @@ function get_usr_src_kver()
# installed into the source directory
# also the check is done to determine the version of each linux source to
see if
# the kernel source needs updating
-function list_usr_src()
+list_usr_src()
{
local tmpkver
local linuxsrcs
@@ -193,7 +193,7 @@ function list_usr_src()
}


# main menu uhhh, what else is there to say?
-function main_menu()
+main_menu()
{
local first_iter=0
while [[ $KMODE == "Options" || $first_iter == 0 ]]
@@ -222,7 +222,7 @@ function main_menu()
done
}

-function options_menu()
+options_menu()
{
while true
do
@@ -250,7 +250,7 @@ function options_menu()
done
}

-function custom_kernel()
+custom_kernel()
{
command=$("${dialog[@]}" --inputbox "Enter the kernel version for the
source
you want to build?\nExamples:\n2.6.13.4-selinux1\n${LATEST_4}" 0 0 "")
@@ -272,7 +272,7 @@ you want to
build?\nExamples:\n2.6.13.4-selinux1\n${LATEST_4}" 0 0 "")
# create a new linux source tree
# I use awk to parse the latest.defaults file
# that should be changed but how?
-function new_tree_menu()
+new_tree_menu()
{
menu=""
versions="`ls -1vr $KERNELS_DIRECTORY/`"
@@ -303,7 +303,7 @@ function new_tree_menu()
}

# find all patches list the directories and LATEST patches for the kernel
version $1
-function patch_list()
+patch_list()
{
local tmp
local found
@@ -336,7 +336,7 @@ function patch_list()
}

# list all patches for kernel version $1 and for patch $2
-function list_specific_patch_dir()
+list_specific_patch_dir()
{
local tmp="LATEST_$2"

@@ -377,7 +377,7 @@ function list_specific_patch_dir()
# main patch menu called from main_menu
# list directories and valid latest patches
# that apply to the kernel version $1
-function patch_menu()
+patch_menu()
{
local new_patch_list=""
while true
@@ -414,7 +414,7 @@ function patch_menu()
done
}

-function dialog_specific_patchdir()
+dialog_specific_patchdir()
{
local patchdir=$2
local retval patch
@@ -450,7 +450,7 @@ function dialog_specific_patchdir()
}

# list the old source menu to reconfigure an old source tree
-function old_src_menu()
+old_src_menu()
{
while true
do
@@ -487,7 +487,7 @@ need updating" \
done
}

-function load_old_src_tree()
+load_old_src_tree()
{
local tmp
cp ${old_src_tree}/.spell-config.p ${SPELL_CONFIG}.p
diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 8515611..48e59dc 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -1,6 +1,6 @@
unset LC_ALL

-function linux_new_uncompress()
+linux_new_uncompress()
{
if [[ $(file $1 | grep gzip) != "" ]]
then
diff --git a/kernels/linux/info/patches/maintenance_patches_6/patch-6.4.8
b/kernels/linux/info/patches/maintenance_patches_6/patch-6.4.8
deleted file mode 100644
index 01ba64e..0000000
--- a/kernels/linux/info/patches/maintenance_patches_6/patch-6.4.8
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="6.4"
-patchversion="${appliedkernels}.8"
-source="patch-${patchversion}.xz"
-source_url="${KERNEL_URL}/pub/linux/kernel/v6.x/${source}"
-sha512sum="f2a87a5c8d812b3147af2ebbf52575505e06c13bd7d204f28d7e763e09597ab065c63b9ee063915ee876d71f1a2727dd5b9922ac219741021ef98e0c7b4f6d77"
diff --git a/kernels/linux/info/patches/maintenance_patches_6/patch-6.4.9
b/kernels/linux/info/patches/maintenance_patches_6/patch-6.4.9
new file mode 100644
index 0000000..535a961
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_6/patch-6.4.9
@@ -0,0 +1,5 @@
+appliedkernels="6.4"
+patchversion="${appliedkernels}.9"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v6.x/${source}"
+sha512sum="d02b31c9108ff03d42d38c42ebba7e146e7050849b249c3749b6c9e6f119644263731b61059e074c24ee5224bc876ca3e5353c6a39d19044d0c647f4f6f9a088"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 01ffb88..e328dc8 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,2 +1,2 @@
LATEST_6=6.4
-LATEST_maintenance_patches_6=patch-6.4.8
+LATEST_maintenance_patches_6=patch-6.4.9
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index de061ec..3a328e5 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -14,7 +14,7 @@ local LATEST_KDEFAULTS="${SPELL_DIRECTORY}/latest.defaults"
# Source patch info for the patch
# this is used for getting specific information about the source name source
url
# verification checking what the dependancies are, things like that.
-function source_patch()
+source_patch()
{
local tmploc
case $1 in
@@ -30,7 +30,7 @@ function source_patch()
# Source info for patch
# this is used for general info about the patch, what the patch is, contains,
# made by, things like that.
-function source_info()
+source_info()
{
local tmploc
case $1 in
@@ -47,7 +47,7 @@ function source_info()
# dialog command works even if you add --nocancel as part of the arguments
dialog=( "dialog" "--stdout" )

-function linux_sort_list()
+linux_sort_list()
{
local upvar=$1
local list="$2"
@@ -65,7 +65,7 @@ function linux_sort_list()
eval "$upvar=\"${new_list}\""
}

-function fix_conflicts_dialog()
+fix_conflicts_dialog()
{
local list="$@"
local new_list
@@ -99,7 +99,7 @@ function fix_conflicts_dialog()
return $retval
}

-function run_conflicts()
+run_conflicts()
{
local patch
local conflicting_patch
@@ -147,7 +147,7 @@ function run_conflicts()

# if any of the patches needs any other patches applied before it is
# for example the mm patches apply against the pre patched kernel
-function calculate_depends()
+calculate_depends()
{
# create Makefile
dependslist=""
@@ -199,7 +199,7 @@ function calculate_depends()
fi
}

-function rec_dep_make()
+rec_dep_make()
{
depends=""
case "$1" in
@@ -240,7 +240,7 @@ function rec_dep_make()

# created details.defaults file to be sourced by DETAILS file for VERSION
SOURCE_URL SOURCE
# stuff like that
-function create_details()
+create_details()
{
local counter="3"
local patches



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5de4fe5c678a935950721fa022a3dd5b793be026), Pavel Vinogradov, 08/08/2023

Archive powered by MHonArc 2.6.24.

Top of Page