diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-04 15:50:53 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-04 15:50:53 +0200 |
| commit | 2208b42bea7850513d9df8f1edbfad1df083c5ad (patch) | |
| tree | f5205d71dbc42803c6853888f5f69c2ad4dfdd22 /classes | |
| parent | e02161e5582a182d8a3b672ad91fc27843f1a438 (diff) | |
| parent | bcd5894dcd9db9234dd6d99a9e1bd0d6d8fef19a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/gnome.bbclass | 1 | ||||
| -rw-r--r-- | classes/package.bbclass | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 3d04298ac6..2045697516 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -11,6 +11,7 @@ DEPENDS += "gnome-common" FILES_${PN} += "${datadir}/application-registry \ ${datadir}/mime-info \ ${datadir}/mime/packages \ + ${datadir}/mime/application \ ${datadir}/gnome-2.0" inherit autotools gtk-icon-cache pkgconfig gconf mime diff --git a/classes/package.bbclass b/classes/package.bbclass index 5a9fa503ae..0cba1260d8 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -159,7 +159,7 @@ def runstrip(file, d): if ret: bb.error("runstrip: 'file %s' failed (forced strip)" % file) - if "not stripped" not in result: + if "not stripped" not in result and not file.endswith(".a"): bb.debug(1, "runstrip: skip %s" % file) return 0 @@ -393,7 +393,7 @@ python populate_packages () { for root, dirs, files in os.walk(dvar): for f in files: file = os.path.join(root, f) - if not os.path.islink(file) and not os.path.isdir(file) and isexec(file): + if not os.path.islink(file) and not os.path.isdir(file) and (isexec(file) or ".a" in file): runstrip(file, d) pkgdest = bb.data.getVar('PKGDEST', d, 1) |