Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/rear/files/
Date: Sun, 27 Sep 2020 00:15:02
Message-Id: 1601165687.6388dbe41ac1ff266f9caee1112e188f9bfb7f60.conikost@gentoo
1 commit: 6388dbe41ac1ff266f9caee1112e188f9bfb7f60
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 26 14:33:51 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 00:14:47 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6388dbe4
7
8 app-backup/rear: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/17682
11 Package-Manager: Portage-3.0.8, Repoman-3.0.1
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../rear-1.15-add-support-for-gentoo-kernels.patch | 19 -------------------
16 1 file changed, 19 deletions(-)
17
18 diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
19 deleted file mode 100644
20 index 60868541867..00000000000
21 --- a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
22 +++ /dev/null
23 @@ -1,19 +0,0 @@
24 -diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
25 -index 6816f37..ec437e4 100644
26 ---- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
27 -+++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
28 -@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then
29 - else
30 - Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]"
31 - fi
32 -+ elif [ -f /etc/gentoo-release ]; then
33 -+ if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then
34 -+ KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}"
35 -+ elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then
36 -+ KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}"
37 -+ else
38 -+ Error "Could not find Gentoo kernel"
39 -+ fi
40 - else
41 - Error "Could not find a matching kernel in /boot !"
42 - fi