diff options
author | Vinicius Aquino <voa.aquino@gmail.com> | 2021-04-12 17:25:38 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-05-14 17:47:00 -0300 |
commit | 99caa43b6b5ad3e4d19cb8e8aef329bdeabdd09d (patch) | |
tree | 6a1ea877a24b6b1f57748d2a3a49e3725412554d /recipes-graphics/wayland/weston-init.bbappend | |
parent | ac80eb42b01c3231b9763177f43f10fd1206702b (diff) | |
download | meta-freescale-99caa43b6b5ad3e4d19cb8e8aef329bdeabdd09d.tar.gz |
weston-init: Rework uncomment function logic
Fix error "Commented setting '#use-g2d=1' not found"
when building for some imx machines.
Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
(cherry picked from commit cb3020653421d46fb5308b59da1d9a1e83d99c1a)
Diffstat (limited to 'recipes-graphics/wayland/weston-init.bbappend')
-rw-r--r-- | recipes-graphics/wayland/weston-init.bbappend | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 8e590965..22ffb7ff 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend | |||
@@ -40,7 +40,7 @@ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mq = " \ | |||
40 | " | 40 | " |
41 | 41 | ||
42 | uncomment() { | 42 | uncomment() { |
43 | if ! (grep "^#$1" $2); then | 43 | if ! grep -q "^#$1" $2 && ! grep -q "^$1" $2; then |
44 | bbfatal "Commented setting '#$1' not found in file $2" | 44 | bbfatal "Commented setting '#$1' not found in file $2" |
45 | fi | 45 | fi |
46 | sed -i -e 's,^#'"$1"','"$1"',g' $2 | 46 | sed -i -e 's,^#'"$1"','"$1"',g' $2 |