mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-31 23:08:09 -07:00
sys-kernel/genkernel: fix --integrated-initramfs option
Closes: https://bugs.gentoo.org/737598 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
--- 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}"
|
||||
@@ -118,6 +118,8 @@ if [[ ${PV} == 9999* ]]; then
|
||||
DEPEND="${DEPEND} app-text/asciidoc"
|
||||
fi
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-fix-integrated-initramfs.patch )
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
git-r3_src_unpack
|
||||
Reference in New Issue
Block a user