Skip to contentSkip to conversation

do not split debug pkg when no debugsources.list

PATCH Applied Robert Yang 2 participants 3 messages Mar 14, 2012

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

v2 cover do not split debug pkg when no debugsources.list

Changes of V2:

* Do not split debug pkg when no debugsources.list rather than create an empty debugsources.list as Richard suggested.

// Robert

The following changes since commit 81379dc141e245307ca391a02b7490b199128991:

dates: Fix unpackaged files warning (2012-03-13 23:18:19 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/debugpkg
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/debugpkg

Robert Yang (1):
package.bbclass: do not split debug pkg when no debugsources.list

 meta/classes/package.bbclass |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH v2 1/1 package.bbclass: do not split debug pkg when no debugsources.list

We don't have to split the debug pkg if it is null (No debugsources.list since the find-debuginfo.sh would not generate it for the null pkg).

Serval pkg's debug pkg is null, and there were a few errors: (53 pkgs had such errors in a core-image-sato build):

log.do_package:sort: open failed: debugsources.list: No such file or directory

[YOCTO #2076]

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/package.bbclass |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
meta/classes/package.bbclass +9 -9
index 7bcfa02..bdc4d37 100644
@@ -234,17 +234,17 @@ def splitfile2(debugsrcdir, d):
 
     import commands, stat
 
-    dvar = d.getVar('PKGD', True)
-    pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
-    strip = d.getVar("STRIP", True)
-    objcopy = d.getVar("OBJCOPY", True)
-    debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
-    workdir = d.getVar("WORKDIR", True)
-    workparentdir = os.path.dirname(workdir)
-    workbasedir = os.path.basename(workdir)
     sourcefile = d.expand("${WORKDIR}/debugsources.list")
+    if debugsrcdir and os.path.isfile(sourcefile):
+       dvar = d.getVar('PKGD', True)
+       pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
+       strip = d.getVar("STRIP", True)
+       objcopy = d.getVar("OBJCOPY", True)
+       debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
+       workdir = d.getVar("WORKDIR", True)
+       workparentdir = os.path.dirname(workdir)
+       workbasedir = os.path.basename(workdir)
 
-    if debugsrcdir:
        nosuchdir = []
        basepath = dvar
        for p in debugsrcdir.split("/"):
Signature · 1 line
1.7.4.1
Applied
#2 lore raw

Re: [PATCH 1/1 V2] package.bbclass: do not split debug pkg when no debugsources.list

Quoted 6 lines · Robert Yang

We don't have to split the debug pkg if it is null (No debugsources.list since the find-debuginfo.sh would not generate it for the null pkg).

Serval pkg's debug pkg is null, and there were a few errors: (53 pkgs had such errors in a core-image-sato build):

Quoted 8 lines

log.do_package:sort: open failed: debugsources.list: No such file or directory

[YOCTO #2076]

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/package.bbclass |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

Merged to master, thanks.

Richard