summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-12-30 17:56:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:16 +0000
commita1180e91d071feff85cd133220a3ec8c994d31f2 (patch)
tree34d34f3859346be8f4b2cfe36f9fab4ad0e69a8e /meta/classes/package.bbclass
parentb1f09df0f664052e39d939b759a63b05d767b8ec (diff)
downloadpoky-a1180e91d071feff85cd133220a3ec8c994d31f2.tar.gz
package.bbclass: fix locations of debugedit and rpmdeps utilities
rpm4 installs them in different locations than rpm5. This also replaces our custom rpmdeps-oecore with standard rpmdeps; I'm not seeing a significant performance penalty. (From OE-Core rev: ec20cda53caeebfdf95e2871d5da8b926e84d2aa) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 299ea120d9..f4c2b5514c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -345,7 +345,7 @@ def splitdebuginfo(file, debugfile, debugsrcdir, sourcefile, d):
345 345
346 dvar = d.getVar('PKGD') 346 dvar = d.getVar('PKGD')
347 objcopy = d.getVar("OBJCOPY") 347 objcopy = d.getVar("OBJCOPY")
348 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit") 348 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/debugedit")
349 349
350 # We ignore kernel modules, we don't generate debug info files. 350 # We ignore kernel modules, we don't generate debug info files.
351 if file.find("/lib/modules/") != -1 and file.endswith(".ko"): 351 if file.find("/lib/modules/") != -1 and file.endswith(".ko"):
@@ -1436,7 +1436,7 @@ if [ x"$D" = "x" ]; then
1436fi 1436fi
1437} 1437}
1438 1438
1439RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps-oecore --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt" 1439RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt"
1440 1440
1441# Collect perfile run-time dependency metadata 1441# Collect perfile run-time dependency metadata
1442# Output: 1442# Output: