* [PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl
@ 2016-05-20 9:01 Anders Darander
2016-06-01 10:00 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Anders Darander @ 2016-05-20 9:01 UTC (permalink / raw)
To: openembedded-core; +Cc: 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>
---
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 f5c465f..7087b12 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -116,6 +116,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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl
2016-05-20 9:01 [PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl Anders Darander
@ 2016-06-01 10:00 ` Martin Jansa
2016-06-01 17:57 ` Anders Darander
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2016-06-01 10:00 UTC (permalink / raw)
To: Anders Darander; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1763 bytes --]
On Fri, May 20, 2016 at 11:01:01AM +0200, 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].
Please merge this to krogoth as well, the first part which causes this
issue was already merged as:
commit cd4ad2b8a5bd11e91e854cea6a36c7b92fb7cea8
Author: Anders Darander <anders@chargestorm.se>
Date: Tue May 3 13:57:16 2016 +0200
lib/oe/rootfs: Fix DEBUGFS generation for opkg & openssl-cnf
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> 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 f5c465f..7087b12 100644
> --- a/meta/lib/oe/rootfs.py
> +++ b/meta/lib/oe/rootfs.py
> @@ -116,6 +116,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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl
2016-06-01 10:00 ` Martin Jansa
@ 2016-06-01 17:57 ` Anders Darander
0 siblings, 0 replies; 3+ messages in thread
From: Anders Darander @ 2016-06-01 17:57 UTC (permalink / raw)
To: openembedded-core
* Martin Jansa <martin.jansa@gmail.com> [160601 12:00]:
> On Fri, May 20, 2016 at 11:01:01AM +0200, 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].
> Please merge this to krogoth as well, the first part which causes this
> issue was already merged as:
It was sent as a cherry-picked commit marked [krogoth] the same day this
patch went into master.
I've sofar just assumed that it was delayed due to the hard load on the
autobuilders.
Cheers,
Anders
--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-01 17:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-20 9:01 [PATCH] lib/oe/rootfs: Fix DEBUGFS generation, without openssl Anders Darander
2016-06-01 10:00 ` Martin Jansa
2016-06-01 17:57 ` Anders Darander
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.