modify_pc: Modify to remove regex syntax warning

The '\s' in the regex for python means whitespace. Also, '\' is used for
escape sequence, so '\s' is ambiguous.
In python, to remove this ambiguity, '\\s' is used for whitespace.

In modify_pc.py script, '\s' is used so python raises warning. To remove
this warning, '\s' is replaced with '\\s'.

Change-Id: Ic879fa46d5919082a4b6ab8a3294dff19e61a0dc
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/modify_pc.py b/modify_pc.py
index b86e2ecaaca183698d97f722cd44cfd5ea7d6a62..771d674dece68f007ef46824e6264bd994327358 100755 (executable)
--- a/modify_pc.py
+++ b/modify_pc.py
@@ -6,9 +6,9 @@ from re import compile as regex_compile
 
 include_dir_root_path = "hal_rootstrap_dir"
 
-regex_assignment = regex_compile("\s*([-_a-zA-Z0-9]+)\s*=\s*([^\s]*)")
-regex_declaration = regex_compile("\s*([-_a-zA-Z0-9]+)\s*:\s*(.+)\s*")
-regex_substitution = regex_compile("\${([-_a-zA-Z0-9]+)}")
+regex_assignment = regex_compile("\\s*([-_a-zA-Z0-9]+)\\s*=\\s*([^\\s]*)")
+regex_declaration = regex_compile("\\s*([-_a-zA-Z0-9]+)\\s*:\\s*(.+)\\s*")
+regex_substitution = regex_compile("\\${([-_a-zA-Z0-9]+)}")
 
 libs = { "-L${" + include_dir_root_path + "}" }
 cflags = { "-I${" + include_dir_root_path + "}" }

diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec
index 5e97714dc8f2d3ddc683e47652ddee961033282d..80865830d0073186a3d39e254ce600200659efa6 100644 (file)
--- a/packaging/hal-rootstrap.spec
+++ b/packaging/hal-rootstrap.spec
@@ -14,6 +14,7 @@ ExcludeArch:  riscv64
 
 BuildRequires: cmake
 BuildRequires: xmlstarlet
+BuildRequires: python3
 
 BuildRequires: capi-base-common
 BuildRequires: capi-base-common-devel