* [PATCH V3] Add file information to package information window
@ 2013-04-04 8:20 Andrei Dinu
2013-04-04 10:02 ` Paul Eggleton
0 siblings, 1 reply; 3+ messages in thread
From: Andrei Dinu @ 2013-04-04 8:20 UTC (permalink / raw)
To: openembedded-core
Removed the package files parsing routine from the
packageinfo.bbclass file and added it to the
package.bbclass file.
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
---
meta/classes/package.bbclass | 12 ++++++++++++
meta/classes/packageinfo.bbclass | 20 --------------------
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3479947..e859a65 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1130,6 +1130,15 @@ python emit_pkgdata() {
workdir = d.getVar('WORKDIR', True)
for pkg in packages.split():
+ items = {}
+ for files_list in pkgfiles[pkg]:
+ item_name = os.path.basename(files_list)
+ item_path = files_list.split(os.path.basename(files_list))[0][:-1]
+ if item_path not in items:
+ items[item_path] = []
+ items[item_path].append(item_name)
+ else:
+ items[item_path].append(item_name)
subdata_file = pkgdatadir + "/runtime/%s" % pkg
pkgval = d.getVar('PKG_%s' % pkg, True)
@@ -1137,6 +1146,8 @@ python emit_pkgdata() {
pkgval = pkg
d.setVar('PKG_%s' % pkg, pkg)
+ d.setVar('FILES_INFO', str(items))
+
sf = open(subdata_file, 'w')
write_if_exists(sf, pkg, 'PN')
write_if_exists(sf, pkg, 'PV')
@@ -1161,6 +1172,7 @@ python emit_pkgdata() {
write_if_exists(sf, pkg, 'pkg_preinst')
write_if_exists(sf, pkg, 'pkg_prerm')
write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
+ write_if_exists(sf, pkg, 'FILES_INFO')
for dfile in (d.getVar('FILERPROVIDESFLIST_' + pkg, True) or "").split():
write_if_exists(sf, pkg, 'FILERPROVIDES_' + dfile)
diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass
index 5e6f590..4709bea 100644
--- a/meta/classes/packageinfo.bbclass
+++ b/meta/classes/packageinfo.bbclass
@@ -8,24 +8,6 @@ python packageinfo_handler () {
package_archs = e.data.getVar('PACKAGE_ARCHS', True)
packaging = e.data.getVar('PACKAGE_CLASSES', True).split()[0].split('_')[1]
deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging
- dirs = os.listdir(tmpdir + '/work/')
- pkgsplit_dir = tmpdir + '/work/'
- items = {}
- passing = ''
- for directories in dirs:
- temp_dirs = os.listdir(pkgsplit_dir + directories)
- for temps1 in temp_dirs:
- if os.path.exists(pkgsplit_dir + directories + '/' + temps1 + '/' + os.listdir(pkgsplit_dir + directories + '/' + temps1)[0] + '/packages-split'):
- subs = pkgsplit_dir + directories + '/' + temps1 + '/' + os.listdir(pkgsplit_dir + directories + '/' + temps1)[0] + '/packages-split'
- for temps in os.listdir(subs):
- items[temps] = {}
- for path, dirs, files in os.walk(pkgsplit_dir + directories + '/' + temps1 + '/' + os.listdir(pkgsplit_dir + directories + '/' + temps1)[0] + '/packages-split' + '/' + temps):
- file_list = []
- if os.listdir(path) != []:
- items[temps][path] = []
- for f in files:
- file_list.append(f)
- items[temps][path].append(file_list)
for arch in package_archs.split():
pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' + target_os + '/runtime/'
@@ -38,8 +20,6 @@ python packageinfo_handler () {
try:
sdata = oe.packagedata.read_pkgdatafile(pkgdatafile)
sdata['PKG'] = pkgname
- if pkgname in items:
- sdata['FILES_INFO'] = items[pkgname]
pkginfolist.append(sdata)
except Exception as e:
bb.warn("Failed to read pkgdata file %s: %s: %s" % (pkgdatafile, e.__class__, str(e)))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH V3] Add file information to package information window
2013-04-04 8:20 [PATCH V3] Add file information to package information window Andrei Dinu
@ 2013-04-04 10:02 ` Paul Eggleton
2013-04-04 10:10 ` Andrei Dinu
0 siblings, 1 reply; 3+ messages in thread
From: Paul Eggleton @ 2013-04-04 10:02 UTC (permalink / raw)
To: Andrei Dinu; +Cc: openembedded-core
On Thursday 04 April 2013 11:20:34 Andrei Dinu wrote:
> Removed the package files parsing routine from the
> packageinfo.bbclass file and added it to the
> package.bbclass file.
>
> Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
> ---
> meta/classes/package.bbclass | 12 ++++++++++++
> meta/classes/packageinfo.bbclass | 20 --------------------
> 2 files changed, 12 insertions(+), 20 deletions(-)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index 3479947..e859a65 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -1130,6 +1130,15 @@ python emit_pkgdata() {
> workdir = d.getVar('WORKDIR', True)
>
> for pkg in packages.split():
> + items = {}
> + for files_list in pkgfiles[pkg]:
> + item_name = os.path.basename(files_list)
> + item_path = files_list.split(os.path.basename(files_list))[0]
[:-1]
There is os.path.dirname() for this as well; alternatively you could use
os.path.split() to get both at the same time.
> + if item_path not in items:
> + items[item_path] = []
> + items[item_path].append(item_name)
> + else:
> + items[item_path].append(item_name)
This could be simplified to:
if item_path not in items:
items[item_path] = []
items[item_path].append(item_name)
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V3] Add file information to package information window
2013-04-04 10:02 ` Paul Eggleton
@ 2013-04-04 10:10 ` Andrei Dinu
0 siblings, 0 replies; 3+ messages in thread
From: Andrei Dinu @ 2013-04-04 10:10 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
Hi Paul,
Thanks again! preparing for a V4 right now.
Cheers,
Andrei
On 04/04/2013 01:02 PM, Paul Eggleton wrote:
> On Thursday 04 April 2013 11:20:34 Andrei Dinu wrote:
>> Removed the package files parsing routine from the
>> packageinfo.bbclass file and added it to the
>> package.bbclass file.
>>
>> Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
>> ---
>> meta/classes/package.bbclass | 12 ++++++++++++
>> meta/classes/packageinfo.bbclass | 20 --------------------
>> 2 files changed, 12 insertions(+), 20 deletions(-)
>>
>> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
>> index 3479947..e859a65 100644
>> --- a/meta/classes/package.bbclass
>> +++ b/meta/classes/package.bbclass
>> @@ -1130,6 +1130,15 @@ python emit_pkgdata() {
>> workdir = d.getVar('WORKDIR', True)
>>
>> for pkg in packages.split():
>> + items = {}
>> + for files_list in pkgfiles[pkg]:
>> + item_name = os.path.basename(files_list)
>> + item_path = files_list.split(os.path.basename(files_list))[0]
> [:-1]
>
> There is os.path.dirname() for this as well; alternatively you could use
> os.path.split() to get both at the same time.
>
>> + if item_path not in items:
>> + items[item_path] = []
>> + items[item_path].append(item_name)
>> + else:
>> + items[item_path].append(item_name)
> This could be simplified to:
> if item_path not in items:
> items[item_path] = []
> items[item_path].append(item_name)
>
> Cheers,
> Paul
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-04 10:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 8:20 [PATCH V3] Add file information to package information window Andrei Dinu
2013-04-04 10:02 ` Paul Eggleton
2013-04-04 10:10 ` Andrei Dinu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox