From b3f0aa20d4e63ee1af3f6ba7e3691b8e7de19ad8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 15 Dec 2007 05:03:01 +0000 Subject: package.bbclass: Add ASSUME_SHLIBS, way to specify shlib dependencies for ASSUME_PROVIDED. * List of :[_] mappings. This info will be appended to one inferred by automatic shlib tracking code. So, it would be possible to have correct package dependencies even for libraries in ASSUME_PROVIDED. --- classes/package.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'classes/package.bbclass') diff --git a/classes/package.bbclass b/classes/package.bbclass index 67aeb33a13..37b9d83d97 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -694,6 +694,16 @@ python package_do_shlibs() { for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) + assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1) + if assumed_libs: + for e in assumed_libs.split(): + l, dep_pkg = e.split(":") + lib_ver = None + dep_pkg = dep_pkg.rsplit("_", 1) + if len(dep_pkg) == 2: + lib_ver = dep_pkg[1] + dep_pkg = dep_pkg[0] + shlib_provider[l] = (dep_pkg, lib_ver) for pkg in packages.split(): bb.debug(2, "calculating shlib requirements for %s" % pkg) -- cgit v1.2.3 From 2fb453a9f4c045a6c74fccc81c1af8bf1e471ba7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 19 Dec 2007 11:19:31 +0000 Subject: package.bbclass: Don't strip files in .debug directories meaning rerunning the package task doesn't create chains of .debug directories (from poky) --- classes/package.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes/package.bbclass') diff --git a/classes/package.bbclass b/classes/package.bbclass index 37b9d83d97..ec8c3d97e2 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -149,6 +149,12 @@ def runstrip(file, d): bb.debug(1, "runstrip: skip %s" % file) return 0 + # If the file is in a .debug directory it was already stripped, + # don't do it again... + if os.path.dirname(file).endswith(".debug"): + bb.note("Already run strip") + return 0 + strip = bb.data.getVar("STRIP", d, 1) objcopy = bb.data.getVar("OBJCOPY", d, 1) -- cgit v1.2.3