Commit 095f2e98 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

infra/pkg-kconfig: join comments to the related code-block



The current layout of comments wrt. to the related code-blocks is a bit
hard to handle visually.

Remove empty lines between the comments and their respective related
code-blocks.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 9598aa9d
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -32,36 +32,30 @@ define inner-kconfig-package
$(call inner-generic-package,$(1),$(2),$(3),$(4))

# Default values

$(2)_KCONFIG_EDITORS ?= menuconfig
$(2)_KCONFIG_OPT ?=
$(2)_KCONFIG_FIXUP_CMDS ?=

# FOO_KCONFIG_FILE is required

ifndef $(2)_KCONFIG_FILE
$$(error Internal error: no value specified for $(2)_KCONFIG_FILE)
endif

# The .config file is obtained by copying it from the specified source
# configuration file, after the package has been patched.

$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) | $(1)-patch
	$$(INSTALL) -m 0644 $$($(2)_KCONFIG_FILE) $$($(2)_DIR)/.config

# In order to get a usable, consistent configuration, some fixup may be needed.
# The exact rules are specified by the package .mk file.

$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
	$$($(2)_KCONFIG_FIXUP_CMDS)
	$$(Q)touch $$@

# Before running configure, the configuration file should be present and fixed

$$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done

# Configuration editors (menuconfig, ...)

$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.stamp_kconfig_fixup_done
	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
		$$($(2)_KCONFIG_OPT) $$(subst $(1)-,,$$@)
@@ -69,7 +63,6 @@ $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.stamp_kconfig_fixup_
	rm -f $$($(2)_DIR)/.stamp_{target,staging}_installed

# Target to copy back the configuration to the source configuration file

$(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
	cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)