diff mbox series

[scarthgap,08/10] classes: image_types: quote variable assignment needed by dash

Message ID a3b51197f3ce868c83ed5ca415bd6506ecc2575d.1718111104.git.steve@sakoman.com
State Accepted
Delegated to: Steve Sakoman
Headers show
Series [scarthgap,01/10] util-linux: Fix CVE-2024-28085 | expand

Commit Message

Steve Sakoman June 11, 2024, 1:07 p.m. UTC 
From: Martin Hundeb?ll <martin@geanix.com>

The change in commit 39fc503036
("classes: image_types: apply EXTRA_IMAGECMD:squashfs* in oe_mksquashfs()")
assigns $@ to a local variable without quoting it. While this works with
bash, it fails with dash. Here, only the first token of $@ is assigned
to the variable, and the reamining tokens are passed as arguments to the
"local" keyword.

Fix it by adding the missing quotes.

Signed-off-by: Martin Hundebøll <martin@geanix.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 14ca134f9f72d518c9180156a8efac19f8bb3ab0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes-recipe/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
index b4a83ae284..2f948ecbf8 100644
--- a/meta/classes-recipe/image_types.bbclass
+++ b/meta/classes-recipe/image_types.bbclass
@@ -113,7 +113,7 @@  IMAGE_CMD:btrfs () {
 
 oe_mksquashfs () {
     local comp=$1; shift
-    local extra_imagecmd=$@
+    local extra_imagecmd="$@"
 
     if [ "$comp" = "zstd" ]; then
         suffix="zst"