mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-boot/tboot: drop old
Package-Manager: portage-2.2.28
This commit is contained in:
Jason Zaman
@@ -1,2 +1 @@
|
||||
DIST tboot-1.8.3.tar.gz 554084 SHA256 2f2e0c3865b45691f76b31730c5aaea2f076e7949ee6309e78ed7f80d8c53d39 SHA512 cde961af07c64a7d8b77f64d48e6d9230048135420e78efc6277f32e4df78012b5bbd73e4f2ce1cd6194091ec306cc84c65356865815a7311e140fd2b94f6443 WHIRLPOOL 030ab29ee710c6201e894abfd693944490c157b2607425dd6d476f836a635ee7f82c29180ad13fc80508596dc62148aa1c108bd7aba1c9ca7329f99197d97db6
|
||||
DIST tboot-1.9.4.tar.gz 2107175 SHA256 7167e5615def4ac0f25b2f9139b3d361a0a20d91386d80b1d865107b3f552f39 SHA512 93db95be54a1286dffe87cf6f5d1e31ac0c4a452b11a11789fec66255c847a9e14251579de0f6ba4c5c122423b45e83751a8287d37e27ea3acba608774d7ac0b WHIRLPOOL 2bf9220317dc5bbc927fb10d07a1d7f5cef2d5351fbf81e45f276b5f317785c1cfc1f1e4b78ac426bceb66641339d7179bff8fbbb867b67aa215544193a5baa1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
diff -ur tboot-1.8.2.orig/tboot/common/shutdown.S tboot-1.8.2/tboot/common/shutdown.S
|
||||
--- tboot-1.8.2.orig/tboot/common/shutdown.S 2014-07-28 12:24:22.000000000 +0400
|
||||
+++ tboot-1.8.2/tboot/common/shutdown.S 2015-05-07 03:05:47.300985413 +0400
|
||||
@@ -34,6 +34,11 @@
|
||||
*/
|
||||
|
||||
compat_mode_entry:
|
||||
+ /* Disable PCID */
|
||||
+ movl %cr4, %eax
|
||||
+ andl $~CR4_PCIDE, %eax
|
||||
+ movl %eax, %cr4
|
||||
+
|
||||
/* Disable paging and therefore leave 64 bit mode. */
|
||||
movl %cr0, %eax
|
||||
andl $~CR0_PG, %eax
|
||||
diff -ur tboot-1.8.2.orig/tboot/include/processor.h tboot-1.8.2/tboot/include/processor.h
|
||||
--- tboot-1.8.2.orig/tboot/include/processor.h 2014-07-28 12:24:22.000000000 +0400
|
||||
+++ tboot-1.8.2/tboot/include/processor.h 2015-05-07 03:04:58.721244858 +0400
|
||||
@@ -92,6 +92,7 @@
|
||||
#define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */
|
||||
#define CR4_VMXE 0x00002000/* enable VMX */
|
||||
#define CR4_SMXE 0x00004000/* enable SMX */
|
||||
+#define CR4_PCIDE 0x00020000/* enable PCID */
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
diff -ru tboot-1.8.2.orig/tboot/20_linux_tboot tboot-1.8.2/tboot/20_linux_tboot
|
||||
--- tboot-1.8.2.orig/tboot/20_linux_tboot 2014-08-02 00:18:58.397147454 +0400
|
||||
+++ tboot-1.8.2/tboot/20_linux_tboot 2014-08-02 00:20:09.766700748 +0400
|
||||
@@ -121,6 +121,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]-* ; do
|
||||
basename=$(basename $i)
|
||||
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
||||
@@ -159,6 +168,8 @@
|
||||
"initrd-${version}" "initramfs-${version}.img" \
|
||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
||||
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
||||
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
|
||||
"initramfs-genkernel-${version}" \
|
||||
"initramfs-genkernel-${alt_version}"; do
|
||||
if test -e "${dirname}/${i}" ; then
|
||||
diff -ru tboot-1.8.2.orig/tboot/20_linux_xen_tboot tboot-1.8.2/tboot/20_linux_xen_tboot
|
||||
--- tboot-1.8.2.orig/tboot/20_linux_xen_tboot 2014-08-02 00:18:58.397147454 +0400
|
||||
+++ tboot-1.8.2/tboot/20_linux_xen_tboot 2014-08-02 00:21:12.840438230 +0400
|
||||
@@ -147,6 +147,16 @@
|
||||
if [ "x${linux_list}" = "x" ] ; then
|
||||
exit 0
|
||||
fi
|
||||
+
|
||||
+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
|
||||
+
|
||||
xen_list=`for i in /boot/xen*; do
|
||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
done`
|
||||
@@ -188,6 +198,8 @@
|
||||
for i in "initrd.img-${version}" "initrd-${version}.img" \
|
||||
"initrd-${version}" "initrd.img-${alt_version}" \
|
||||
"initrd-${alt_version}.img" "initrd-${alt_version}" \
|
||||
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
||||
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
|
||||
"initramfs-genkernel-${version}" \
|
||||
"initramfs-genkernel-${alt_version}" ; do
|
||||
if test -e "${dirname}/${i}" ; then
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -ur tboot-1.8.2.orig/tboot/Config.mk tboot-1.8.2/tboot/Config.mk
|
||||
--- tboot-1.8.2.orig/tboot/Config.mk 2014-07-28 12:24:21.000000000 +0400
|
||||
+++ tboot-1.8.2/tboot/Config.mk 2015-05-05 02:14:26.333222301 +0400
|
||||
@@ -30,6 +30,7 @@
|
||||
CFLAGS += $(call cc-option,$(CC),-nopie,)
|
||||
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
|
||||
+CFLAGS += $(call cc-option,$(CC),-fstack-check=no,)
|
||||
|
||||
# changeset variable for banner
|
||||
CFLAGS += -DTBOOT_CHANGESET=\""$(shell ((hg parents --template "{isodate|isodate} {rev}:{node|short}" >/dev/null && hg parents --template "{isodate|isodate} {rev}:{node|short}") || echo "2014-07-28 12:00 +0800 1.8.2") 2>/dev/null)"\"
|
||||
@@ -1,73 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
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"
|
||||
|
||||
RESTRICT="test" # test is restricted because it requires patching the kernel src
|
||||
|
||||
DEPEND="app-crypt/trousers
|
||||
app-crypt/tpm-tools"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
sys-boot/grub:2
|
||||
selinux? ( sec-policy/selinux-tboot )"
|
||||
|
||||
DOCS=(README COPYING CHANGELOG)
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/tboot-1.8.2-genkernel_arch.patch"
|
||||
epatch "${FILESDIR}/tboot-1.8.2-stack-check-no.patch" # breaks with ssp
|
||||
epatch "${FILESDIR}/tboot-1.8.2-disable-pcid.patch" # PaX enables pcid
|
||||
|
||||
sed -i 's/ -Werror//g' Config.mk || die
|
||||
sed -i 's/^INSTALL_STRIP = -s$//' Config.mk || die # QA Errors
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
|
||||
|
||||
if use amd64; then
|
||||
MAKEARGS="TARGET_ARCH=x86_64"
|
||||
else
|
||||
MAKEARGS="TARGET_ARCH=i686"
|
||||
fi
|
||||
|
||||
emake debug=y ${MAKEARGS} build
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DISTDIR="${D}" install
|
||||
|
||||
dodoc "${DOCS[@]}"
|
||||
dodoc docs/*.txt lcptools/*.{txt,pdf} || die "docs failed"
|
||||
|
||||
cd "${D}"
|
||||
mkdir -p usr/lib/tboot/ || die
|
||||
mv boot usr/lib/tboot/ || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
mount-boot_mount_boot_partition
|
||||
|
||||
cp ${ROOT%/}/usr/lib/tboot/boot/* ${ROOT%/}/boot/
|
||||
|
||||
mount-boot_pkg_postinst
|
||||
|
||||
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/"
|
||||
}
|
||||
Reference in New Issue
Block a user