diff options
author | Christopher Byrne <salah.coronya@gmail.com> | 2021-12-19 16:44:09 -0600 |
---|---|---|
committer | John Helmert III <ajak@gentoo.org> | 2021-12-19 18:54:25 -0600 |
commit | 61d9c34970e78d9afc98ce07f9e5360be7690b13 (patch) | |
tree | 88366e98be2147c1ee9903e3f80b6909cb0e2e12 /sys-boot/tboot | |
parent | sys-boot/tboot: Bump to 1.10.3 (diff) | |
download | gentoo-61d9c34970e78d9afc98ce07f9e5360be7690b13.tar.gz gentoo-61d9c34970e78d9afc98ce07f9e5360be7690b13.tar.bz2 gentoo-61d9c34970e78d9afc98ce07f9e5360be7690b13.zip |
sys-boot/tboot: Remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17607
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'sys-boot/tboot')
-rw-r--r-- | sys-boot/tboot/Manifest | 1 | ||||
-rw-r--r-- | sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch | 62 | ||||
-rw-r--r-- | sys-boot/tboot/tboot-1.9.11-r1.ebuild | 68 |
3 files changed, 0 insertions, 131 deletions
diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index 377ec022f4d8..af909f3a1a02 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1,2 +1 @@ DIST tboot-1.10.3.tar.gz 906732 BLAKE2B 4015ba84fbc273d1f1ea3f302dd11e62d1866049a31674b8967a9c1be645f88f2fdbc8614e1f7d824010e8280484885392b34aedb2d9f32654a3065e75e0bd42 SHA512 998501cfb23511adf63c0e2a70f203b3a92328cba39948a6be2e0dc6600aaaf9fcc18dc1ffcdd00c43a5d2c688c34c912c7525fd54a5c673a764c34141be4b77 -DIST tboot-1.9.11.tar.gz 709092 BLAKE2B 97b6ea5a09e1adbf1fbdc36516e0e80d3acc67469f297603125542aed8235e6533afb96e6c38885b87e4584392da40d9f65d00eced2b8a87a2ecf61a17c3a985 SHA512 5c2466438ad3ab95ca66fe4d460f4e6b31ccd3c6ac79221b129883df4180fce4878dd07a5f180bb79fae13b59fa90c05aeda7339159d1d950011a59645024b8a diff --git a/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch deleted file mode 100644 index b2459816068b..000000000000 --- a/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -r 9998b2fb83fd tboot/20_linux_tboot ---- a/tboot/20_linux_tboot Wed Apr 10 11:47:06 2019 +0200 -+++ b/tboot/20_linux_tboot Tue Jul 23 22:42:00 2019 -0500 -@@ -173,7 +173,16 @@ - EOF - } - --linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do -+machine=`uname -m` -+case "$machine" in -+ i?86) GENKERNEL_ARCH="x86" ;; -+ mips|mips64) GENKERNEL_ARCH="mips" ;; -+ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; -+ arm*) GENKERNEL_ARCH="arm" ;; -+ *) GENKERNEL_ARCH="$machine" ;; -+esac -+ -+linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do - basename=$(basename $i) - version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") - if grub_file_is_not_garbage "$i" && grep -qx "CONFIG_INTEL_TXT=y" /boot/config-${version} 2> /dev/null ; then echo -n "$i " ; fi -@@ -219,7 +228,9 @@ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -diff -r 9998b2fb83fd tboot/20_linux_xen_tboot ---- a/tboot/20_linux_xen_tboot Wed Apr 10 11:47:06 2019 +0200 -+++ b/tboot/20_linux_xen_tboot Tue Jul 23 22:42:00 2019 -0500 -@@ -167,6 +167,15 @@ - EOF - } - -+machine=`uname -m` -+case "$machine" in -+ i?86) GENKERNEL_ARCH="x86" ;; -+ mips|mips64) GENKERNEL_ARCH="mips" ;; -+ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; -+ arm*) GENKERNEL_ARCH="arm" ;; -+ *) GENKERNEL_ARCH="$machine" ;; -+esac -+ - linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do - if grub_file_is_not_garbage "$i"; then - basename=$(basename $i) -@@ -234,7 +243,9 @@ - "initrd-${version}" "initrd.img-${alt_version}" \ - "initrd-${alt_version}.img" "initrd-${alt_version}" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}" ; do -+ "initramfs-genkernel-${alt_version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break diff --git a/sys-boot/tboot/tboot-1.9.11-r1.ebuild b/sys-boot/tboot/tboot-1.9.11-r1.ebuild deleted file mode 100644 index 64a972787d85..000000000000 --- a/sys-boot/tboot/tboot-1.9.11-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic mount-boot - -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="app-crypt/trousers -app-crypt/tpm-tools -dev-libs/openssl:0=[-bindist(-)] -" - -RDEPEND="${DEPEND} -sys-boot/grub:2 -selinux? ( sec-policy/selinux-tboot )" - -DOCS=( README COPYING CHANGELOG ) -PATCHES=( "${FILESDIR}/${PN}-1.9.11-genkernel-path.patch" ) - -src_prepare() { - sed -i 's/ -Werror//g' Config.mk || die - sed -i 's/^INSTALL_STRIP = -s$//' Config.mk || die # QA Errors - - 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 lcptools/*.pdf - - cd "${ED}" - 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/" -} |