| 1 |
commit: c024aafd9e3d27ec79bcc96dc17f2a152c2bc333 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 17 23:25:11 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 17 23:25:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c024aafd |
| 7 |
|
| 8 |
sys-kernel/genkernel: fix --integrated-initramfs option |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/737598 |
| 11 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
.../genkernel-4.1.0-fix-integrated-initramfs.patch | 28 ++++++++++++++++++++++ |
| 15 |
...rnel-4.1.0.ebuild => genkernel-4.1.0-r1.ebuild} | 2 ++ |
| 16 |
2 files changed, 30 insertions(+) |
| 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-fix-integrated-initramfs.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..afe3e99dbc5 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch |
| 23 |
@@ -0,0 +1,28 @@ |
| 24 |
+--- a/gen_determineargs.sh |
| 25 |
++++ b/gen_determineargs.sh |
| 26 |
+@@ -1170,6 +1170,14 @@ determine_real_args() { |
| 27 |
+ fi |
| 28 |
+ fi |
| 29 |
+ |
| 30 |
++ if isTrue "${INTEGRATED_INITRAMFS}" |
| 31 |
++ then |
| 32 |
++ if ! isTrue "${BUILD_KERNEL}" || ! isTrue "${BUILD_RAMDISK}" |
| 33 |
++ then |
| 34 |
++ gen_die "Invalid action specified: --integrated-initramfs option requires action \"all\", i.e. building of kernel and initramfs at the same time!" |
| 35 |
++ fi |
| 36 |
++ fi |
| 37 |
++ |
| 38 |
+ if ! isTrue "${CMD_INSTALL}" |
| 39 |
+ then |
| 40 |
+ if [ -n "${KERNEL_MODULES_PREFIX}" ] |
| 41 |
+--- a/gen_funcs.sh |
| 42 |
++++ b/gen_funcs.sh |
| 43 |
+@@ -2033,7 +2033,7 @@ kconfig_set_opt() { |
| 44 |
+ else |
| 45 |
+ print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..." |
| 46 |
+ sed -i "${kconfig}" \ |
| 47 |
+- -e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \ |
| 48 |
++ -e "s|^#\? \?${optname}[ =].*|${optname}=${optval}|g" \ |
| 49 |
+ || gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'" |
| 50 |
+ |
| 51 |
+ [ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}" |
| 52 |
|
| 53 |
diff --git a/sys-kernel/genkernel/genkernel-4.1.0.ebuild b/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild |
| 54 |
similarity index 99% |
| 55 |
rename from sys-kernel/genkernel/genkernel-4.1.0.ebuild |
| 56 |
rename to sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild |
| 57 |
index f4f851fba1a..0b57d466b50 100644 |
| 58 |
--- a/sys-kernel/genkernel/genkernel-4.1.0.ebuild |
| 59 |
+++ b/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild |
| 60 |
@@ -118,6 +118,8 @@ if [[ ${PV} == 9999* ]]; then |
| 61 |
DEPEND="${DEPEND} app-text/asciidoc" |
| 62 |
fi |
| 63 |
|
| 64 |
+PATCHES=( "${FILESDIR}"/${P}-fix-integrated-initramfs.patch ) |
| 65 |
+ |
| 66 |
src_unpack() { |
| 67 |
if [[ ${PV} == 9999* ]]; then |
| 68 |
git-r3_src_unpack |
Archives