Merge pull request #81 from coreos/bump-vboot-ref-for-cgpt-next

Bump vboot ref for cgpt next

sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_COMMIT="28f202d45b4c33efed64e4af906a95b26e7785b4"
+CROS_WORKON_COMMIT="be2dd216d9a4181eff0d1b68842c1deb016fb95f"
 CROS_WORKON_PROJECT="coreos/vboot_reference"
 CROS_WORKON_REPO="git://github.com"
 
@@ -13,86 +13,34 @@ DESCRIPTION="Chrome OS verified boot tools"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="32bit_au minimal tpmtests cros_host"
+IUSE="cros_host"
 
-RDEPEND="!minimal? ( dev-libs/libyaml )
+RDEPEND="dev-libs/libyaml
 	dev-libs/openssl
 	sys-apps/util-linux"
 DEPEND="app-crypt/trousers
 	${RDEPEND}"
 
-_src_compile_main() {
+src_compile() {
 	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) \
+	      ARCH=$(tc-arch) all
-	      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) \
+	      ARCH=$(tc-arch) runtests
-	      MINIMAL=$(usev minimal) runtests
 }
 
 src_install() {
 	einfo "Installing programs"
-	if use minimal ; then
+	# Installing on the host
-		# Installing on the target
+	emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" install
-		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"
@@ -101,12 +49,4 @@ src_install() {
 
 	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
 }

sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild

@@ -11,87 +11,35 @@ DESCRIPTION="Chrome OS verified boot tools"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
-IUSE="32bit_au minimal tpmtests cros_host"
+IUSE="cros_host"
 
-RDEPEND="!minimal? ( dev-libs/libyaml )
+RDEPEND="dev-libs/libyaml
 	dev-libs/openssl
 	sys-apps/util-linux"
 DEPEND="app-crypt/trousers
 	${RDEPEND}"
 
-_src_compile_main() {
+src_compile() {
 	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) \
+	      ARCH=$(tc-arch) all
-	      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) \
+	      ARCH=$(tc-arch) runtests
-	      MINIMAL=$(usev minimal) runtests
 }
 
 src_install() {
 	einfo "Installing programs"
-	if use minimal ; then
+	# Installing on the host
-		# Installing on the target
+	emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" install
-		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"
@@ -100,12 +48,4 @@ src_install() {
 
 	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
 }