From 9e10304903298e7eac2f1e8c70cc550c5cfb0953 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 26 Aug 2014 17:58:26 -0700 Subject: [PATCH 1/2] cros_boot_mode: remove unused ChromeOS utility This package has some issues in its build process but we don't actually use it or want it so it's about time to delete it. --- ...1-r239.ebuild => coreos-0.0.1-r240.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 1 - .../cros_boot_mode-0.0.1-r16.ebuild | 66 ------------------- .../cros_boot_mode/cros_boot_mode-9999.ebuild | 63 ------------------ ...boot_mode-0.0.1-fix-fstack-protector.patch | 13 ---- 5 files changed, 143 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r239.ebuild => coreos-0.0.1-r240.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r239.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r240.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r239.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r240.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 1eda6e8d23..d826762b5e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -106,7 +106,6 @@ RDEPEND="${RDEPEND} app-arch/unzip app-arch/zip app-shells/bash - coreos-base/cros_boot_mode coreos-base/vboot_reference coreos-base/update_engine coreos-base/coreos-init diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild deleted file mode 100644 index 814ad29540..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="a3df396f95e6f5f91adaafb2d25c981bd6c650ef" -CROS_WORKON_TREE="b21faacf6a9940571ef122363c19a1ac02595b4b" -CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode" -CROS_WORKON_OUTOFTREE_BUILD=1 - -inherit eutils toolchain-funcs cros-debug cros-workon - -DESCRIPTION="Chrome OS platform boot mode utility" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="test valgrind" - -LIBCHROME_VERS="125070" - -RDEPEND="test? ( chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] )" - -# qemu use isn't reflected as it is copied into the target -# from the build host environment. -DEPEND="${RDEPEND} - test? ( dev-cpp/gmock ) - test? ( dev-cpp/gtest ) - valgrind? ( dev-util/valgrind )" - -src_prepare() { - cros-workon_src_prepare - epatch "${FILESDIR}/${P}-fix-fstack-protector.patch" -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - cros-workon_src_compile -} - -src_test() { - # Needed for `cros_run_unit_tests`. - cros-workon_src_test -} - -src_install() { - into / - dobin "${OUT}"/cros_boot_mode - - into /usr - dolib.so "${OUT}"/libcros_boot_mode.so - - insinto /usr/include/cros_boot_mode - doins \ - active_main_firmware.h \ - bootloader_type.h \ - boot_mode.h \ - developer_switch.h \ - helpers.h \ - platform_reader.h \ - platform_switch.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-9999.ebuild deleted file mode 100644 index f0cbd8db3c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-9999.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode" -CROS_WORKON_OUTOFTREE_BUILD=1 - -inherit toolchain-funcs cros-debug cros-workon - -DESCRIPTION="Chrome OS platform boot mode utility" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test valgrind" - -LIBCHROME_VERS="125070" - -RDEPEND="test? ( chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] )" - -# qemu use isn't reflected as it is copied into the target -# from the build host environment. -DEPEND="${RDEPEND} - test? ( dev-cpp/gmock ) - test? ( dev-cpp/gtest ) - valgrind? ( dev-util/valgrind )" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - cros-workon_src_configure -} - -src_compile() { - cros-workon_src_compile -} - -src_test() { - # Needed for `cros_run_unit_tests`. - cros-workon_src_test -} - -src_install() { - into / - dobin "${OUT}"/cros_boot_mode - - into /usr - dolib.so "${OUT}"/libcros_boot_mode.so - - insinto /usr/include/cros_boot_mode - doins \ - active_main_firmware.h \ - bootloader_type.h \ - boot_mode.h \ - developer_switch.h \ - helpers.h \ - platform_reader.h \ - platform_switch.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch deleted file mode 100644 index e7cf377273..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common.mk b/common.mk -index 357d1f9..9a91c43 100644 ---- a/common.mk -+++ b/common.mk -@@ -260,7 +260,7 @@ endif - # CXXFLAGS := -mahflag $(CXXFLAGS) # Prepend to the list - # CXXFLAGS := $(filter-out badflag,$(CXXFLAGS)) # Filter out a value - # The same goes for CFLAGS. --COMMON_CFLAGS := -Wall -Werror -fstack-protector-strong -fno-strict-aliasing \ -+COMMON_CFLAGS := -Wall -Werror -fstack-protector-all -fno-strict-aliasing \ - -ggdb3 -Wa,--noexecstack -O1 -fvisibility=internal -Wformat=2 - CXXFLAGS += $(COMMON_CFLAGS) - CFLAGS += $(COMMON_CFLAGS) From 4636a4036da25a6a4d91792e1481d5d30809ad85 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 26 Aug 2014 18:42:06 -0700 Subject: [PATCH 2/2] vboot_reference: fix build with GCC 4.7.x --- ...eference-1.0-r881.ebuild => vboot_reference-1.0-r882.ebuild} | 0 .../coreos-base/vboot_reference/vboot_reference-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/{vboot_reference-1.0-r881.ebuild => vboot_reference-1.0-r882.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r881.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r882.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r881.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r882.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild index 208138c892..6b28781a95 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="1b63aaac25e915291b504eb1c477d4d56211bf4f" + CROS_WORKON_COMMIT="0d0752d3e7fcb63f8d6e9bffde21500dec6872ac" KEYWORDS="amd64 arm x86" fi