mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-17 18:31:13 +02:00
Merge pull request #895 from marineam/verity
verity: prune old broken package from ChromeOS
This commit is contained in:
commit
66e07f935a
@ -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
|
||||
"
|
||||
|
@ -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
|
@ -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
|
||||
}
|
@ -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
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user