From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 17 Feb 2020 01:16:38 +0000
Subject: gentoo resync : 17.02.2020

---
 .../tboot/files/tboot-1.9.11-genkernel-path.patch  | 62 ++++++++++++++++++++++
 .../tboot/files/tboot-1.9.5-genkernel-path.patch   | 60 ---------------------
 2 files changed, 62 insertions(+), 60 deletions(-)
 create mode 100644 sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch
 delete mode 100644 sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch

(limited to 'sys-boot/tboot/files')

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
new file mode 100644
index 000000000000..b2459816068b
--- /dev/null
+++ b/sys-boot/tboot/files/tboot-1.9.11-genkernel-path.patch
@@ -0,0 +1,62 @@
+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/files/tboot-1.9.5-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch
deleted file mode 100644
index 4914be6e4e7d..000000000000
--- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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-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" ;;
-+    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 +226,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-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" ;;
-+    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 +241,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
-- 
cgit v1.2.3