package_rpm.bbclass: Update the platform config and --target

When constructing the /etc/rpm/platform file, we need to ensure that
the any, all, and noarch platforms will allow any "linux" variant to
be installable, not just matching variants.. i.e.

arm-oe-linux-gnueabi should be able to install noarch-oe-linux

Also ensure that we pass the full canonical arch via the --target=
parameter.  This allows us to define the proper platform settings
for all packages.

(From OE-Core rev: c6bb9445de90cfb46db9c40842dbe1bfbb5b8ce8)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 11 insertions, 3 deletions

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 59e8d48b20..5c67f69bb9 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -177,7 +177,15 @@ package_install_internal_rpm () {
         echo "${platform}${TARGET_VENDOR}-${TARGET_OS}" > ${target_rootfs}/etc/rpm/platform
         if [ ! -z "$platform_extra" ]; then
                 for pt in $platform_extra ; do
-                        echo "$pt-.*-${TARGET_OS}" >> ${target_rootfs}/etc/rpm/platform
+                        case $pt in
+                                noarch | any | all)
+                                        os="`echo ${TARGET_OS} | sed "s,-.*,,"`.*"
+                                        ;;
+                                *)
+                                        os="${TARGET_OS}"
+                                        ;;
+                        esac
+                        echo "$pt-.*-$os" >> ${target_rootfs}/etc/rpm/platform
                 done
         fi
 
@@ -821,13 +829,13 @@ python do_package_rpm () {
         targetsys = bb.data.getVar('TARGET_SYS', d, True)
         targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
         pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
-        pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
+        pkgarch = bb.data.expand('${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d)
         magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
         bb.mkdirhier(pkgwritedir)
         os.chmod(pkgwritedir, 0755)
 
         cmd = rpmbuild
-        cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + targetvendor + "-linux-gnu --buildroot " + pkgd
+        cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd
         cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
         cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
         cmd = cmd + " --define '_use_internal_dependency_generator 0'"