From b6a0bf7729d8502054c1ddc140040f8d809c444f Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Mon, 3 Jun 2024 04:03:51 +0100 Subject: [PATCH] Fix autobuild text on the blue boot screen --- data/Tupfile.lua | 8 ++++++-- kernel/trunk/bootbios.inc | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 230a1a6ca9..1b0ac3c9e2 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -884,13 +884,17 @@ for i,v in ipairs(img_files) do if tup.getconfig("INSERT_COMMIT_ID") ~= "" then if build_type == "ru_RU" - then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-cmtid)]"|iconv -f utf8 -t cp866)' - else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-cmtid)]")' + then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, $(get-current-cmtid|grep -oE [a-z0-9]{7}$)]"|iconv -f utf8 -t cp866)' + else str='$(date -u +"[auto-build %d %b %Y %R, $(get-current-cmtid|grep -oE [a-z0-9]{7}$)]")' end str = string.gsub(str, "%$", "\\$") -- escape $ as \$ str = string.gsub(str, "%%", "%%%%") -- escape % as %% cmd += " && str=" .. str cmd += ' && echo -n $str | dd status=none of=%o bs=1 seek=`expr 274 - length "$str"` conv=notrunc' + str2='$(get-current-cmtid|grep -oE "\\+[0-9]+")' + str2 = string.gsub(str2, "%$", "\\$") -- escape $ as \$ + cmd += " && str2=" .. str2 + cmd += ' && echo -n $str2 | dd status=none of=%o bs=1 seek=216 conv=notrunc' end local_file = VAR_KERNEL .. "/.kernel.mnt" tup.definerule{inputs = {v[2]}, command = cmd, outputs = {local_file}} diff --git a/kernel/trunk/bootbios.inc b/kernel/trunk/bootbios.inc index a563dfb17b..9e06a1c00e 100644 --- a/kernel/trunk/bootbios.inc +++ b/kernel/trunk/bootbios.inc @@ -24,7 +24,7 @@ org 0 ; struct kernel_header jmp start_of_code ; jump db 'KolibriOS ' ; signature - db 'v0.7.7.0+ ',13,10,13,10,0 ; version + db 'v0.7.7.0 ',13,10,13,10,0 ; version dd B32-KERNEL_BASE ; offset of the kernel's 32-bit entry point include "boot/bootstr.inc" ; language-independent boot messages