Control: tags -1 + patch
By incorporating the idea at
https://bugzilla.tianocore.org/show_bug.cgi?id=3064#c5
the attached patch completely fixes the reported symptom. Ryutaroh
--- debian-edk2-orig-sourcepkg/edk2-2020.08/debian/rules 2020-09-29
04:40:05.000000000 +0900
+++ debian-edk2-secureboot/edk2-2020.08/debian/rules 2020-11-11
17:46:01.703444691 +0900
@@ -48,7 +48,7 @@
make -C BaseTools ARCH=$(EDK2_BUILD_ARCH)
touch $@
-OVMF_BUILD_DIR = Build/OvmfX64/RELEASE_$(EDK2_TOOLCHAIN)
+OVMF_BUILD_DIR = Build/Ovmf3264/RELEASE_$(EDK2_TOOLCHAIN)
OVMF_ENROLL = $(OVMF_BUILD_DIR)/X64/EnrollDefaultKeys.efi
OVMF_SHELL = $(OVMF_BUILD_DIR)/X64/Shell.efi
OVMF_BINARIES = $(OVMF_ENROLL) $(OVMF_SHELL)
@@ -68,35 +68,31 @@
rm -rf debian/ovmf-install
mkdir debian/ovmf-install
set -e; . ./edksetup.sh; \
- build -a $(EDK2_HOST_ARCH) \
+ ./OvmfPkg/build.sh -a X64 -a IA32 \
-t $(EDK2_TOOLCHAIN) \
- -p OvmfPkg/OvmfPkgX64.dsc \
$(OVMF_2M_FLAGS) -b RELEASE; \
cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \
$(OVMF_BUILD_DIR)/FV/OVMF.fd \
debian/ovmf-install/; \
cp $(OVMF_BUILD_DIR)/FV/OVMF_VARS.fd \
debian/ovmf-install/; \
- rm -rf Build/Ovmf$(EDK2_HOST_ARCH); \
- build -a $(EDK2_HOST_ARCH) \
+ rm -rf Build/Ovmf3264; \
+ ./OvmfPkg/build.sh -a X64 -a IA32 \
-t $(EDK2_TOOLCHAIN) \
- -p OvmfPkg/OvmfPkgX64.dsc \
$(OVMF_4M_FLAGS) -b RELEASE; \
cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \
debian/ovmf-install/OVMF_CODE_4M.fd; \
cp $(OVMF_BUILD_DIR)/FV/OVMF_VARS.fd \
debian/ovmf-install/OVMF_VARS_4M.fd; \
- rm -rf Build/Ovmf$(EDK2_HOST_ARCH); \
- build -a $(EDK2_HOST_ARCH) \
+ rm -rf Build/Ovmf3264; \
+ ./OvmfPkg/build.sh -a X64 -a IA32 \
-t $(EDK2_TOOLCHAIN) \
- -p OvmfPkg/OvmfPkgX64.dsc \
$(OVMF_2M_SMM_FLAGS) -b RELEASE; \
cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \
debian/ovmf-install/OVMF_CODE.secboot.fd; \
- rm -rf Build/Ovmf$(EDK2_HOST_ARCH); \
- build -a $(EDK2_HOST_ARCH) \
+ rm -rf Build/Ovmf3264; \
+ ./OvmfPkg/build.sh -a X64 -a IA32 \
-t $(EDK2_TOOLCHAIN) \
- -p OvmfPkg/OvmfPkgX64.dsc \
$(OVMF_4M_SMM_FLAGS) -b RELEASE; \
cp $(OVMF_BUILD_DIR)/FV/OVMF_CODE.fd \
debian/ovmf-install/OVMF_CODE_4M.secboot.fd; \
