sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (9aad7d10f73f643af5fbd52d9701ee5fe92fe121)
Date: Thu, 29 Jun 2023 23:13:46 +0000

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

kernels/linux/HISTORY | 3 +
kernels/linux/liblinux | 87
+++++++++++++++++++++++++------------------------
2 files changed, 48 insertions(+), 42 deletions(-)

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

kernels/linux: avoid adding empty patch info

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 6e46858..11209b9 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2023-06-29 Pavel Vinogradov <public AT sourcemage.org>
+ * liblinux: avoid adding empty patch info
+
2023-06-26 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: latest_maintenance_patches_6=patch-6.4.0
* info/kernels/6.4: added
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index fd70ab3..43ec486 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -284,51 +284,54 @@ function 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 ']}'
- 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" != "" ]]
+ if [[ "$source" != "" ]] # safeguard against
X.Y.0 patches when no patch sources exist
then
- echo
"SOURCE${counter}_GPG=\$source_gpg"
- if [[ "$gpg_source_url" != "" ]]
+ 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
-
source_gpg_list_url="${source_gpg_list_url}${patch}:${counter} "
+ 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"
+ if [[ "$gpg_source_url" != ""
]]
+ then
+
source_gpg_list_url="${source_gpg_list_url}${patch}:${counter} "
+ fi
+ elif [[ "$sha512sum" != "" ]]
+ then
+ echo
"SOURCE${counter}_HASH=\"sha512:\$sha512sum\""
+ elif [[ "$sha1sum" != "" ]]
+ then
+ echo
"SOURCE${counter}_HASH=\"sha1:\$sha1sum\""
+ elif [[ "$md5sum" != "" ]]
+ then
+ echo
"SOURCE${counter}_HASH=\"md5:\$md5sum\""
+ else
+ echo
"SOURCE${counter}_IGNORE=UNVERIFIED"
fi
- elif [[ "$sha512sum" != "" ]]
- then
- echo
"SOURCE${counter}_HASH=\"sha512:\$sha512sum\""
- elif [[ "$sha1sum" != "" ]]
- then
- echo
"SOURCE${counter}_HASH=\"sha1:\$sha1sum\""
- elif [[ "$md5sum" != "" ]]
- then
- echo
"SOURCE${counter}_HASH=\"md5:\$md5sum\""
- else
- echo
"SOURCE${counter}_IGNORE=UNVERIFIED"
fi
(( counter++ ))
done

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (9aad7d10f73f643af5fbd52d9701ee5fe92fe121), Pavel Vinogradov, 06/29/2023