diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 39c1d4bc91..9040eb40ba 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1113,7 +1113,7 @@ if [ x"$D" = "x" ]; then | |||
1113 | fi | 1113 | fi |
1114 | } | 1114 | } |
1115 | 1115 | ||
1116 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt" | 1116 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/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" |
1117 | 1117 | ||
1118 | # Collect perfile run-time dependency metadata | 1118 | # Collect perfile run-time dependency metadata |
1119 | # Output: | 1119 | # Output: |
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 93a4c3123c..469526be7a 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -941,7 +941,7 @@ python do_package_rpm () { | |||
941 | d.setVar('PACKAGE_ARCH_EXTEND', package_arch) | 941 | d.setVar('PACKAGE_ARCH_EXTEND', package_arch) |
942 | pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d) | 942 | pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d) |
943 | pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d) | 943 | pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d) |
944 | magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d) | 944 | magicfile = bb.data.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc', d) |
945 | bb.mkdirhier(pkgwritedir) | 945 | bb.mkdirhier(pkgwritedir) |
946 | os.chmod(pkgwritedir, 0755) | 946 | os.chmod(pkgwritedir, 0755) |
947 | 947 | ||