From 38324a91912312b61571f569d4be4efcd42366ec Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 1 Oct 2014 12:23:59 -0700 Subject: [PATCH] verity: prune old broken package from ChromeOS When we add verity support we will be relying on generic packages such as cryptsetup instead of whatever unknown bits are in this code base. It has stopped building and I thought I removed it ages ago. Oops. --- ...ld => hard-host-depends-0.0.1-r168.ebuild} | 0 .../hard-host-depends-0.0.1.ebuild | 1 - .../dm-verity-gcc-4.6-stack-protector.patch | 13 ---- .../verity/verity-0.0.1-r76.ebuild | 66 ------------------- .../coreos-base/verity/verity-9999.ebuild | 61 ----------------- 5 files changed, 141 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r167.ebuild => hard-host-depends-0.0.1-r168.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/verity/files/dm-verity-gcc-4.6-stack-protector.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r76.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-9999.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r167.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r168.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r167.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r168.ebuild 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 a3c95b07c7..51a03f1e9b 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 @@ -125,7 +125,6 @@ RDEPEND="${RDEPEND} # Host dependencies that are needed to create and sign images # TODO: sys-apps/mosys RDEPEND="${RDEPEND} - coreos-base/verity sys-fs/libfat sys-fs/squashfs-tools " diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/files/dm-verity-gcc-4.6-stack-protector.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/files/dm-verity-gcc-4.6-stack-protector.patch deleted file mode 100644 index f4bcc2d1bb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/files/dm-verity-gcc-4.6-stack-protector.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common.mk b/common.mk -index 058e906..9d4158a 100644 ---- a/common.mk -+++ b/common.mk -@@ -276,7 +276,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-gcc := -fstack-protector-strong -fvisibility=internal -ggdb3 \ -+COMMON_CFLAGS-gcc := -fstack-protector-all -fvisibility=internal -ggdb3 \ - -Wa,--noexecstack - COMMON_CFLAGS-clang := -fstack-protector-all -fvisibility=hidden -ggdb - COMMON_CFLAGS := -Wall -Werror -fno-strict-aliasing -O1 -Wformat=2 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r76.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r76.ebuild deleted file mode 100644 index 978f1c9e23..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r76.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="658d35ef6f15cb7763ce4bdd03161837452de7cd" -CROS_WORKON_TREE="a54ff06d13ee681a7cb660ed14c51dcd8ef5ffdf" -CROS_WORKON_PROJECT="chromiumos/platform/dm-verity" -CROS_WORKON_OUTOFTREE_BUILD=1 - -inherit cros-workon cros-au eutils - -DESCRIPTION="File system integrity image generator for Chromium OS" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 arm" -IUSE="32bit_au test valgrind splitdebug" - -RDEPEND="" - -# qemu use isn't reflected as it is copied into the target -# from the build host environment. -DEPEND="${RDEPEND} - dev-cpp/gtest - dev-cpp/gmock - 32bit_au? ( - dev-cpp/gtest32 - dev-cpp/gmock32 - ) - valgrind? ( dev-util/valgrind )" - -src_prepare() { - cros-workon_src_prepare - # temporary fix for gcc 4.6 compatibility - # we don't use verity (yet) so don't bother forking the git repo yet... - epatch "${FILESDIR}/dm-verity-gcc-4.6-stack-protector.patch" -} - -src_configure() { - use 32bit_au && board_setup_32bit_au_env - cros-workon_src_configure -} - -src_compile() { - cros-workon_src_compile -} - -src_test() { - cros-workon_src_test -} - -src_install() { - cros-workon_src_install - dolib.a "${OUT}"/libdm-bht.a - insinto /usr/include/verity - doins dm-bht.h dm-bht-userspace.h - insinto /usr/include/verity - cd include - doins -r linux asm asm-generic crypto - cd .. - into / - dobin "${OUT}"/verity-static - dosym verity-static bin/verity -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-9999.ebuild deleted file mode 100644 index 381a2e8ee4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-9999.ebuild +++ /dev/null @@ -1,61 +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/dm-verity" -CROS_WORKON_OUTOFTREE_BUILD=1 - -inherit cros-workon cros-au - -DESCRIPTION="File system integrity image generator for Chromium OS" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" -IUSE="32bit_au test valgrind splitdebug" - -RDEPEND="" - -# qemu use isn't reflected as it is copied into the target -# from the build host environment. -DEPEND="${RDEPEND} - dev-cpp/gtest - dev-cpp/gmock - 32bit_au? ( - dev-cpp/gtest32 - dev-cpp/gmock32 - ) - valgrind? ( dev-util/valgrind )" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - use 32bit_au && board_setup_32bit_au_env - cros-workon_src_configure -} - -src_compile() { - cros-workon_src_compile -} - -src_test() { - cros-workon_src_test -} - -src_install() { - cros-workon_src_install - dolib.a "${OUT}"/libdm-bht.a - insinto /usr/include/verity - doins dm-bht.h dm-bht-userspace.h - insinto /usr/include/verity - cd include - doins -r linux asm asm-generic crypto - cd .. - into / - dobin "${OUT}"/verity-static - dosym verity-static bin/verity -}