[PATCH 0/3] tree-wide: Kconfig update

10 views
Skip to first unread message

Daniel Braunwarth

unread,
Nov 1, 2024, 7:58:28 AM11/1/24
to swup...@googlegroups.com, Daniel Braunwarth
This series of patches updates the Kconfig files. This is a first step
to be able to use new versions of Kconfig in the future.

Daniel Braunwarth (3):
tree-wide: rename Kconfig files
kconfig: define Lua in version 5.2 as default
kconfig: add missing quotation

Kconfig | 24 ++++++++++++------------
bootloader/{Config.in => Kconfig} | 0
configs/all_handlers_defconfig | 1 -
configs/bootloader_ebg_defconfig | 1 -
configs/bootloader_grub_defconfig | 1 -
configs/bootloader_uboot_defconfig | 1 -
configs/btrfs_defconfig | 1 -
configs/cms1_defconfig | 1 -
configs/cms_defconfig | 1 -
configs/hawkbit_defconfig | 1 -
configs/mbedtls_defconfig | 1 -
configs/no_ssl_defconfig | 1 -
configs/nodwl_defconfig | 1 -
configs/raspi_defconfig | 1 -
configs/sha256_defconfig | 1 -
configs/suricatta_all_modules_defconfig | 1 -
configs/suricatta_http_defconfig | 1 -
configs/swuforwarder_defconfig | 1 -
configs/test_defconfig | 1 -
configs/with_ebg_defconfig | 1 -
configs/with_lua_handlers_defconfig | 1 -
configs/with_lua_nohandlers_defconfig | 1 -
configs/with_rdiff_defconfig | 1 -
configs/with_systemd_defconfig | 1 -
configs/with_ucfw_defconfig | 1 -
configs/without_libconfig_defconfig | 1 -
containers/{Config.in => Kconfig} | 0
doc/source/bootloader_interface.rst | 2 +-
doc/source/suricatta.rst | 2 +-
fs/{Config.in => Kconfig} | 0
handlers/{Config.in => Kconfig} | 2 +-
mongoose/{Config.in => Kconfig} | 0
parser/{Config.in => Kconfig} | 0
suricatta/{Config.in => Kconfig} | 0
34 files changed, 15 insertions(+), 39 deletions(-)
rename bootloader/{Config.in => Kconfig} (100%)
rename containers/{Config.in => Kconfig} (100%)
rename fs/{Config.in => Kconfig} (100%)
rename handlers/{Config.in => Kconfig} (99%)
rename mongoose/{Config.in => Kconfig} (100%)
rename parser/{Config.in => Kconfig} (100%)
rename suricatta/{Config.in => Kconfig} (100%)

--
2.45.2

Daniel Braunwarth

unread,
Nov 1, 2024, 7:58:28 AM11/1/24
to swup...@googlegroups.com, Daniel Braunwarth
Naming the Kconfig files Config.in seems to be outdated.

Let's align the naming in the SWUpdate code to be consistent with other
projects (like Linux kernel, Zephyr, u-boot, ...).

Signed-off-by: Daniel Braunwarth <o...@braunwarth.dev>
---
Kconfig | 12 ++++++------
bootloader/{Config.in => Kconfig} | 0
containers/{Config.in => Kconfig} | 0
doc/source/bootloader_interface.rst | 2 +-
doc/source/suricatta.rst | 2 +-
fs/{Config.in => Kconfig} | 0
handlers/{Config.in => Kconfig} | 2 +-
mongoose/{Config.in => Kconfig} | 0
parser/{Config.in => Kconfig} | 0
suricatta/{Config.in => Kconfig} | 0
10 files changed, 9 insertions(+), 9 deletions(-)
rename bootloader/{Config.in => Kconfig} (100%)
rename containers/{Config.in => Kconfig} (100%)
rename fs/{Config.in => Kconfig} (100%)
rename handlers/{Config.in => Kconfig} (99%)
rename mongoose/{Config.in => Kconfig} (100%)
rename parser/{Config.in => Kconfig} (100%)
rename suricatta/{Config.in => Kconfig} (100%)

diff --git a/Kconfig b/Kconfig
index 7139617..c09413c 100644
--- a/Kconfig
+++ b/Kconfig
@@ -359,7 +359,7 @@ endmenu

comment "Bootloader support"

-source bootloader/Config.in
+source "bootloader/Kconfig"


comment Interfaces
@@ -390,9 +390,9 @@ config CHANNEL_CURL
depends on HAVE_LIBCURL
select CURL

-source suricatta/Config.in
+source "suricatta/Kconfig"

-source mongoose/Config.in
+source "mongoose/Kconfig"

comment Security

@@ -534,10 +534,10 @@ config ZSTD
depends on HAVE_ZSTD

comment Parsers
-source parser/Config.in
+source "parser/Kconfig"

comment Handlers
-source handlers/Config.in
+source "handlers/Kconfig"

comment Containers
-source containers/Config.in
+source "containers/Kconfig"
diff --git a/bootloader/Config.in b/bootloader/Kconfig
similarity index 100%
rename from bootloader/Config.in
rename to bootloader/Kconfig
diff --git a/containers/Config.in b/containers/Kconfig
similarity index 100%
rename from containers/Config.in
rename to containers/Kconfig
diff --git a/doc/source/bootloader_interface.rst b/doc/source/bootloader_interface.rst
index 8527aec..8c32259 100644
--- a/doc/source/bootloader_interface.rst
+++ b/doc/source/bootloader_interface.rst
@@ -115,7 +115,7 @@ build system.

First, the bootloader support implementation, named "trunk" and implemented
in ``bootloader/trunk.c`` for example, needs to be added to
-``bootloader/Config.in`` in the ``Bootloader Interfaces`` menu as
+``bootloader/Kconfig`` in the ``Bootloader Interfaces`` menu as
follows:

.. code-block:: kconfig
diff --git a/doc/source/suricatta.rst b/doc/source/suricatta.rst
index fad9920..e9b18a9 100644
--- a/doc/source/suricatta.rst
+++ b/doc/source/suricatta.rst
@@ -139,7 +139,7 @@ The type ``server_op_res_t`` is defined in ``include/suricatta/suricatta.h``.
It represents the valid function return codes for a server's implementation.

In addition to implementing the particular channel and server, the
-``suricatta/Config.in`` file has to be adapted to include a new option
+``suricatta/Kconfig`` file has to be adapted to include a new option
so that the new implementation becomes selectable in SWUpdate's
configuration. In the simplest case, adding an option like the following
one for hawkBit into the ``menu "Server"`` section is sufficient.
diff --git a/fs/Config.in b/fs/Kconfig
similarity index 100%
rename from fs/Config.in
rename to fs/Kconfig
diff --git a/handlers/Config.in b/handlers/Kconfig
similarity index 99%
rename from handlers/Config.in
rename to handlers/Kconfig
index ca47364..152bc08 100644
--- a/handlers/Config.in
+++ b/handlers/Kconfig
@@ -106,7 +106,7 @@ config DISKFORMAT_HANDLER
The diskformat handler allows creating filesystems on empty
partitions.

-source fs/Config.in
+source "fs/Kconfig"

config LUASCRIPTHANDLER
bool "Lua Script"
diff --git a/mongoose/Config.in b/mongoose/Kconfig
similarity index 100%
rename from mongoose/Config.in
rename to mongoose/Kconfig
diff --git a/parser/Config.in b/parser/Kconfig
similarity index 100%
rename from parser/Config.in
rename to parser/Kconfig
diff --git a/suricatta/Config.in b/suricatta/Kconfig
similarity index 100%
rename from suricatta/Config.in
rename to suricatta/Kconfig
--
2.45.2

Stefano Babic

unread,
Nov 1, 2024, 8:50:14 AM11/1/24
to Daniel Braunwarth, swup...@googlegroups.com
Reviewed-by : Stefano Babic <stefan...@swupdate.org>

Best regards,
Stefano Babic
Reply all
Reply to author
Forward
0 new messages