diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-08-19 03:17:23 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-19 03:18:21 +0200 |
| commit | 739d9c4c3635ed4536ef385dc4475a3f15d9f6ab (patch) | |
| tree | c9b46720f32358e22865dc9746d1e8d4995df926 /sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch | |
| parent | dev-python/tox: Stabilize 3.17.1 ALLARCHES, #737796 (diff) | |
| download | gentoo-739d9c4c3635ed4536ef385dc4475a3f15d9f6ab.tar.gz gentoo-739d9c4c3635ed4536ef385dc4475a3f15d9f6ab.tar.bz2 gentoo-739d9c4c3635ed4536ef385dc4475a3f15d9f6ab.zip | |
sys-kernel/genkernel: fix --bcache option
Closes: https://bugs.gentoo.org/737894
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch')
| -rw-r--r-- | sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch new file mode 100644 index 000000000000..ef121d9ccc60 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch @@ -0,0 +1,39 @@ +--- a/gen_determineargs.sh ++++ b/gen_determineargs.sh +@@ -1170,6 +1170,14 @@ determine_real_args() { + fi + fi + ++ if isTrue "${INTEGRATED_INITRAMFS}" ++ then ++ if ! isTrue "${BUILD_KERNEL}" || ! isTrue "${BUILD_RAMDISK}" ++ then ++ gen_die "Invalid action specified: --integrated-initramfs option requires action \"all\", i.e. building of kernel and initramfs at the same time!" ++ fi ++ fi ++ + if ! isTrue "${CMD_INSTALL}" + then + if [ -n "${KERNEL_MODULES_PREFIX}" ] +--- a/gen_funcs.sh ++++ b/gen_funcs.sh +@@ -2033,7 +2033,7 @@ kconfig_set_opt() { + else + print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..." + sed -i "${kconfig}" \ +- -e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \ ++ -e "s|^#\? \?${optname}[ =].*|${optname}=${optval}|g" \ + || gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'" + + [ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}" +--- a/gkbuilds/bcache-tools.gkbuild ++++ b/gkbuilds/bcache-tools.gkbuild +@@ -6,7 +6,7 @@ src_configure() { + } + + src_compile() { +- PKG_CONFIG="$(tc-getPKG_CONFIG) -static" \ ++ PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \ + gkmake V=1 + } + |