* [Buildroot] [RESEND PATCH v2 1/2] package/pkg-kconfig.mk new <pkg>-show-fragment target
@ 2023-03-20 11:09 Marcus Folkesson
2023-03-20 11:09 ` [Buildroot] [RESEND PATCH v2 2/2] docs/manual: update pkg-kconfig doc about <pkg>-show-fragment Marcus Folkesson
0 siblings, 1 reply; 3+ messages in thread
From: Marcus Folkesson @ 2023-03-20 11:09 UTC (permalink / raw)
To: buildroot; +Cc: Marcus Folkesson, Thomas De Schampheleire
This patch introduce the new target to simplify the generation of
configuration fragments as the output could be directly copied into a
fragment file as-is.
It is *heavily* based on the <pkg>-diff-config target, but serves a
different purpose.
Output from linux-diff-config:
-CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK y
-CONFIG_GCC_PLUGIN_CYC_COMPLEXITY n
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY n
-CONFIG_GCC_PLUGIN_RANDSTRUCT n
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF n
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL n
-CONFIG_GCC_PLUGIN_STRUCTLEAK_USER n
-CONFIG_STACKPROTECTOR_PER_TASK y
CONFIG_CRYPTO_DH n -> y
CONFIG_CRYPTO_KPP m -> y
CONFIG_GCC_PLUGINS y -> n
CONFIG_KEY_DH_OPERATIONS n -> y
CONFIG_PKCS8_PRIVATE_KEY_PARSER n -> y
CONFIG_VIDEO_IMX274 n -> m
Output from linux-show-fragment:
CONFIG_CRYPTO_DH=y
CONFIG_CRYPTO_KPP=y
CONFIG_KEY_DH_OPERATIONS=y
CONFIG_PKCS8_PRIVATE_KEY_PARSER=y
CONFIG_VIDEO_IMX274=m
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
package/pkg-kconfig.mk | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index f4f35bf96a..ee96525c47 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -309,12 +309,26 @@ $(1)-diff-config: $(1)-check-configuration-done
$$(Q)cp -a $$($(2)_DIR)/.config.dc.bak $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG)
$$(Q)rm -f $$($(2)_DIR)/.config.dc.bak
+# Target to output differences between the configuration obtained via the
+# defconfig + fragments (if any) and the current configuration.
+# Output format is suitable to be used as-is in fragment files.
+# Note: it preserves the timestamp of the current configuration when moving it
+# around.
+$(1)-show-fragment: $(1)-check-configuration-done
+ $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_DIR)/.config.dc.bak
+ $$(call kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\
+ $$($(2)_KCONFIG_FRAGMENT_FILES))
+ $$(Q)utils/diffconfig -m $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) \
+ $$($(2)_DIR)/.config.dc.bak
+ $$(Q)cp -a $$($(2)_DIR)/.config.dc.bak $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG)
+ $$(Q)rm -f $$($(2)_DIR)/.config.dc.bak
endif # package enabled
.PHONY: \
$(1)-diff-config \
$(1)-check-configuration-done \
+ $(1)-show-fragment \
$$($(2)_DIR)/.kconfig_editor_% \
$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS))
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [RESEND PATCH v2 2/2] docs/manual: update pkg-kconfig doc about <pkg>-show-fragment
2023-03-20 11:09 [Buildroot] [RESEND PATCH v2 1/2] package/pkg-kconfig.mk new <pkg>-show-fragment target Marcus Folkesson
@ 2023-03-20 11:09 ` Marcus Folkesson
0 siblings, 0 replies; 3+ messages in thread
From: Marcus Folkesson @ 2023-03-20 11:09 UTC (permalink / raw)
To: buildroot; +Cc: Marcus Folkesson, Thomas De Schampheleire
Describe this new target.
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
docs/manual/adding-packages-kconfig.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
index a35681775f..b67430c85f 100644
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -45,9 +45,11 @@ This snippet creates the following make targets:
* +foo-diff-config+, which outputs the differences between the current
configuration and the one defined in the Buildroot configuration for
- this kconfig package. The output is useful to identify the
- configuration changes that may have to be propagated to
- configuration fragments for example.
+ this kconfig package. The output is useful to identify
+ configuration changes.
+
+* +foo-show-fragment+, Similiar to +foo-diff-config+, but with an output
+ format more suitable to be used in fragment files.
and ensures that the source configuration file is copied to the build
directory at the right moment.
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [RESEND PATCH v2 2/2] docs/manual: update pkg-kconfig doc about <pkg>-show-fragment
2023-04-16 15:13 [Buildroot] [RESEND PATCH v2 1/2] package/pkg-kconfig.mk new <pkg>-show-fragment target Marcus Folkesson
@ 2023-04-16 15:13 ` Marcus Folkesson
0 siblings, 0 replies; 3+ messages in thread
From: Marcus Folkesson @ 2023-04-16 15:13 UTC (permalink / raw)
To: buildroot; +Cc: Marcus Folkesson, Thomas De Schampheleire
Describe this new target.
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
docs/manual/adding-packages-kconfig.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
index a35681775f..b67430c85f 100644
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -45,9 +45,11 @@ This snippet creates the following make targets:
* +foo-diff-config+, which outputs the differences between the current
configuration and the one defined in the Buildroot configuration for
- this kconfig package. The output is useful to identify the
- configuration changes that may have to be propagated to
- configuration fragments for example.
+ this kconfig package. The output is useful to identify
+ configuration changes.
+
+* +foo-show-fragment+, Similiar to +foo-diff-config+, but with an output
+ format more suitable to be used in fragment files.
and ensures that the source configuration file is copied to the build
directory at the right moment.
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-16 15:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-20 11:09 [Buildroot] [RESEND PATCH v2 1/2] package/pkg-kconfig.mk new <pkg>-show-fragment target Marcus Folkesson
2023-03-20 11:09 ` [Buildroot] [RESEND PATCH v2 2/2] docs/manual: update pkg-kconfig doc about <pkg>-show-fragment Marcus Folkesson
2023-04-16 15:13 [Buildroot] [RESEND PATCH v2 1/2] package/pkg-kconfig.mk new <pkg>-show-fragment target Marcus Folkesson
2023-04-16 15:13 ` [Buildroot] [RESEND PATCH v2 2/2] docs/manual: update pkg-kconfig doc about <pkg>-show-fragment Marcus Folkesson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).