edk2: change build script

Signed-off-by: Nikita Korolev <[email protected]>
deckhouse · Jan 31, 2025 · a467109 · a467109
1 parent f8507ff
commit a467109
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/images/edk2-artifact/build.sh b/images/edk2-artifact/build.sh
@@ -147,6 +147,18 @@ build_iso() {
     -o "$ISO_IMAGE" "$UEFI_SHELL_IMAGE"
 }
 
+# build_ovmf() {
+#   local flags=$1
+#   local arch=$2
+#   local package=$3
+#   # Example:
+#   # build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc
+#   build "${flags}" -a "${arch}" -p "${package}"
+
+#   cp -p Build/OvmfX64/*/FV/OVMF_CODE.fd $FIRMWARE/OVMF_CODE.fd
+#   cp -p Build/OvmfX64/*/FV/OVMF_VARS.fd $FIRMWARE/OVMF_VARS.fd
+# }
+
 # Build with neither SB nor SMM; include UEFI shell.
 # mkdir -p OVMF
 # echo_dbg "build ${OVMF_2M_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc"
@@ -156,9 +168,14 @@ build_iso() {
 
 # Build 4MB with neither SB nor SMM; include UEFI shell.
 echo_dbg "build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc"
-build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc
-cp -p Build/OvmfX64/*/FV/OVMF_CODE.fd $FIRMWARE/OVMF_CODE.fd
-cp -p Build/OvmfX64/*/FV/OVMF_VARS.fd $FIRMWARE/OVMF_VARS.fd
+build_4m() {
+  build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc
+  cp -p Build/OvmfX64/*/FV/OVMF_CODE.fd $FIRMWARE/OVMF_CODE.fd
+  cp -p Build/OvmfX64/*/FV/OVMF_VARS.fd $FIRMWARE/OVMF_VARS.fd
+}
+
+build_4m 2>&1 > /dev/null
+
 # cp -p Build/OvmfX64/*/FV/OVMF_CODE.fd $FIRMWARE/OVMF_CODE_4M.fd
 # cp -p Build/OvmfX64/*/FV/OVMF_VARS.fd $FIRMWARE/OVMF_VARS_4M.fd
 
@@ -169,31 +186,31 @@ cp -p Build/OvmfX64/*/FV/OVMF_VARS.fd $FIRMWARE/OVMF_VARS.fd
 
 # Build 4MB with SB and SMM; exclude UEFI shell.
 echo_dbg "build ${OVMF_4M_FLAGS} ${OVMF_SB_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc"
-build ${OVMF_4M_FLAGS} ${OVMF_SB_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc
+build ${OVMF_4M_FLAGS} ${OVMF_SB_FLAGS} -a X64 -p OvmfPkg/OvmfPkgX64.dsc 2>&1 > /dev/null
 cp -p Build/OvmfX64/*/FV/OVMF_CODE.fd $FIRMWARE/OVMF_CODE.secboot.fd
 # cp -p Build/OvmfX64/*/FV/OVMF_CODE.fd $FIRMWARE/OVMF_CODE_4M.secboot.fd
 
 # Build AmdSev and IntelTdx variants
 touch OvmfPkg/AmdSev/Grub/grub.efi   # dummy
 
 echo_dbg "build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/AmdSev/AmdSevX64.dsc"
-build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/AmdSev/AmdSevX64.dsc
+build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/AmdSev/AmdSevX64.dsc 2>&1 > /dev/null
 cp -p Build/AmdSev/*/FV/OVMF.fd $FIRMWARE/OVMF.amdsev.fd
 # echo_dbg "build ${OVMF_2M_FLAGS} -a X64 -p OvmfPkg/AmdSev/AmdSevX64.dsc"
 # build ${OVMF_2M_FLAGS} -a X64 -p OvmfPkg/AmdSev/AmdSevX64.dsc
 # cp -p Build/AmdSev/*/FV/OVMF.fd $FIRMWARE/OVMF.amdsev.fd
 
 echo_dbg "build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/IntelTdx/IntelTdxX64.dsc"
-build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/IntelTdx/IntelTdxX64.dsc
+build ${OVMF_4M_FLAGS} -a X64 -p OvmfPkg/IntelTdx/IntelTdxX64.dsc 2>&1 > /dev/null
 cp -p Build/IntelTdx/*/FV/OVMF.fd $FIRMWARE/OVMF.inteltdx.fd
 # echo_dbg "build ${OVMF_2M_FLAGS} -a X64 -p OvmfPkg/IntelTdx/IntelTdxX64.dsc"
 # build ${OVMF_2M_FLAGS} -a X64 -p OvmfPkg/IntelTdx/IntelTdxX64.dsc
 # cp -p Build/IntelTdx/*/FV/OVMF.fd $FIRMWARE/OVMF.inteltdx.fd
 
 # build shell
 echo_dbg "build shell"
-build ${OVMF_4M_FLAGS} -a X64 -p ShellPkg/ShellPkg.dsc
-build ${OVMF_4M_FLAGS} -a IA32 -p ShellPkg/ShellPkg.dsc
+build ${OVMF_4M_FLAGS} -a X64 -p ShellPkg/ShellPkg.dsc 2>&1 > /dev/null
+build ${OVMF_4M_FLAGS} -a IA32 -p ShellPkg/ShellPkg.dsc 2>&1 > /dev/null
 # build ${OVMF_2M_FLAGS} -a X64 -p ShellPkg/ShellPkg.dsc
 # build ${OVMF_2M_FLAGS} -a IA32 -p ShellPkg/ShellPkg.dsc
 
@@ -202,7 +219,7 @@ build ${OVMF_4M_FLAGS} -a IA32 -p ShellPkg/ShellPkg.dsc
 cp -p Build/Shell/*/X64/ShellPkg/Application/Shell/Shell/OUTPUT/Shell.efi $FIRMWARE/
 cp -p Build/OvmfX64/*/X64/EnrollDefaultKeys.efi $FIRMWARE/
 
-build_iso $FIRMWARE
+build_iso $FIRMWARE 2>&1 > /dev/null
 
 enroll() {
   virt-fw-vars --input   $FIRMWARE/OVMF_VARS.fd \

diff --git a/images/edk2-artifact/werf.inc.yaml b/images/edk2-artifact/werf.inc.yaml
@@ -77,5 +77,5 @@ shell:
 
   setup:
   - |
-    /build.sh --repo-name {{ $gitRepoName }} --branch {{ $version }} 2>&1 > /dev/null
+    /build.sh --repo-name {{ $gitRepoName }} --branch {{ $version }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,5 +77,5 @@ shell: @@
       setup:
       - |
-        /build.sh --repo-name {{ $gitRepoName }} --branch {{ $version }} 2>&1 > /dev/null
+        /build.sh --repo-name {{ $gitRepoName }} --branch {{ $version }}