1 |
commit: 739d9c4c3635ed4536ef385dc4475a3f15d9f6ab |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 19 01:17:23 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 19 01:18:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739d9c4c |
7 |
|
8 |
sys-kernel/genkernel: fix --bcache option |
9 |
|
10 |
Closes: https://bugs.gentoo.org/737894 |
11 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
...itramfs.patch => genkernel-4.1.0-post-release-fixes.patch} | 11 +++++++++++ |
15 |
.../{genkernel-4.1.0-r1.ebuild => genkernel-4.1.0-r2.ebuild} | 2 +- |
16 |
2 files changed, 12 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch |
19 |
similarity index 80% |
20 |
rename from sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch |
21 |
rename to sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch |
22 |
index afe3e99dbc5..ef121d9ccc6 100644 |
23 |
--- a/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch |
24 |
+++ b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch |
25 |
@@ -26,3 +26,14 @@ |
26 |
|| gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'" |
27 |
|
28 |
[ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}" |
29 |
+--- a/gkbuilds/bcache-tools.gkbuild |
30 |
++++ b/gkbuilds/bcache-tools.gkbuild |
31 |
+@@ -6,7 +6,7 @@ src_configure() { |
32 |
+ } |
33 |
+ |
34 |
+ src_compile() { |
35 |
+- PKG_CONFIG="$(tc-getPKG_CONFIG) -static" \ |
36 |
++ PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \ |
37 |
+ gkmake V=1 |
38 |
+ } |
39 |
+ |
40 |
|
41 |
diff --git a/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild b/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild |
42 |
similarity index 99% |
43 |
rename from sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild |
44 |
rename to sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild |
45 |
index 0b57d466b50..56ac783bac6 100644 |
46 |
--- a/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild |
47 |
+++ b/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild |
48 |
@@ -118,7 +118,7 @@ if [[ ${PV} == 9999* ]]; then |
49 |
DEPEND="${DEPEND} app-text/asciidoc" |
50 |
fi |
51 |
|
52 |
-PATCHES=( "${FILESDIR}"/${P}-fix-integrated-initramfs.patch ) |
53 |
+PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch ) |
54 |
|
55 |
src_unpack() { |
56 |
if [[ ${PV} == 9999* ]]; then |