Backport fix for debugfs generation

PATCH In review Anders Darander 2 participants 5 messages Jun 26, 2017 – Jul 6, 2017

Share & tools

Anders Darander

author

2017-06-26 06:52 UTC #0 lore raw

cover Backport fix for debugfs generation

An older commit, which is in both master and pyro, broke the generation of debugfs'. This has been fixed in master by Martin Jansa, so lets backport this to pyro.

The following changes since commit 0b5e0d072f93a958e4211a8aeb2fd8cc3c25cc21:

package_ipk: Clean up Source entry in ipk packages (2017-06-16 10:18:55 +0100)

are available in the git repository at:

git://github.com/darander/openembedded-core pyro-debugfs
https://github.com/darander/openembedded-core/tree/pyro-debugfs

Martin Jansa (1):
package_manager: flush installed_pkgs file before oe-pkgdata-util uses
it

 meta/lib/oe/package_manager.py | 1 +
 1 file changed, 1 insertion(+)

Signature · 1 line

2.13.1

Anders Darander

author

2017-06-26 06:53 UTC #1 lore raw

PATCH 1/1 package_manager: flush installed_pkgs file before oe-pkgdata-util uses it

From: Martin Jansa <[email protected]>

* since this commit:
commit f5a1013ffa9815f22e13989e2bcb83f966e7ce2c
Author: Ross Burton <[email protected]>
Date: Tue Apr 18 16:19:12 2017 +0100

package_manager: don't race on a file when installing complementary packages

the file isn't closed before oe-pkgdata-util uses it and this
temporary file might look empty to oe-pkgdata-util, because it
wasn't flushed yet. Which resulted in almost empty debugfs tarballs
and no locale packages in regular rootfs.
* without this change:
124K May 30 07:41 core-image-full-cmdline-raspberrypi3-64-20170530054003-dbg.rootfs.tar.gz
* with this change:
173M May 30 07:29 core-image-full-cmdline-raspberrypi3-64-20170530052715-dbg.rootfs.tar.gz

Signed-off-by Martin Jansa <[email protected]>

Signed-off-by Ross Burton <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

(cherry picked from commit 877d38db08aa7060d16405443cf70539c559fe82)

Signed-off-by Anders Darander <[email protected]>

---
 meta/lib/oe/package_manager.py | 1 +
 1 file changed, 1 insertion(+)

meta/lib/oe/package_manager.py +1 -0

index f1b65bdbbc..2795dd3823 100644
@@ -399,6 +399,7 @@ class PackageManager(object, metaclass=ABCMeta):
             pkgs = self.list_installed()
             output = oe.utils.format_pkg_list(pkgs, "arch")
             installed_pkgs.write(output)
+            installed_pkgs.flush()
 
             cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"),
                    "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name,

Signature · 1 line

2.13.1

Anders Darander

author

2017-07-05 13:54 UTC #2 lore raw

Re: [pyro][PATCH 1/1] package_manager: flush installed_pkgs file before oe-pkgdata-util uses it

Quoted 10 lines · Anders Darander

From: Martin Jansa <[email protected]>
* since this commit:
commit f5a1013ffa9815f22e13989e2bcb83f966e7ce2c
Author: Ross Burton <[email protected]>
Date: Tue Apr 18 16:19:12 2017 +0100
package_manager: don't race on a file when installing complementary packages

Quoted 7 lines

the file isn't closed before oe-pkgdata-util uses it and this
temporary file might look empty to oe-pkgdata-util, because it
wasn't flushed yet. Which resulted in almost empty debugfs tarballs
and no locale packages in regular rootfs.
* without this change:
124K May 30 07:41 core-image-full-cmdline-raspberrypi3-64-20170530054003-dbg.rootfs.tar.gz
* with this change:

Ping.

Cheers,
Anders

Richard Purdie

2017-07-05 14:33 UTC #3 lore raw

Re: [pyro][PATCH 1/1] package_manager: flush installed_pkgs file before oe-pkgdata-util uses it

Quoted 23 lines · Anders Darander

Quoted 12 lines · Anders Darander
From: Martin Jansa <[email protected]>
* since this commit:
commit f5a1013ffa9815f22e13989e2bcb83f966e7ce2c
Author: Ross Burton <[email protected]>
Date:   Tue Apr 18 16:19:12 2017 +0100
    package_manager: don't race on a file when installing complementary
    packages
Quoted 9 lines
the file isn't closed before oe-pkgdata-util uses it and this temporary file might look empty to oe-pkgdata-util, because it wasn't flushed yet. Which resulted in almost empty debugfs tarballs
and no locale packages in regular rootfs.
* without this change:
124K May 30 07:41 core-image-full-cmdline-raspberrypi3-64- 20170530054003-dbg.rootfs.tar.gz
* with this change:

Quoted 1 line

Ping.

I did queue this in pyro-next earlier too. I suspect there are others I've missed but I am trying to change my processes to make this easier for me to make sure things get caught.

Cheers,

Richard

Anders Darander

author

2017-07-06 06:24 UTC #4 lore raw

Re: [pyro][PATCH 1/1] package_manager: flush installed_pkgs file before oe-pkgdata-util uses it

Quoted 24 lines · Richard Purdie

Quoted 23 lines · Anders Darander
Quoted 20 lines · Anders Darander
From: Martin Jansa <[email protected]>
* since this commit:
commit f5a1013ffa9815f22e13989e2bcb83f966e7ce2c
Author: Ross Burton <[email protected]>
Date:   Tue Apr 18 16:19:12 2017 +0100
    package_manager: don't race on a file when installing complementary
    packages
the file isn't closed before oe-pkgdata-util uses it and this temporary file might look empty to oe-pkgdata-util, because it wasn't flushed yet. Which resulted in almost empty debugfs tarballs
and no locale packages in regular rootfs.
* without this change:
124K May 30 07:41 core-image-full-cmdline-raspberrypi3-64- 20170530054003-dbg.rootfs.tar.gz
* with this change:

Quoted 5 lines

Quoted 1 line
Ping.
I did queue this in pyro-next earlier too. I suspect there are others I've missed but I am trying to change my processes to make this easier for me to make sure things get caught.

Ah, thanks!

I looked at
http://git.openembedded.org/openembedded-core/log/?h=pyro-next, and couldn't find see it, that's why I sent a ping...

Cheers,
Anders

Signature · 2 lines

Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB