From: Guojian Zhou <guojian.z...@windriver.com>
The vendor proprietary rpms should be packaged into the
"vendor_proprietary_extensions" directory. Add the "PACKAGE_VENDOR_REPO"
to allow the recipes select the required packages directory.
Signed-off-by: Guojian Zhou <guojian.z...@windriver.com>
---
meta/classes/package_rpm.bbclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 92ddf7a..cd3784d 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -675,13 +675,17 @@ python do_package_rpm () {
targetsys = d.getVar('TARGET_SYS', True)
targetvendor = d.getVar('HOST_VENDOR', True)
package_arch = (d.getVar('PACKAGE_ARCH', True) or "").replace("-", "_")
+ package_vendor_repo = (d.getVar('PACKAGE_VENDOR_REPO', True) or
"").replace("-", "_")
sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX', True) or
"nativesdk").replace("-", "_")
if package_arch not in "all any noarch".split() and not
package_arch.endswith(sdkpkgsuffix):
ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_")
d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch)
else:
d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
- pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
+ if package_vendor_repo:
+ pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_VENDOR_REPO}')
+ else:
+ pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}')
magicfile =
d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc')
bb.utils.mkdirhier(pkgwritedir)
--
1.7.12.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
