* [morty][PATCH 2/3] package.bbclass: Add '-b' option to file call in isELF
2018-05-25 19:16 [morty][PATCH 1/3] package.bbclass: use single quotes for path passed to file in isELF() Andre McCurdy
@ 2018-05-25 19:16 ` Andre McCurdy
2018-05-25 19:16 ` [morty][PATCH 3/3] staging.bbclass: use single quotes for path passed to file in is_elf() Andre McCurdy
2018-05-28 14:19 ` [morty][PATCH 1/3] package.bbclass: use single quotes for path passed to file in isELF() akuster808
2 siblings, 0 replies; 4+ messages in thread
From: Andre McCurdy @ 2018-05-25 19:16 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
The isELF function works by running:
result = file <pathname>
if 'ELF' in result
By default 'file' will prepend the result with the path name of the file
that is being checked. This usually works fine, such as:
$ file /home/foo/openembedded-core/meta/classes/package.bbclass
/home/foo/openembedded-core/meta/classes/package.bbclass: Python script, ASCII text executable, with very long lines
However, if the path includes 'ELF', ELF will end up in the result, and then
the check will return positive.
$ file /home/ELF/openembedded-core/meta/classes/package.bbclass
/home/ELF/openembedded-core/meta/classes/package.bbclass: Python script, ASCII text executable, with very long lines
This will then result in the isELF coming back true, and possibly causing the
checks that use isELF, such as the 'is it already stripped' check, to do the
incorrect thing.
Adding the '-b' option to file will result in the path being omitted in the
result:
$ file /home/ELF/openembedded-core/meta/classes/package.bbclass
Python script, ASCII text executable, with very long lines
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 5a324e9b2cf6378f8eaa4e394f9cb36d4e2680ac)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/classes/package.bbclass | 2 +-
meta/classes/staging.bbclass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 531ca4a..8e89cee 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -892,7 +892,7 @@ python split_and_strip_files () {
# 16 - kernel module
def isELF(path):
type = 0
- ret, result = oe.utils.getstatusoutput("file '%s'" % path)
+ ret, result = oe.utils.getstatusoutput("file -b '%s'" % path)
if ret:
msg = "split_and_strip_files: 'file %s' failed" % path
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index bfabd06..033bd5c 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -83,7 +83,7 @@ python sysroot_strip () {
# 16 - kernel module
def isELF(path):
type = 0
- ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
+ ret, result = oe.utils.getstatusoutput("file -b \"%s\"" % path.replace("\"", "\\\""))
if ret:
bb.error("split_and_strip_files: 'file %s' failed" % path)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [morty][PATCH 1/3] package.bbclass: use single quotes for path passed to file in isELF()
2018-05-25 19:16 [morty][PATCH 1/3] package.bbclass: use single quotes for path passed to file in isELF() Andre McCurdy
2018-05-25 19:16 ` [morty][PATCH 2/3] package.bbclass: Add '-b' option to file call in isELF Andre McCurdy
2018-05-25 19:16 ` [morty][PATCH 3/3] staging.bbclass: use single quotes for path passed to file in is_elf() Andre McCurdy
@ 2018-05-28 14:19 ` akuster808
2 siblings, 0 replies; 4+ messages in thread
From: akuster808 @ 2018-05-28 14:19 UTC (permalink / raw)
To: Andre McCurdy, openembedded-core
On 05/25/2018 12:16 PM, Andre McCurdy wrote:
> 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.
this series in stable/pyro-mnut
- armin
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> (cherry picked from commit 7877761534b0c2492da6289e9f2269d41b6ed464)
> 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 a6f0a7a..531ca4a 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -892,7 +892,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
^ permalink raw reply [flat|nested] 4+ messages in thread