From b8777f450fdb072b88bd372daa00f9400bbff499 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 12 Feb 2013 11:45:49 -0800 Subject: [PATCH] Revert "fix(coreos-base): use grub-static not grub" This was a mistake, dont't do this. Use grub2 imported into portage-stable. --- .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- .../coreos-overlay/profiles/default/linux/package.use | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index fb27a0d5c3..c19b9476a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -26,7 +26,7 @@ RDEPEND="${RDEPEND} dev-util/ccache dev-util/crosutils >=sys-apps/dtc-1.3.0-r5 - sys-boot/grub-static + sys-boot/grub sys-boot/syslinux sys-devel/crossdev sys-fs/dosfstools diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use index e78ad9f2a7..ebe806e3ec 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use @@ -24,7 +24,7 @@ net-misc/curl ares static-libs sci-geosciences/gpsd -cxx # verity and other packages link statically with libuuid. sys-apps/util-linux -perl static-libs -sys-boot/grub-static grub_platforms_pc grub_platforms_efi-64 grub_platforms_coreboot static +sys-boot/grub grub_platforms_pc grub_platforms_efi-64 grub_platforms_coreboot static sys-devel/gettext -git # Build emulation statically so that we can execute it within a chroot and # still find the shared libraries.