From 139a9b656d789db5a3caa40fe719e5e736add9da Mon Sep 17 00:00:00 2001 From: Jia Zhang Date: Thu, 20 Sep 2018 21:21:37 -0400 Subject: Clean up the stuffs for stable branches The following commits are reverted by the way: - seloader: Fix building for rocko (bc6bbe2) - meta-integrity: rpm: Add back in required patches for rocko (5fa9c85) Because they are only applicable to rocko. Signed-off-by: Jia Zhang --- meta-efi-secure-boot/conf/layer.conf | 2 +- meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-efi-secure-boot') diff --git a/meta-efi-secure-boot/conf/layer.conf b/meta-efi-secure-boot/conf/layer.conf index 7d69fea..167ca22 100644 --- a/meta-efi-secure-boot/conf/layer.conf +++ b/meta-efi-secure-boot/conf/layer.conf @@ -19,4 +19,4 @@ LAYERDEPENDS_efi-secure-boot = "\ perl-layer \ " -LAYERSERIES_COMPAT_efi-secure-boot = "rocko sumo" +LAYERSERIES_COMPAT_efi-secure-boot = "sumo" diff --git a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb index 5d5fe2d..40ff582 100644 --- a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb +++ b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb @@ -45,8 +45,6 @@ EXTRA_OEMAKE = "\ LIB_GCC="`${CC} -print-libgcc-file-name`" \ " -EXTRA_OEMAKE += "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'rocko', 'GNU_EFI_VERSION=306', '', d)}" - EFI_ARCH_x86 = "ia32" EFI_ARCH_x86-64 = "x64" -- cgit v1.2.3-54-g00ecf