diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f0a874802..4951220cb 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -558,7 +558,7 @@ if [ x"$D" = "x" ]; then fi } -RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/${BUILD_ARCH}-${BUILD_OS}-rpmdeps" +RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps" # Collect perfile run-time dependency metadata # Output: diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 3967ae294..b70575cea 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -2,8 +2,8 @@ inherit package IMAGE_PKGTYPE ?= "rpm" -RPM="${BUILD_ARCH}-${BUILD_OS}-rpm" -RPMBUILD="${BUILD_ARCH}-${BUILD_OS}-rpmbuild" +RPM="rpm" +RPMBUILD="rpmbuild" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 09afa5810..55c851c46 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -26,7 +26,7 @@ rpmlibdir = "/var/lib/rpm" opkglibdir = "${localstatedir}/lib/opkg" RPMOPTS="--dbpath ${rpmlibdir} --define='_openall_before_chroot 1'" -RPM="${BUILD_ARCH}-${BUILD_OS}-rpm ${RPMOPTS}" +RPM="rpm ${RPMOPTS}" fakeroot rootfs_rpm_do_rootfs () { set +x |