From a0d7872352b718012c100c2edf1e3697f451d728 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 23 Apr 2013 10:22:27 -0700 Subject: [PATCH] fix(coreos-base/coreos-installer): Bump to get file shuffles a bunch of files shuffled around between vboot/verity/coreos-installer. Fix it all up by bumping. --- ...ild => coreos-installer-0.0.1-r276.ebuild} | 7 +- .../coreos-installer-9999.ebuild | 3 + .../vboot_reference-1.0-r825.ebuild | 201 ------------------ .../vboot_reference-1.0-r865.ebuild | 112 ++++++++++ .../vboot_reference-9999.ebuild | 157 +++----------- ...0.1-r71.ebuild => verity-0.0.1-r75.ebuild} | 5 +- .../coreos-base/verity/verity-9999.ebuild | 1 + 7 files changed, 158 insertions(+), 328 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/{coreos-installer-0.0.1-r265.ebuild => coreos-installer-0.0.1-r276.ebuild} (86%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r825.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/verity/{verity-0.0.1-r71.ebuild => verity-0.0.1-r75.ebuild} (88%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r276.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r276.ebuild index 320e74d105..586f4c2cad 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r276.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="3933b7af319b131d958803261fd318ab1964b9a1" -CROS_WORKON_TREE="e5c05be79112b34348527a8b17d8b287d91a9140" +CROS_WORKON_COMMIT="55c7a5332cac5036828da00f805840007f05d233" +CROS_WORKON_TREE="c1f1cde876600249df5ff4a7db0e9623da7fe1d7" CROS_WORKON_PROJECT="chromiumos/platform/installer" CROS_WORKON_LOCALNAME="installer" CROS_WORKON_OUTOFTREE_BUILD=1 @@ -45,6 +45,8 @@ src_prepare() { src_configure() { # need this to get the verity headers working append-cxxflags -I"${SYSROOT}"/usr/include/verity/ + append-cxxflags -I"${SYSROOT}"/usr/include/vboot + append-ldflags -L"${SYSROOT}"/usr/lib/vboot32 use 32bit_au && board_setup_32bit_au_env @@ -64,6 +66,7 @@ src_test() { } src_install() { + cros-workon_src_install local path if use cros_host ; then # Copy chromeos-* scripts to /usr/lib/installer/ on host. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild index 23c0916b6f..2d58c72fb8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild @@ -43,6 +43,8 @@ src_prepare() { src_configure() { # need this to get the verity headers working append-cxxflags -I"${SYSROOT}"/usr/include/verity/ + append-cxxflags -I"${SYSROOT}"/usr/include/vboot + append-ldflags -L"${SYSROOT}"/usr/lib/vboot32 use 32bit_au && board_setup_32bit_au_env @@ -62,6 +64,7 @@ src_test() { } src_install() { + cros-workon_src_install local path if use cros_host ; then # Copy chromeos-* scripts to /usr/lib/installer/ on host. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r825.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r825.ebuild deleted file mode 100644 index 94566334ff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r825.ebuild +++ /dev/null @@ -1,201 +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="3e9cf90442632bed695ac0552a76ca0d1154f799" -CROS_WORKON_TREE="8b768b506c41afc82139df72f689917b51d7cbb2" -CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" - -inherit cros-debug cros-workon cros-au - -DESCRIPTION="Chrome OS verified boot tools" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="32bit_au minimal rbtest tpmtests cros_host" - -LIBCHROME_VERS="125070" - -RDEPEND="app-crypt/trousers - coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - !minimal? ( dev-libs/libyaml ) - dev-libs/glib - dev-libs/openssl - sys-apps/util-linux" -DEPEND="${RDEPEND} - dev-cpp/gflags - dev-cpp/gtest" - -# We need the config in place before we run, but don't need to rebuild this -# package every time. -RDEPEND="${RDEPEND} - !cros_host? ( coreos-base/vboot_reference-config )" - -_src_compile_main() { - mkdir "${S}"/build-main - tc-export CC AR CXX PKG_CONFIG - cros-debug-add-NDEBUG - export BASE_VER=${LIBCHROME_VERS} - # Vboot reference knows the flags to use - unset CFLAGS - emake BUILD="${S}"/build-main \ - ARCH=$(tc-arch) \ - MINIMAL=$(usev minimal) all - unset CC AR CXX -} - -_src_compile_au() { - mkdir "${S}"/build-au - if use 32bit_au ; then - AU_TARGETS="libcgpt_cc libdump_kernel_config" - einfo "Building 32-bit AU_TARGETS: ${AU_TARGETS}" - board_setup_32bit_au_env - else - AU_TARGETS="libcgpt_cc libdump_kernel_config cgptmanager_tests" - einfo "Building native AU_TARGETS: ${AU_TARGETS}" - fi - tc-export CC AR CXX PKG_CONFIG - emake BUILD="${S}"/build-au/ \ - CC="${CC}" \ - CXX="${CXX}" \ - ARCH=$(tc-arch) MINIMAL=$(usev minimal) \ - ${AU_TARGETS} - use 32bit_au && board_teardown_32bit_au_env -} - -src_compile() { - _src_compile_main - _src_compile_au -} - -src_test() { - emake BUILD="${S}"/build-main \ - ARCH=$(tc-arch) \ - MINIMAL=$(usev minimal) runtests -} - -src_install() { - local dst_dir - - if use minimal ; then - # Installing on the target. Cherry pick programs generated - # by src_compile in the source tree build-main/ subdirectory - einfo "Installing target programs" - local progs='utility/dump_kernel_config' - progs+=' utility/crossystem' - progs+=' utility/dev_sign_file' - progs+=' utility/dumpRSAPublicKey' - progs+=' utility/tpm_init_temp_fix' - progs+=' utility/tpmc' - progs+=' utility/vbutil_key' - progs+=' utility/vbutil_keyblock' - progs+=' utility/vbutil_kernel' - progs+=' utility/vbutil_firmware' - progs+=' utility/vbutil_what_keys' - progs+=' utility/gbb_utility' - progs+=' utility/dump_fmap' - progs+=' utility/dev_debug_vboot' - progs+=' utility/enable_dev_usb_boot' - progs+=' cgpt/cgpt' - - into /usr - for prog in ${progs}; do - dobin build-main/"${prog}" - done - - einfo "Installing TPM tools" - exeinto /usr/sbin - doexe "utility/tpm-nvsize" - doexe "utility/chromeos-tpm-recovery" - - einfo "Installing boot tools" - exeinto /sbin - doexe build-main/utility/mount-encrypted - - einfo "Installing dev tools" - dst_dir='/usr/share/vboot/bin' - local src_dir='scripts/image_signing' - dodir "${dst_dir}" - exeinto "${dst_dir}" - doexe "${src_dir}/common_minimal.sh" - doexe "${src_dir}/resign_firmwarefd.sh" - doexe "${src_dir}/make_dev_firmware.sh" - doexe "${src_dir}/make_dev_ssd.sh" - doexe "${src_dir}/set_gbb_flags.sh" - - # TODO(hungte) Since we now install all keyset into - # /usr/share/vboot/devkeys, maybe SAFT does not need to install - # its own keys anymore. - einfo "Installing keys for SAFT" - local keys_to_install='recovery_kernel_data_key.vbprivk' - keys_to_install+=' firmware.keyblock ' - keys_to_install+=' firmware_data_key.vbprivk' - keys_to_install+=' kernel_subkey.vbpubk' - keys_to_install+=' kernel_data_key.vbprivk' - - dst_dir='/usr/sbin/firmware/saft' - dodir "${dst_dir}" - insinto "${dst_dir}" - for key in ${keys_to_install}; do - doins "tests/devkeys/${key}" - done - else - # Installing on host. - emake BUILD="${S}"/build-main \ - DESTDIR="${D}/usr/bin" install - # EC firmware needs to compile directly from source - dodir /usr/src/vboot - insinto /usr/src/vboot - doins -r firmware/include firmware/lib - fi - if use rbtest; then - emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" -C tests \ - install-rbtest - fi - if use tpmtests; then - into /usr - # copy files starting with tpmtest, but skip .d files. - dobin "${S}"/build-main/tests/tpm_lite/tpmtest*[^.]? - dobin "${S}"/build-main/utility/tpm_set_readsrkpub - fi - - # Install devkeys to /usr/share/vboot/devkeys - # (shared by host and target) - einfo "Installing devkeys" - dst_dir='/usr/share/vboot/devkeys' - dodir "${dst_dir}" - insinto "${dst_dir}" - doins tests/devkeys/* - - einfo "Installing header files and libraries" - - # Install firmware/include to /build/${BOARD}/usr/include/vboot - local dst_dir='/usr/include/vboot' - dodir "${dst_dir}" - insinto "${dst_dir}" - doins -r firmware/include/* - for arch in $(ls firmware/arch/); do - insinto "${dst_dir}"/arch/"${arch}" - doins firmware/arch/"${arch}"/include/biosincludes.h - done - - insinto /usr/include/vboot/ - doins "utility/include/kernel_blob.h" - doins "utility/include/dump_kernel_config.h" - doins "cgpt/CgptManager.h" - doins "firmware/lib/cgptlib/include/gpt.h" - - # Install static library needed by install programs. - # we need board_setup_32bit_au_env again so dolib.a installs to the - # correct location - use 32bit_au && board_setup_32bit_au_env - - einfo "Installing dump_kernel_config library" - dolib.a build-au/libdump_kernel_config.a - - einfo "Installing C++ version of cgpt static library:libcgpt-cc.a" - dolib.a build-au/cgpt/libcgpt-cc.a - - use 32bit_au && board_teardown_32bit_au_env -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild new file mode 100644 index 0000000000..0a16a81374 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild @@ -0,0 +1,112 @@ +# 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="464ccba4e492c93987c66ac5ada45a96bfe5e04d" +CROS_WORKON_TREE="1a75ea3251d63b162bb42ae6c77ae04983d293ef" +CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" + +inherit cros-debug cros-workon cros-au + +DESCRIPTION="Chrome OS verified boot tools" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="32bit_au minimal tpmtests cros_host" + +RDEPEND="!minimal? ( dev-libs/libyaml ) + dev-libs/openssl + sys-apps/util-linux" +DEPEND="app-crypt/trousers + ${RDEPEND}" + +_src_compile_main() { + mkdir "${S}"/build-main + tc-export CC AR CXX PKG_CONFIG + cros-debug-add-NDEBUG + # Vboot reference knows the flags to use + unset CFLAGS + emake BUILD="${S}"/build-main \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) all + unset CC AR CXX PKG_CONFIG +} + +_src_compile_au() { + board_setup_32bit_au_env + mkdir "${S}"/build-au + einfo "Building 32-bit library for installer to use" + tc-export CC AR CXX PKG_CONFIG + emake BUILD="${S}"/build-au/ \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) tinyhostlib + unset CC AR CXX PKG_CONFIG + board_teardown_32bit_au_env +} + +src_compile() { + _src_compile_main + use 32bit_au && _src_compile_au +} + +src_test() { + emake BUILD="${S}"/build-main \ + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) runtests +} + +src_install() { + einfo "Installing programs" + if use minimal ; then + # Installing on the target + emake BUILD="${S}"/build-main DESTDIR="${D}" MINIMAL=1 install + + # TODO(hungte) Since we now install all keyset into + # /usr/share/vboot/devkeys, maybe SAFT does not need to install + # its own keys anymore. + einfo "Installing keys for SAFT" + local keys_to_install='recovery_kernel_data_key.vbprivk' + keys_to_install+=' firmware.keyblock ' + keys_to_install+=' firmware_data_key.vbprivk' + keys_to_install+=' kernel_subkey.vbpubk' + keys_to_install+=' kernel_data_key.vbprivk' + + insinto /usr/sbin/firmware/saft + for key in ${keys_to_install}; do + doins "tests/devkeys/${key}" + done + else + # Installing on the host + emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" install + fi + + if use tpmtests; then + into /usr + # copy files starting with tpmtest, but skip .d files. + dobin "${S}"/build-main/tests/tpm_lite/tpmtest*[^.]? + dobin "${S}"/build-main/utility/tpm_set_readsrkpub + fi + + # Install devkeys to /usr/share/vboot/devkeys + # (shared by host and target) + einfo "Installing devkeys" + insinto /usr/share/vboot/devkeys + doins tests/devkeys/* + + # Install public headers to /build/${BOARD}/usr/include/vboot + einfo "Installing header files" + insinto /usr/include/vboot + doins firmware/include/* host/include/* + + einfo "Installing host library" + dolib.a build-main/libvboot_host.a + + # Install 32-bit library needed by installer programs. + if use 32bit_au; then + einfo "Installing 32-bit host library" + insopts -m0644 + insinto /usr/lib/vboot32 + doins build-au/libvboot_host.a + fi +} 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 c0a528345b..9f14bddb03 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 @@ -8,63 +8,44 @@ inherit cros-debug cros-workon cros-au DESCRIPTION="Chrome OS verified boot tools" -LICENSE="GPL-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="32bit_au minimal rbtest tpmtests cros_host" +IUSE="32bit_au minimal tpmtests cros_host" -LIBCHROME_VERS="125070" - -RDEPEND="app-crypt/trousers - coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - !minimal? ( dev-libs/libyaml ) - dev-libs/glib +RDEPEND="!minimal? ( dev-libs/libyaml ) dev-libs/openssl sys-apps/util-linux" -DEPEND="${RDEPEND} - dev-cpp/gflags - dev-cpp/gtest" - -# We need the config in place before we run, but don't need to rebuild this -# package every time. -RDEPEND="${RDEPEND} - !cros_host? ( chromeos-base/vboot_reference-config )" +DEPEND="app-crypt/trousers + ${RDEPEND}" _src_compile_main() { mkdir "${S}"/build-main tc-export CC AR CXX PKG_CONFIG cros-debug-add-NDEBUG - export BASE_VER=${LIBCHROME_VERS} # Vboot reference knows the flags to use unset CFLAGS emake BUILD="${S}"/build-main \ ARCH=$(tc-arch) \ MINIMAL=$(usev minimal) all - unset CC AR CXX + unset CC AR CXX PKG_CONFIG } _src_compile_au() { + board_setup_32bit_au_env mkdir "${S}"/build-au - if use 32bit_au ; then - AU_TARGETS="libcgpt_cc libdump_kernel_config" - einfo "Building 32-bit AU_TARGETS: ${AU_TARGETS}" - board_setup_32bit_au_env - else - AU_TARGETS="libcgpt_cc libdump_kernel_config cgptmanager_tests" - einfo "Building native AU_TARGETS: ${AU_TARGETS}" - fi + einfo "Building 32-bit library for installer to use" tc-export CC AR CXX PKG_CONFIG emake BUILD="${S}"/build-au/ \ - CC="${CC}" \ - CXX="${CXX}" \ - ARCH=$(tc-arch) MINIMAL=$(usev minimal) \ - ${AU_TARGETS} - use 32bit_au && board_teardown_32bit_au_env + ARCH=$(tc-arch) \ + MINIMAL=$(usev minimal) tinyhostlib + unset CC AR CXX PKG_CONFIG + board_teardown_32bit_au_env } src_compile() { _src_compile_main - _src_compile_au + use 32bit_au && _src_compile_au } src_test() { @@ -74,53 +55,10 @@ src_test() { } src_install() { - local dst_dir - + einfo "Installing programs" if use minimal ; then - # Installing on the target. Cherry pick programs generated - # by src_compile in the source tree build-main/ subdirectory - einfo "Installing target programs" - local progs='utility/dump_kernel_config' - progs+=' utility/crossystem' - progs+=' utility/dev_sign_file' - progs+=' utility/dumpRSAPublicKey' - progs+=' utility/tpm_init_temp_fix' - progs+=' utility/tpmc' - progs+=' utility/vbutil_key' - progs+=' utility/vbutil_keyblock' - progs+=' utility/vbutil_kernel' - progs+=' utility/vbutil_firmware' - progs+=' utility/vbutil_what_keys' - progs+=' utility/gbb_utility' - progs+=' utility/dump_fmap' - progs+=' utility/dev_debug_vboot' - progs+=' utility/enable_dev_usb_boot' - progs+=' cgpt/cgpt' - - into /usr - for prog in ${progs}; do - dobin build-main/"${prog}" - done - - einfo "Installing TPM tools" - exeinto /usr/sbin - doexe "utility/tpm-nvsize" - doexe "utility/chromeos-tpm-recovery" - - einfo "Installing boot tools" - exeinto /sbin - doexe build-main/utility/mount-encrypted - - einfo "Installing dev tools" - dst_dir='/usr/share/vboot/bin' - local src_dir='scripts/image_signing' - dodir "${dst_dir}" - exeinto "${dst_dir}" - doexe "${src_dir}/common_minimal.sh" - doexe "${src_dir}/resign_firmwarefd.sh" - doexe "${src_dir}/make_dev_firmware.sh" - doexe "${src_dir}/make_dev_ssd.sh" - doexe "${src_dir}/set_gbb_flags.sh" + # Installing on the target + emake BUILD="${S}"/build-main DESTDIR="${D}" MINIMAL=1 install # TODO(hungte) Since we now install all keyset into # /usr/share/vboot/devkeys, maybe SAFT does not need to install @@ -132,25 +70,15 @@ src_install() { keys_to_install+=' kernel_subkey.vbpubk' keys_to_install+=' kernel_data_key.vbprivk' - dst_dir='/usr/sbin/firmware/saft' - dodir "${dst_dir}" - insinto "${dst_dir}" + insinto /usr/sbin/firmware/saft for key in ${keys_to_install}; do doins "tests/devkeys/${key}" done else - # Installing on host. - emake BUILD="${S}"/build-main \ - DESTDIR="${D}/usr/bin" install - # EC firmware needs to compile directly from source - dodir /usr/src/vboot - insinto /usr/src/vboot - doins -r firmware/include firmware/lib - fi - if use rbtest; then - emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" -C tests \ - install-rbtest + # Installing on the host + emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" install fi + if use tpmtests; then into /usr # copy files starting with tpmtest, but skip .d files. @@ -161,39 +89,22 @@ src_install() { # Install devkeys to /usr/share/vboot/devkeys # (shared by host and target) einfo "Installing devkeys" - dst_dir='/usr/share/vboot/devkeys' - dodir "${dst_dir}" - insinto "${dst_dir}" + insinto /usr/share/vboot/devkeys doins tests/devkeys/* - einfo "Installing header files and libraries" + # Install public headers to /build/${BOARD}/usr/include/vboot + einfo "Installing header files" + insinto /usr/include/vboot + doins firmware/include/* host/include/* - # Install firmware/include to /build/${BOARD}/usr/include/vboot - local dst_dir='/usr/include/vboot' - dodir "${dst_dir}" - insinto "${dst_dir}" - doins -r firmware/include/* - for arch in $(ls firmware/arch/); do - insinto "${dst_dir}"/arch/"${arch}" - doins firmware/arch/"${arch}"/include/biosincludes.h - done + einfo "Installing host library" + dolib.a build-main/libvboot_host.a - insinto /usr/include/vboot/ - doins "utility/include/kernel_blob.h" - doins "utility/include/dump_kernel_config.h" - doins "cgpt/CgptManager.h" - doins "firmware/lib/cgptlib/include/gpt.h" - - # Install static library needed by install programs. - # we need board_setup_32bit_au_env again so dolib.a installs to the - # correct location - use 32bit_au && board_setup_32bit_au_env - - einfo "Installing dump_kernel_config library" - dolib.a build-au/libdump_kernel_config.a - - einfo "Installing C++ version of cgpt static library:libcgpt-cc.a" - dolib.a build-au/cgpt/libcgpt-cc.a - - use 32bit_au && board_teardown_32bit_au_env + # Install 32-bit library needed by installer programs. + if use 32bit_au; then + einfo "Installing 32-bit host library" + insopts -m0644 + insinto /usr/lib/vboot32 + doins build-au/libvboot_host.a + fi } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r71.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r75.ebuild similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r71.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r75.ebuild index 68ce5c6e50..7c537db65a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r71.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/verity/verity-0.0.1-r75.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="e5627e7a2506fdd93f3b6edf48c76b68bfe75326" -CROS_WORKON_TREE="8f459ef16b87c47cb26400078c2ae353cb41455b" +CROS_WORKON_COMMIT="658d35ef6f15cb7763ce4bdd03161837452de7cd" +CROS_WORKON_TREE="a54ff06d13ee681a7cb660ed14c51dcd8ef5ffdf" CROS_WORKON_PROJECT="chromiumos/platform/dm-verity" CROS_WORKON_OUTOFTREE_BUILD=1 @@ -49,6 +49,7 @@ 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 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 index 4d04fdc57f..381a2e8ee4 100644 --- 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 @@ -47,6 +47,7 @@ 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