diff mbox series

Fix Lua Handler embedding

Message ID 426FA8DA-7472-4724-98B8-BA4CAC6EFF19@siemens.com
State Accepted
Headers show
Series Fix Lua Handler embedding | expand

Commit Message

Storm, Christian Dec. 7, 2023, 3:42 p.m. UTC
Commit 5dbdcf2 removed CONFIG_HANDLER_IN_LUA, breaking
embedding Lua handlers into the SWUpdate binary.
Just remove this prohibiting guard.

Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
 Makefile.flags | 2 --
 1 file changed, 2 deletions(-)

Comments

Stefano Babic Dec. 7, 2023, 7 p.m. UTC | #1
Hi Christian,

On 07.12.23 16:42, 'Storm, Christian' via swupdate wrote:
> Commit 5dbdcf2 removed CONFIG_HANDLER_IN_LUA, breaking
> embedding Lua handlers into the SWUpdate binary.
> Just remove this prohibiting guard.
> 
> Signed-off-by: Christian Storm <christian.storm@siemens.com>
> ---
>   Makefile.flags | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/Makefile.flags b/Makefile.flags
> index a2bb2e7..95c785c 100644
> --- a/Makefile.flags
> +++ b/Makefile.flags
> @@ -118,7 +118,6 @@ LUAVER :=  $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --modversion ${CONFIG_LUAPK
>   endif
>   
>   ifeq ($(CONFIG_LUA),y)
> -ifeq ($(CONFIG_HANDLER_IN_LUA),y)
>   ifeq ($(CONFIG_EMBEDDED_LUA_HANDLER),y)
>   ifneq ($(CONFIG_EMBEDDED_LUA_HANDLER_SOURCE),)
>   LDFLAGS_swupdate += -Wl,--format=binary -Wl,$(CONFIG_EMBEDDED_LUA_HANDLER_SOURCE) -Wl,--format=default
> @@ -127,7 +126,6 @@ KBUILD_CPPFLAGS += -DEMBEDDED_LUA_SRC_END="_binary_$(subst ",,$(subst .,_,$(subs
>   endif
>   endif
>   endif
> -endif
>   
>   # Image downloading support
>   ifneq ($(CONFIG_CURL),)


Sure, thanks !

Acked-by: Stefano Babic <stefano.babic@swupdate.org>

Best regards,
Stefano
diff mbox series

Patch

diff --git a/Makefile.flags b/Makefile.flags
index a2bb2e7..95c785c 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -118,7 +118,6 @@  LUAVER :=  $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --modversion ${CONFIG_LUAPK
 endif
 
 ifeq ($(CONFIG_LUA),y)
-ifeq ($(CONFIG_HANDLER_IN_LUA),y)
 ifeq ($(CONFIG_EMBEDDED_LUA_HANDLER),y)
 ifneq ($(CONFIG_EMBEDDED_LUA_HANDLER_SOURCE),)
 LDFLAGS_swupdate += -Wl,--format=binary -Wl,$(CONFIG_EMBEDDED_LUA_HANDLER_SOURCE) -Wl,--format=default
@@ -127,7 +126,6 @@  KBUILD_CPPFLAGS += -DEMBEDDED_LUA_SRC_END="_binary_$(subst ",,$(subst .,_,$(subs
 endif
 endif
 endif
-endif
 
 # Image downloading support
 ifneq ($(CONFIG_CURL),)