TencentOS
/
TencentOS-kernel
mirror of https://github.com/Tencent/TencentOS-kernel
0
0
Fork 4
Code Issues Projects Releases Wiki Activity

dist: fix for KDIST override 

Upstream: no

Kernel's uname is still using old KDIST even when KDIST= is specified,
fix that.

Signed-off-by: Kairui Song <kasong@tencent.com>
This commit is contained in:
Kairui Song 2023-01-15 19:07:45 +08:00
parent 3e84af4f31
commit f909800b04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/scripts/lib-version.sh vendored
View File

@ -635,7 +635,7 @@ prepare_kernel_ver() {
KERNEL_NAME="kernel${KDIST:+-$KDIST}"
KERNEL_MAJVER="$KVERSION.$KPATCHLEVEL.$KSUBLEVEL"
KERNEL_RELVER="$krelease"
KERNEL_UNAMER="$KERNEL_MAJVER-$KERNEL_RELVER${KERNEL_DIST:+.$KERNEL_DIST}"
KERNEL_UNAMER="$KERNEL_MAJVER-$KERNEL_RELVER${KDIST:+.$KDIST}"
if [[ $KFORCEUNAMER ]] && [[ $KGIT_TAG_RELEASE_INFO_RAW ]]; then
KERNEL_UNAMER="$KERNEL_MAJVER$KGIT_TAG_RELEASE_INFO_RAW"

2
dist/scripts/lib.sh vendored
View File

@ -96,7 +96,7 @@ get_dist_makefile_var() {
local _repo=${3:-$TOPDIR}
local _val
_val=$(cat_repo_file "dist/Makefile" | sed -nE -e "$_sedexp")
_val=$(cat_repo_file "dist/Makefile" "$_gitref" "$_repo" | sed -nE -e "$_sedexp")
case $_val in
*\$* )
die "Can't parse Makefile variable '$1', it references to other variables."