[PATCH 1/1] oe-core: Add the "PACKAGE_VENDOR_REPO" directory for the vendor-proprietary rpm

[PATCH 1/1] oe-core: Add the "PACKAGE_VENDOR_REPO" directory for the vendor-proprietary rpm

[guojian.zhou]

From: Guojian Zhou <guojian.zhou@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.zhou@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

Re: [PATCH 1/1] oe-core: Add the "PACKAGE_VENDOR_REPO" directory for the vendor-proprietary rpm

[Richard Purdie]

On Sun, 2016-01-31 at 16:10 +0800, guojian.zhou@windriver.com wrote:
> From: Guojian Zhou <guojian.zhou@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.zhou@windriver.com>
> ---
>  meta/classes/package_rpm.bbclass | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Why isn't the "vendor extension" just a normal extra package
architecture?

For example, meta-intel was able to define a specific graphics package
architecture for a subset of packages quite easily without this kind of
change.

Cheers,

Richard