From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9101D139694 for ; Wed, 2 Aug 2017 15:41:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C25E9E0E5A; Wed, 2 Aug 2017 15:41:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93177E0E59 for ; Wed, 2 Aug 2017 15:41:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C76D341764 for ; Wed, 2 Aug 2017 15:41:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6EF775EB for ; Wed, 2 Aug 2017 15:41:24 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1501688277.7fac5fc88b4e188d8e6922fc723805ca9e75636d.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/tboot/files/, sys-boot/tboot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch sys-boot/tboot/tboot-1.9.5-r1.ebuild sys-boot/tboot/tboot-1.9.5.ebuild X-VCS-Directories: sys-boot/tboot/files/ sys-boot/tboot/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 7fac5fc88b4e188d8e6922fc723805ca9e75636d X-VCS-Branch: master Date: Wed, 2 Aug 2017 15:41:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d80ad237-c5d0-4b7e-9cec-9dd8ecc0d7d4 X-Archives-Hash: b90e63f1db5bbfee4505b496c01e3844 commit: 7fac5fc88b4e188d8e6922fc723805ca9e75636d Author: Jason Zaman gentoo org> AuthorDate: Wed Aug 2 15:37:57 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed Aug 2 15:37:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fac5fc8 sys-boot/tboot: fix grub scripts to find initrd Package-Manager: Portage-2.3.6, Repoman-2.3.1 sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch | 18 ++++++++++-------- .../{tboot-1.9.5.ebuild => tboot-1.9.5-r1.ebuild} | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) 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 index 63e67f119ce..4914be6e4e7 100644 --- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch +++ b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch @@ -1,10 +1,11 @@ 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 @@ +--- tboot-1.9.5.orig/tboot/20_linux_tboot 2016-12-21 06:29:15.000000000 +0800 ++++ tboot-1.9.5/tboot/20_linux_tboot 2017-08-02 23:33:52.732748172 +0800 +@@ -171,6 +171,15 @@ EOF } ++machine=`uname -m` +case "$machine" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; @@ -16,7 +17,7 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot 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 @@ +@@ -217,7 +226,9 @@ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ "initramfs-genkernel-${version}" \ @@ -28,12 +29,13 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot 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 @@ +--- tboot-1.9.5.orig/tboot/20_linux_xen_tboot 2016-12-21 06:29:54.000000000 +0800 ++++ tboot-1.9.5/tboot/20_linux_xen_tboot 2017-08-02 23:34:01.347685520 +0800 +@@ -165,6 +165,15 @@ EOF } ++machine=`uname -m` +case "$machine" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; @@ -45,7 +47,7 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xe 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 @@ +@@ -232,7 +241,9 @@ "initrd-${version}" "initrd.img-${alt_version}" \ "initrd-${alt_version}.img" "initrd-${alt_version}" \ "initramfs-genkernel-${version}" \ diff --git a/sys-boot/tboot/tboot-1.9.5.ebuild b/sys-boot/tboot/tboot-1.9.5-r1.ebuild similarity index 97% rename from sys-boot/tboot/tboot-1.9.5.ebuild rename to sys-boot/tboot/tboot-1.9.5-r1.ebuild index fc626a1cd83..9e6d141c268 100644 --- a/sys-boot/tboot/tboot-1.9.5.ebuild +++ b/sys-boot/tboot/tboot-1.9.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6