| 1 |
commit: 7fac5fc88b4e188d8e6922fc723805ca9e75636d |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 2 15:37:57 2017 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 2 15:37:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fac5fc8 |
| 7 |
|
| 8 |
sys-boot/tboot: fix grub scripts to find initrd |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch | 18 ++++++++++-------- |
| 13 |
.../{tboot-1.9.5.ebuild => tboot-1.9.5-r1.ebuild} | 2 +- |
| 14 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index 63e67f119ce..4914be6e4e7 100644 |
| 18 |
--- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch |
| 19 |
+++ b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch |
| 20 |
@@ -1,10 +1,11 @@ |
| 21 |
diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot |
| 22 |
---- tboot-1.9.5.orig/tboot/20_linux_tboot 2016-12-30 17:37:08.625535208 +0800 |
| 23 |
-+++ tboot-1.9.5/tboot/20_linux_tboot 2016-12-30 17:42:38.405714435 +0800 |
| 24 |
-@@ -171,6 +171,14 @@ |
| 25 |
+--- tboot-1.9.5.orig/tboot/20_linux_tboot 2016-12-21 06:29:15.000000000 +0800 |
| 26 |
++++ tboot-1.9.5/tboot/20_linux_tboot 2017-08-02 23:33:52.732748172 +0800 |
| 27 |
+@@ -171,6 +171,15 @@ |
| 28 |
EOF |
| 29 |
} |
| 30 |
|
| 31 |
++machine=`uname -m` |
| 32 |
+case "$machine" in |
| 33 |
+ i?86) GENKERNEL_ARCH="x86" ;; |
| 34 |
+ mips|mips64) GENKERNEL_ARCH="mips" ;; |
| 35 |
@@ -16,7 +17,7 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot |
| 36 |
linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do |
| 37 |
basename=$(basename $i) |
| 38 |
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") |
| 39 |
-@@ -217,7 +225,9 @@ |
| 40 |
+@@ -217,7 +226,9 @@ |
| 41 |
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \ |
| 42 |
"initrd-${alt_version}" "initramfs-${alt_version}.img" \ |
| 43 |
"initramfs-genkernel-${version}" \ |
| 44 |
@@ -28,12 +29,13 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot |
| 45 |
initrd="$i" |
| 46 |
break |
| 47 |
diff -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xen_tboot |
| 48 |
---- tboot-1.9.5.orig/tboot/20_linux_xen_tboot 2016-12-30 17:37:08.628535191 +0800 |
| 49 |
-+++ tboot-1.9.5/tboot/20_linux_xen_tboot 2016-12-30 17:43:39.112379262 +0800 |
| 50 |
-@@ -165,6 +165,14 @@ |
| 51 |
+--- tboot-1.9.5.orig/tboot/20_linux_xen_tboot 2016-12-21 06:29:54.000000000 +0800 |
| 52 |
++++ tboot-1.9.5/tboot/20_linux_xen_tboot 2017-08-02 23:34:01.347685520 +0800 |
| 53 |
+@@ -165,6 +165,15 @@ |
| 54 |
EOF |
| 55 |
} |
| 56 |
|
| 57 |
++machine=`uname -m` |
| 58 |
+case "$machine" in |
| 59 |
+ i?86) GENKERNEL_ARCH="x86" ;; |
| 60 |
+ mips|mips64) GENKERNEL_ARCH="mips" ;; |
| 61 |
@@ -45,7 +47,7 @@ diff -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xe |
| 62 |
linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do |
| 63 |
if grub_file_is_not_garbage "$i"; then |
| 64 |
basename=$(basename $i) |
| 65 |
-@@ -232,7 +240,9 @@ |
| 66 |
+@@ -232,7 +241,9 @@ |
| 67 |
"initrd-${version}" "initrd.img-${alt_version}" \ |
| 68 |
"initrd-${alt_version}.img" "initrd-${alt_version}" \ |
| 69 |
"initramfs-genkernel-${version}" \ |
| 70 |
|
| 71 |
diff --git a/sys-boot/tboot/tboot-1.9.5.ebuild b/sys-boot/tboot/tboot-1.9.5-r1.ebuild |
| 72 |
similarity index 97% |
| 73 |
rename from sys-boot/tboot/tboot-1.9.5.ebuild |
| 74 |
rename to sys-boot/tboot/tboot-1.9.5-r1.ebuild |
| 75 |
index fc626a1cd83..9e6d141c268 100644 |
| 76 |
--- a/sys-boot/tboot/tboot-1.9.5.ebuild |
| 77 |
+++ b/sys-boot/tboot/tboot-1.9.5-r1.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2016 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI=6 |
Archives