From d871860850b838c41dc1b68b990041e19307ac20 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Oct 2016 20:59:45 -0700 Subject: [PATCH 1/2] sys-boot/grub: remove old dependency on xen-tools These days GRUB bundles the Xen headers but I missed the change. --- .../third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild index 944345f719..e6112e2f5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild @@ -73,7 +73,6 @@ DEPEND="${RDEPEND} grub_platforms_qemu? ( media-libs/freetype:2 ) grub_platforms_ieee1275? ( media-libs/freetype:2 ) grub_platforms_loongson? ( media-libs/freetype:2 ) - grub_platforms_xen? ( app-emulation/xen-tools ) grub_platforms_arm64? ( cross-aarch64-cros-linux-gnu/gcc ) static? ( app-arch/xz-utils[static-libs(+)] From 46dc51a06a80f06a1a84e8bc24120309f5ce1116 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Oct 2016 21:04:35 -0700 Subject: [PATCH 2/2] sys-boot/grub: update, fixes TPM errors and verity on Xen --- ...p20151217-r9.ebuild => grub-2.02_beta2_p20151217-r10.ebuild} | 0 .../third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-boot/grub/{grub-2.02_beta2_p20151217-r9.ebuild => grub-2.02_beta2_p20151217-r10.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20151217-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20151217-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20151217-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20151217-r10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild index e6112e2f5b..6475859c2e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64 ~x86" else - CROS_WORKON_COMMIT="5962f7d5e7ddb87880e090f0473e0b4bf46612a2" + CROS_WORKON_COMMIT="bca61d04a080b773895a5cdf1b4015b6ebf47917" KEYWORDS="amd64 arm64 x86" fi