[PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id()

[PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id()

[Andre McCurdy]

Although get_filesystem_id() is a private API and never gets passed
a path containing spaces or other special characters, etc, quote the
path anyway for consistency.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/classes/sanity.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 6716985..e0e57ce 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -336,7 +336,7 @@ def check_path_length(filepath, pathname, limit):
     return ""
 
 def get_filesystem_id(path):
-    status, result = oe.utils.getstatusoutput("stat -f -c '%s' %s" % ("%t", path))
+    status, result = oe.utils.getstatusoutput("stat -f -c '%s' '%s'" % ("%t", path))
     if status == 0:
         return result
     else:
-- 
1.9.1

[PATCH 2/2] package.bbclass: use single quotes for path passed to file in isELF()

[Andre McCurdy]

Apparently there are recipes in the wild which generate files with
filenames containing '$' characters - which cause errors during
packaging.

Instead of adding another special case to escape '$' characters when
constructing the command passed to oe.utils.getstatusoutput(), switch
to using single quotes to quote the path - and therefore make isELF()
consistent with the way filenames and paths are quoted by every other
caller of oe.utils.getstatusoutput() in oe-core.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 83f53a4..504c023 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -918,7 +918,7 @@ python split_and_strip_files () {
     # 16 - kernel module
     def isELF(path):
         type = 0
-        ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
+        ret, result = oe.utils.getstatusoutput("file '%s'" % path)
 
         if ret:
             msg = "split_and_strip_files: 'file %s' failed" % path
-- 
1.9.1

Re: [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id()

[Burton, Ross]

A better fix would be to not use getstatusoutput() at all, but
directly hit subprocess and pass the argument as a list.

Ross

On 24 March 2018 at 04:55, Andre McCurdy <armccurdy@gmail.com> wrote:
> Although get_filesystem_id() is a private API and never gets passed
> a path containing spaces or other special characters, etc, quote the
> path anyway for consistency.
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  meta/classes/sanity.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 6716985..e0e57ce 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -336,7 +336,7 @@ def check_path_length(filepath, pathname, limit):
>      return ""
>
>  def get_filesystem_id(path):
> -    status, result = oe.utils.getstatusoutput("stat -f -c '%s' %s" % ("%t", path))
> +    status, result = oe.utils.getstatusoutput("stat -f -c '%s' '%s'" % ("%t", path))
>      if status == 0:
>          return result
>      else:
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core