From b46b07e906bce2e6697c2c42ba2c446c2e7734b2 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Fri, 30 Dec 2016 17:52:08 +0800 Subject: sys-boot/tboot: bump to 1.9.5 Package-Manager: portage-2.3.0 --- sys-boot/tboot/Manifest | 1 + .../tboot/files/tboot-1.9.5-genkernel-path.patch | 58 +++++++++++++++++ sys-boot/tboot/tboot-1.9.5.ebuild | 72 ++++++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch create mode 100644 sys-boot/tboot/tboot-1.9.5.ebuild diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest index a627cacda386..6d9c0458aa30 100644 --- a/sys-boot/tboot/Manifest +++ b/sys-boot/tboot/Manifest @@ -1,2 +1,3 @@ DIST tboot-1.9.4.tar.gz 2107175 SHA256 7167e5615def4ac0f25b2f9139b3d361a0a20d91386d80b1d865107b3f552f39 SHA512 93db95be54a1286dffe87cf6f5d1e31ac0c4a452b11a11789fec66255c847a9e14251579de0f6ba4c5c122423b45e83751a8287d37e27ea3acba608774d7ac0b WHIRLPOOL 2bf9220317dc5bbc927fb10d07a1d7f5cef2d5351fbf81e45f276b5f317785c1cfc1f1e4b78ac426bceb66641339d7179bff8fbbb867b67aa215544193a5baa1 DIST tboot-1.9.4_p20161101.tar.gz 578097 SHA256 d6a399488fde1d0993a65bcb283cec218c7c8572972d2fdda8422fc2a1b5513f SHA512 6a38148d7be4faf8ec86f2f8e3c342321b7d8d4920a631b0e1b74bd27578039f4ae20faffae877ed8db5dd14500c059a3efd3eed24f22099820e87a67d3ecc17 WHIRLPOOL 316e3ac4965108a63ebf6075b50fb24b5c0a0c1527cb43309b95c64e60a0b6e5b3287e4b19faa8405ab10cf268b975cfd93d6348253a2d3fa07e78f38ef1eac8 +DIST tboot-1.9.5.tar.gz 685460 SHA256 c7032e367ac0129493c9bb1fcd1437f400ff5533c970119ddce281ff4d58a13f SHA512 d806b692d3d57d0aaf4095ef514a2859b2b054ec695cb5589b3a6133eec7f7a9a0e76544e4b557df02add5ed67c3c15fb3ee5f17d6438252b659d6e5c7d17fe9 WHIRLPOOL 04843854b1a646d6126079a3b46bacf0c8191d5b5c322f8bc04ea39c0d5470bba2f7f2499761d42aa258552c1dfbeb626275e7473628b21719a6fe59bc05029c diff --git a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch new file mode 100644 index 000000000000..63e67f119ced --- /dev/null +++ b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch @@ -0,0 +1,58 @@ +diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot +--- tboot-1.9.5.orig/tboot/20_linux_tboot 2016-12-30 17:37:08.625535208 +0800 ++++ tboot-1.9.5/tboot/20_linux_tboot 2016-12-30 17:42:38.405714435 +0800 +@@ -171,6 +171,14 @@ + EOF + } + ++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") +@@ -217,7 +225,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 -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xen_tboot +--- tboot-1.9.5.orig/tboot/20_linux_xen_tboot 2016-12-30 17:37:08.628535191 +0800 ++++ tboot-1.9.5/tboot/20_linux_xen_tboot 2016-12-30 17:43:39.112379262 +0800 +@@ -165,6 +165,14 @@ + EOF + } + ++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) +@@ -232,7 +240,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.5.ebuild b/sys-boot/tboot/tboot-1.9.5.ebuild new file mode 100644 index 000000000000..6e926b88e078 --- /dev/null +++ b/sys-boot/tboot/tboot-1.9.5.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +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.5-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/*.{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/" +} -- cgit v1.2.3-65-gdbad