sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f9eebe424e71ea9d43cd3184601ad384b4f4949a)

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 (f9eebe424e71ea9d43cd3184601ad384b4f4949a)
Date: Tue, 29 Aug 2023 02:42:07 +0000

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

kernels/linux/HISTORY | 4 ++-
kernels/linux/liblinux | 51
++++++++++++++++++++++++-------------------------
2 files changed, 28 insertions(+), 27 deletions(-)

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

kernels/linux: fast fix in iiblinux regarding X.Y.0 cases

liblinux: some parts of patch file are needed even when no sources
vailable, otherwise it will produce wrong kernel version, process patch
gpg/hash only with source, removed bogus message line

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8e8b432..d225859 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -5,7 +5,9 @@
* info/patches/maintenance_patches_6/patch-6.5.0: added
* info/patches/maintenance_patches_6/patch-6.4.12: removed
* 0001-fix-hard-coded-path-to-awk.patch: updated paths
-
+ * liblinux: some parts of patch file are needed even when no sources
+ available, process patch gpg/hash only with source, removed bogus
message
+ line

2023-08-23 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: latest_maintenance_patches_5=patch-6.4.12
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index 3a328e5..eece4cf 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -284,35 +284,21 @@ create_details()
patchversion=""
appendversion=""
source_patch $patch
+ case "$patch" in
+ LATEST*)
+ echo "PATCH[${counter}]=\$${patch}"
+ ;;
+ *)
+ echo "PATCH[${counter}]=${patch}"
+ ;;
+ esac
+ echo -n '. ${SPELL_DIRECTORY}/info/patches/*/${PATCH['
+ echo -n $counter
+ echo ']}'
if [[ "$source" != "" ]] # safeguard against X.Y.0 patches when no
patch sources exist
then
- case "$patch" in
- LATEST*)
- echo "PATCH[${counter}]=\$${patch}"
- ;;
- *)
- echo "PATCH[${counter}]=${patch}"
- ;;
- esac
- echo -n '. ${SPELL_DIRECTORY}/info/patches/*/${PATCH['
- echo -n $counter
- echo ']}'
echo "SOURCE${counter}=\$source"
echo "SOURCE${counter}_URL=\$source_url"
- echo 'TXTMESSAGE="${TXTMESSAGE}${txtmessage} "'
- echo 'SHORT="${SHORT}${short} "'
- if [[ "" != "$patchversion" ]]
- then
- basekver="$appliedkernels"
- echo 'KERNEL_VERSION=${patchversion}'
- patchversion=""
- patch_det_version="true"
- fi
- if [[ "$appendversion" != "" ]]
- then
- version_append_list="${version_append_list}${patch}:${counter} "
- patch_det_version="true"
- fi
if [[ "$source_gpg" != "" ]]
then
echo "SOURCE${counter}_GPG=\$source_gpg"
@@ -333,6 +319,20 @@ create_details()
echo "SOURCE${counter}_IGNORE=UNVERIFIED"
fi
fi
+ echo 'TXTMESSAGE="${TXTMESSAGE}${txtmessage} "'
+ echo 'SHORT="${SHORT}${short} "'
+ if [[ "" != "$patchversion" ]]
+ then
+ basekver="$appliedkernels"
+ echo 'KERNEL_VERSION=${patchversion}'
+ patchversion=""
+ patch_det_version="true"
+ fi
+ if [[ "$appendversion" != "" ]]
+ then
+ version_append_list="${version_append_list}${patch}:${counter} "
+ patch_det_version="true"
+ fi
(( counter++ ))
done
# deal with the version appending
@@ -381,7 +381,6 @@ create_details()
echo "SOURCE2_IGNORE=signature"
;;
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 Pavel Vinogradov (f9eebe424e71ea9d43cd3184601ad384b4f4949a), Pavel Vinogradov, 08/28/2023