[krogoth][PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl

[krogoth][PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl

[Anders Darander]

In commit 20ea6d274bb0a9a5addb111f32793de49b907865, debugfs generation
for images using opkg, which included openssl was fixed.

However, that broke the generation of the opkg-based images, that lacks
openssl. The error is a python stack trace, showing that shutil.copytree
tries to copy a non-existing directory.

This relates to [YOCTO #9040].

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)
---
 meta/lib/oe/rootfs.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 95fd3ab..41f08f5 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -121,6 +121,8 @@ class Rootfs(object):
 
         bb.note("  Copying back package database...")
         for dir in dirs:
+            if not os.path.isdir(self.image_rootfs + '-orig' + dir):
+                continue
             bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir))
             shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True)
 
-- 
2.8.1

Re: [krogoth][PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl

[akuster808]

On 05/22/2016 10:03 PM, Anders Darander wrote:
> In commit 20ea6d274bb0a9a5addb111f32793de49b907865, debugfs generation
> for images using opkg, which included openssl was fixed.
> 
> However, that broke the generation of the opkg-based images, that lacks
> openssl. The error is a python stack trace, showing that shutil.copytree
> tries to copy a non-existing directory.
> 
> This relates to [YOCTO #9040].
> 
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)

pulled in.

thanks.
Armin
> ---
>  meta/lib/oe/rootfs.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
> index 95fd3ab..41f08f5 100644
> --- a/meta/lib/oe/rootfs.py
> +++ b/meta/lib/oe/rootfs.py
> @@ -121,6 +121,8 @@ class Rootfs(object):
>  
>          bb.note("  Copying back package database...")
>          for dir in dirs:
> +            if not os.path.isdir(self.image_rootfs + '-orig' + dir):
> +                continue
>              bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir))
>              shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True)
>  
> 

Re: [krogoth][PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl

[Anders Darander]

Hi,

* akuster808 <akuster808@gmail.com> [160523 07:29]:
> On 05/22/2016 10:03 PM, Anders Darander wrote:
> > In commit 20ea6d274bb0a9a5addb111f32793de49b907865, debugfs generation
> > for images using opkg, which included openssl was fixed.

> > However, that broke the generation of the opkg-based images, that lacks
> > openssl. The error is a python stack trace, showing that shutil.copytree
> > tries to copy a non-existing directory.

> > This relates to [YOCTO #9040].

> > Signed-off-by: Anders Darander <anders@chargestorm.se>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)

> pulled in.

What's the status of this? Waiting for autobuilders?

Martin sent a query for this patch last week.

Cheers,
Anders
-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB

Re: [krogoth][PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl

[Anders Darander]

Ping.

What's the current status?

 Anders Darander <anders@chargestorm.se> [160607 09:31]:
> * akuster808 <akuster808@gmail.com> [160523 07:29]:
> > On 05/22/2016 10:03 PM, Anders Darander wrote:
> > > In commit 20ea6d274bb0a9a5addb111f32793de49b907865, debugfs generation
> > > for images using opkg, which included openssl was fixed.

> > > However, that broke the generation of the opkg-based images, that lacks
> > > openssl. The error is a python stack trace, showing that shutil.copytree
> > > tries to copy a non-existing directory.

> > > This relates to [YOCTO #9040].

> > > Signed-off-by: Anders Darander <anders@chargestorm.se>
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > (cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)

> > pulled in.

> What's the status of this? Waiting for autobuilders?

> Martin sent a query for this patch last week.

I'm also eager to get this into the krogoth-branch. I'd like to enable
debugfs, though, I'm also trying my best to not have to fork the krogoth
branch...

Cheers,
Anders
-- 
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB

Re: [krogoth][PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl

[akuster808]

On 06/27/2016 12:03 AM, Anders Darander wrote:
> Ping.
> 
> What's the current status?

Submitted again. Hope it makes in this time.

- armin

> 
>  Anders Darander <anders@chargestorm.se> [160607 09:31]:
>> * akuster808 <akuster808@gmail.com> [160523 07:29]:
>>> On 05/22/2016 10:03 PM, Anders Darander wrote:
>>>> In commit 20ea6d274bb0a9a5addb111f32793de49b907865, debugfs generation
>>>> for images using opkg, which included openssl was fixed.
> 
>>>> However, that broke the generation of the opkg-based images, that lacks
>>>> openssl. The error is a python stack trace, showing that shutil.copytree
>>>> tries to copy a non-existing directory.
> 
>>>> This relates to [YOCTO #9040].
> 
>>>> Signed-off-by: Anders Darander <anders@chargestorm.se>
>>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>> (cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)
> 
>>> pulled in.
> 
>> What's the status of this? Waiting for autobuilders?
> 
>> Martin sent a query for this patch last week.
> 
> I'm also eager to get this into the krogoth-branch. I'd like to enable
> debugfs, though, I'm also trying my best to not have to fork the krogoth
> branch...
> 
> Cheers,
> Anders
>