Build id in log and in About menu.

This commit is contained in:
jief666 2020-10-07 20:25:31 +03:00
parent 446cec5ede
commit 881796039f
5 changed files with 6 additions and 3 deletions

View File

@ -931,6 +931,7 @@ export BUILD_DIR_ARCH="${BUILD_DIR}/$TARGETARCH"
rm -rf ${WORKSPACE}/Build/*.efi rm -rf ${WORKSPACE}/Build/*.efi
rm -rf ${WORKSPACE}/Build/*.zip rm -rf ${WORKSPACE}/Build/*.zip
#extract build_id from efi instead of Version.h to be 100% sure that name correspond to actual content.
dstFileName=CloverX64-"$BUILDTARGET"_"$TOOLCHAIN"-"$(grep -aEo "Clover build id: [^[:cntrl:]]*" < "$BUILD_DIR_ARCH"/CLOVERX64.efi | sed "s/Clover build id: //")" dstFileName=CloverX64-"$BUILDTARGET"_"$TOOLCHAIN"-"$(grep -aEo "Clover build id: [^[:cntrl:]]*" < "$BUILD_DIR_ARCH"/CLOVERX64.efi | sed "s/Clover build id: //")"
copyBin "$BUILD_DIR_ARCH"/CLOVERX64.efi ${WORKSPACE}/Build/"$dstFileName".efi copyBin "$BUILD_DIR_ARCH"/CLOVERX64.efi ${WORKSPACE}/Build/"$dstFileName".efi

View File

@ -131,9 +131,9 @@ CONST CHAR8* gFirmwareBuildDate = "unknown";
CONST CHAR8* gBuildInfo = NULL; CONST CHAR8* gBuildInfo = NULL;
#endif #endif
#ifdef BUILD_ID #ifdef BUILD_ID
constexpr const LString8 gBuildId __attribute__((used)) = "Clover build id: " BUILD_ID; const LString8 gBuildId __attribute__((used)) = "Clover build id: " BUILD_ID;
#else #else
constexpr const LString8 gBuildId __attribute__((used)) = "Clover build id: " "unknown"; const LString8 gBuildId __attribute__((used)) = "Clover build id: " "unknown";
#endif #endif
const char* path_independant __attribute__((used)) = "path_independant"; const char* path_independant __attribute__((used)) = "path_independant";

View File

@ -809,6 +809,7 @@ extern CONST CHAR16 *gFirmwareRevision;
extern CONST CHAR8* gRevisionStr; extern CONST CHAR8* gRevisionStr;
extern CONST CHAR8* gFirmwareBuildDate; extern CONST CHAR8* gFirmwareBuildDate;
extern CONST CHAR8* gBuildInfo; extern CONST CHAR8* gBuildInfo;
extern const LString8 gBuildId;
extern BOOLEAN ResumeFromCoreStorage; extern BOOLEAN ResumeFromCoreStorage;
extern BOOLEAN gRemapSmBiosIsRequire; // syscl: pass argument for Dell SMBIOS here extern BOOLEAN gRemapSmBiosIsRequire; // syscl: pass argument for Dell SMBIOS here

View File

@ -2380,7 +2380,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
} }
//MsgLog("Starting Clover rev %ls on %ls EFI\n", gFirmwareRevision, gST->FirmwareVendor); //MsgLog("Starting Clover rev %ls on %ls EFI\n", gFirmwareRevision, gST->FirmwareVendor);
MsgLog("Starting %s on %ls EFI\n", gRevisionStr, gST->FirmwareVendor); MsgLog("Starting %s on %ls EFI\n", gRevisionStr, gST->FirmwareVendor);
MsgLog("Build id: %s\n", gBuildId.c_str());
if ( gBuildInfo ) DBG("Build with: [%s]\n", gBuildInfo); if ( gBuildInfo ) DBG("Build with: [%s]\n", gBuildInfo);

View File

@ -1096,6 +1096,7 @@ void AboutRefit(void)
// AboutMenu.AddMenuInfo_f(("Clover Version 5.0")); // AboutMenu.AddMenuInfo_f(("Clover Version 5.0"));
if ( "unknown"_XS8 != LString8(gRevisionStr) ) AboutMenu.AddMenuInfo_f("%s", gRevisionStr); if ( "unknown"_XS8 != LString8(gRevisionStr) ) AboutMenu.AddMenuInfo_f("%s", gRevisionStr);
if ( "unknown"_XS8 != LString8(gFirmwareBuildDate) ) AboutMenu.AddMenuInfo_f(" Build: %s", gFirmwareBuildDate); if ( "unknown"_XS8 != LString8(gFirmwareBuildDate) ) AboutMenu.AddMenuInfo_f(" Build: %s", gFirmwareBuildDate);
if ( "unknown"_XS8 != gBuildId ) AboutMenu.AddMenuInfo_f(" Build id: %s", gBuildId.c_str());
AboutMenu.AddMenuInfo_f(" "); AboutMenu.AddMenuInfo_f(" ");
AboutMenu.AddMenuInfo_f("Based on rEFIt (c) 2006-2010 Christoph Pfisterer"); AboutMenu.AddMenuInfo_f("Based on rEFIt (c) 2006-2010 Christoph Pfisterer");
AboutMenu.AddMenuInfo_f("Portions Copyright (c) Intel Corporation"); AboutMenu.AddMenuInfo_f("Portions Copyright (c) Intel Corporation");