From 04c28bb122f7b9058f90133f38e801ad22e0a87f Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 7 Jul 2013 21:26:24 -0700 Subject: [PATCH 1/2] fix(coreos-base/vboot_reference): put into bumpable format use the symlink trick to make this ebuild bumpable --- .../vboot_reference-1.0-r865.ebuild | 113 +----------------- .../vboot_reference-1.0.ebuild | 112 +++++++++++++++++ 2 files changed, 113 insertions(+), 112 deletions(-) mode change 100644 => 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild 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 deleted file mode 100644 index 0a16a81374..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild +++ /dev/null @@ -1,112 +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="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-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 120000 index 0000000000..a4f04384a2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild @@ -0,0 +1 @@ +vboot_reference-1.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.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.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 +} From 507915a9f59232f65f651b300d20c78aff3582b2 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 7 Jul 2013 21:28:48 -0700 Subject: [PATCH 2/2] bump(coreos-base/vboot_reference): bump to get coreos guids CoreOS has its own GPT guids now. Use them. --- ...ference-1.0-r865.ebuild => vboot_reference-1.0-r866.ebuild} | 0 .../coreos-base/vboot_reference/vboot_reference-1.0.ebuild | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/{vboot_reference-1.0-r865.ebuild => vboot_reference-1.0-r866.ebuild} (100%) 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-r866.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r865.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r866.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild index 0a16a81374..63f859784a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="464ccba4e492c93987c66ac5ada45a96bfe5e04d" -CROS_WORKON_TREE="1a75ea3251d63b162bb42ae6c77ae04983d293ef" +CROS_WORKON_COMMIT="28f202d45b4c33efed64e4af906a95b26e7785b4" CROS_WORKON_PROJECT="chromiumos/platform/vboot_reference" inherit cros-debug cros-workon cros-au