diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 2 | ||||
| -rw-r--r-- | classes/package.bbclass | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 21feaab6e6..340e5d91f8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi diff --git a/classes/package.bbclass b/classes/package.bbclass index e0ab7ad27f..d32cf53828 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -241,16 +241,6 @@ python populate_packages () { return 0 return (s[stat.ST_MODE] & stat.S_IEXEC) - pkgs = set() - packages_joined = "" - for pkg in packages.split(): - if pkg in pkgs: - bb.note("%s is listed in PACKAGES multiple times" % (pkg)) - else: - pkgs.add(pkg) - packages_joined = "%s %s" % (packages_joined, pkg) - packages = packages_joined - for pkg in packages.split(): localdata = bb.data.createCopy(d) root = os.path.join(workdir, "install", pkg) |