From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sys-boot/tboot/Manifest | 4 +- sys-boot/tboot/tboot-1.10.3.ebuild | 66 --------------------------------- sys-boot/tboot/tboot-1.10.4.ebuild | 76 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 68 deletions(-) delete mode 100644 sys-boot/tboot/tboot-1.10.3.ebuild create mode 100644 sys-boot/tboot/tboot-1.10.4.ebuild (limited to 'sys-boot/tboot') diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index e1341fc5a6f4..48a96ef77363 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1,6 +1,6 @@ AUX tboot-1.10.3-disable-Werror.patch 522 BLAKE2B e25832b544ffc81d83d963061c35432f454590b02f3c9d10ceff60f977b9b022e39193a41ded7f96c71681f7219204809dd4156bcf7ad37ea8738155b6c0469e SHA512 a219e4f1dd637fb93cd05e827ab7d1a9bbcc99b87a3f6e9e8b902d0ab08f150ad87d8804f0d506c5ac721be4d1a85a14466e036c09643601a705be0fb07e4ed4 AUX tboot-1.10.3-disable-strip.patch 343 BLAKE2B 65d5e7f4e97504ace2d42123701de8f6e27e3ffc196b69a0afc8057ed8fe75c8274c427d858cb316d5712505381a5a109ddc5301eedc0f93c34d3ed0551deaff SHA512 f86f595d8883d433327eb906ee5fbe0c277180c7a993ae47e26c23ea8b406e59cbad28509ca399286ba306949b0d5de5dc9420242706c7affcba12d86e3f183b AUX tboot-1.10.3-dont-call-toolchain-directly.patch 1884 BLAKE2B 80a029eb34f3088ccb772b5e9b092b60f35516659c74d149c0ff6bc6afb7578d35e3063beadaf0dd61407f84f78f20d782c3b64c33ab566751a2317fee14aeb9 SHA512 02dd09eb4b4a65802206c066f32959ab8150933dbc37458e888dcec4cf40b25681e3f0463cd8df62149f7764956d04259c05be36aeed8d9a243d758d3a2225a2 -DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77 -EBUILD tboot-1.10.3.ebuild 1567 BLAKE2B a39d03c73be6792b6a1eae8d7bf08d21f56ba3f2a0e34371ea79ae023ceb450a064099a130941a880fb33cf4fba83ed292cd8b706f62233a8911ec1dc507c0aa SHA512 c0277eeb997b35fdd16363f63f21fb1090c434a33ae918b7646060a244c5743ce218687c75a8e45512e1a790a09d0ad2b1c3507f9e87c06f2f4c90d03504731e +DIST tboot-1.10.4.tar.gz 908050 BLAKE2B 8c793e2ec29cc3c3aa8199ac5058e9b3521eb0a72609c8b5ae21e0843571ae765be74bb48184178e2641ff8eec05680f81e45b12b80fd7d2727c82f9c8702411 SHA512 6fe93cabd5fc10cba7797048cad2cce4c490e0112c5c877f3367d78873cb55ba3d84eb703f2fcdba807eb21f1bef6a838d315b32d6418fb88b2589ff66e99491 +EBUILD tboot-1.10.4.ebuild 1892 BLAKE2B 5de7709ef3ff7f21ecfd75cf45fc2e971493e0b2e49f3684cf451afcef5ec1e7fc317bd124e72dfc894f12f862c2ae69b689018b5e58d438c745be1d7dfc72cb SHA512 dd0024300995105f901b7132176bb23125dbf78c6ac3f03464a5abcc69677096f3fe5bcf9eb5794d89a0dfa8f0f2de3a3ddb1e14ab9246132da4e009bf954289 MISC metadata.xml 508 BLAKE2B c28a3b0e46c57c91011bbee5ff6769ace24ab4e7b3355536b8e8c3bdb33b0be4ee1fedd60f00e2bfe8957570f763e8e85f3a1786f7a470bc5b4c855e57f7b8a2 SHA512 e45960df2560d82cb914db1f661d739b5d6747b7fb433152fef849d36d6bb4cc812def3cbafa4b362056c4d96e37980e65f8bc163b2021d5827ffd6ee9afca4d diff --git a/sys-boot/tboot/tboot-1.10.3.ebuild b/sys-boot/tboot/tboot-1.10.3.ebuild deleted file mode 100644 index cdb682a949ff..000000000000 --- a/sys-boot/tboot/tboot-1.10.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit mount-boot toolchain-funcs - -DESCRIPTION="Performs a measured and verified boot using Intel Trusted Execution Technology" -HOMEPAGE="https://sourceforge.net/projects/tboot/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="custom-cflags selinux" - -# requires patching the kernel src -RESTRICT="test" - -DEPEND="dev-libs/openssl:0=[-bindist(-)]" - -RDEPEND="${DEPEND} - sys-boot/grub:2 - selinux? ( sec-policy/selinux-tboot )" - -DOCS=( README.md COPYING CHANGELOG ) -PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch" - "${FILESDIR}/${PN}-1.10.3-disable-strip.patch" - "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" ) - -src_configure() { - tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP - - default -} - -src_compile() { - use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - if use amd64; then - export MAKEARGS="TARGET_ARCH=x86_64" - else - export MAKEARGS="TARGET_ARCH=i686" - fi - - default -} - -src_install() { - emake DISTDIR="${D}" install - - dodoc "${DOCS[@]}" - dodoc docs/*.{txt,md} - - cd "${ED}" || die - mkdir -p usr/lib/tboot/ || die - mv boot usr/lib/tboot/ || die -} - -pkg_postinst() { - cp "${ROOT}/usr/lib/tboot/boot/"* "${ROOT}/boot/" || die - - ewarn "Please remember to download the SINIT AC Module relevant" - ewarn "for your platform from:" - ewarn "http://software.intel.com/en-us/articles/intel-trusted-execution-technology/" -} diff --git a/sys-boot/tboot/tboot-1.10.4.ebuild b/sys-boot/tboot/tboot-1.10.4.ebuild new file mode 100644 index 000000000000..4cedba3fabfc --- /dev/null +++ b/sys-boot/tboot/tboot-1.10.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit mount-boot toolchain-funcs + +DESCRIPTION="Performs a measured and verified boot using Intel Trusted Execution Technology" +HOMEPAGE="https://sourceforge.net/projects/tboot/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="custom-cflags selinux" + +# requires patching the kernel src +RESTRICT="test" + +DEPEND="dev-libs/openssl:0=[-bindist(-)]" + +RDEPEND="${DEPEND} + sys-boot/grub:2 + selinux? ( sec-policy/selinux-tboot )" + +DOCS=( README.md COPYING CHANGELOG ) +PATCHES=( "${FILESDIR}/${PN}-1.10.3-disable-Werror.patch" + "${FILESDIR}/${PN}-1.10.3-disable-strip.patch" + "${FILESDIR}/${PN}-1.10.3-dont-call-toolchain-directly.patch" ) + +pkg_setup() { + if tc-is-clang; then + eerror "tboot is a freestanding application that uses gcc" + eerror "extensions in fundemental ways, include VLAIS" + eerror "(Variable Length Arrays in Structs) and will not" + eerror "compile with clang witout upstream action" + die "Cannot compile with clang. See bug #832020" + fi +} + +src_configure() { + tc-export AS LD CC CPP AR RANLIB NM OBJCOPY OBJDUMP STRIP + + default +} + +src_compile() { + use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS + + if use amd64; then + export MAKEARGS="TARGET_ARCH=x86_64" + else + export MAKEARGS="TARGET_ARCH=i686" + fi + + default +} + +src_install() { + emake DISTDIR="${D}" install + + dodoc "${DOCS[@]}" + dodoc docs/*.{txt,md} + + cd "${ED}" || die + mkdir -p usr/lib/tboot/ || die + mv boot usr/lib/tboot/ || die +} + +pkg_postinst() { + cp "${ROOT}/usr/lib/tboot/boot/"* "${ROOT}/boot/" || die + + ewarn "Please remember to download the SINIT AC Module relevant" + ewarn "for your platform from:" + ewarn "http://software.intel.com/en-us/articles/intel-trusted-execution-technology/" +} -- cgit v1.2.3