diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-03-05 12:02:51 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 20:28:56 -0700 |
commit | 6029af2ec5f6a92b41c9e103625699e6ae2e6550 (patch) | |
tree | bc205b148729821b7df20fdc26c3244558d37b68 /meta | |
parent | d1161cb4daf502d30983200652adbaa5b296b743 (diff) | |
download | poky-6029af2ec5f6a92b41c9e103625699e6ae2e6550.tar.gz |
buildhistory.bbclass: Fix dependency files creation
Call the new python routines.
[YOCTO #5904]
(From OE-Core rev: 570baf4921a5b34cc97834e670b143073d136dea)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 1a0e35d58b..5d0a229f99 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -321,6 +321,12 @@ python buildhistory_list_installed() { | |||
321 | 321 | ||
322 | with open(pkgs_list_file, 'w') as pkgs_list: | 322 | with open(pkgs_list_file, 'w') as pkgs_list: |
323 | pkgs_list.write(list_installed_packages(d, 'file')) | 323 | pkgs_list.write(list_installed_packages(d, 'file')) |
324 | |||
325 | pkgs_deps_file = os.path.join(d.getVar('WORKDIR', True), | ||
326 | "bh_installed_pkgs_deps.txt") | ||
327 | |||
328 | with open(pkgs_deps_file, 'w') as pkgs_deps: | ||
329 | pkgs_deps.write(list_installed_packages(d, 'deps')) | ||
324 | } | 330 | } |
325 | 331 | ||
326 | 332 | ||
@@ -340,7 +346,8 @@ buildhistory_get_installed() { | |||
340 | 346 | ||
341 | # Produce dependency graph | 347 | # Produce dependency graph |
342 | # First, quote each name to handle characters that cause issues for dot | 348 | # First, quote each name to handle characters that cause issues for dot |
343 | rootfs_list_installed_depends | sed 's:\([^| ]*\):"\1":g' > $1/depends.tmp | 349 | cat ${WORKDIR}/bh_installed_pkgs_deps.txt | sed 's:\([^| ]*\):"\1":g' > $1/depends.tmp && \ |
350 | rm ${WORKDIR}/bh_installed_pkgs_deps.txt | ||
344 | # Change delimiter from pipe to -> and set style for recommend lines | 351 | # Change delimiter from pipe to -> and set style for recommend lines |
345 | sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp | 352 | sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp |
346 | # Add header, sorted and de-duped contents and footer and then delete the temp file | 353 | # Add header, sorted and de-duped contents and footer and then delete the temp file |