1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Origin: upstream, b40e31fd88d7ea34105c20f30635603a37f9b828
From: "Storm, Christian" <christian.storm@siemens.com>
Date: Tue, 27 May 2025 07:36:27 +0000
Subject: suricatta: Fix filename mangling for Lua embedding
With commit 16554cd, CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE
is expanded to a fully qualified path, i.e., no longer
relative to SWUpdate's source directory and hence under
SWUpdate's naming control.
Thus, more characters allowed in filenames but not in a
C identifier must be handled.
Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
Makefile.flags | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.flags b/Makefile.flags
index d65f0db4..38c14078 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -267,8 +267,8 @@ ifneq ($(findstring /, $(firstword $(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE))),)
CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE := $(srctree)/$(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE)
endif
LDFLAGS_swupdate += -Wl,--format=binary -Wl,$(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE) -Wl,--format=default
-KBUILD_CPPFLAGS += -DEMBEDDED_SURICATTA_LUA_SOURCE_START="_binary_$(subst ",,$(subst .,_,$(subst /,_,$(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE))))_start"
-KBUILD_CPPFLAGS += -DEMBEDDED_SURICATTA_LUA_SOURCE_END="_binary_$(subst ",,$(subst .,_,$(subst /,_,$(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE))))_end"
+KBUILD_CPPFLAGS += -DEMBEDDED_SURICATTA_LUA_SOURCE_START="_binary_$(strip $(subst -,_,$(subst +,_,$(subst ",,$(subst .,_,$(subst /,_,$(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE)))))))_start"
+KBUILD_CPPFLAGS += -DEMBEDDED_SURICATTA_LUA_SOURCE_END="_binary_$(strip $(subst -,_,$(subst +,_,$(subst ",,$(subst .,_,$(subst /,_,$(CONFIG_EMBEDDED_SURICATTA_LUA_SOURCE)))))))_end"
endif
endif
endif
|
