poky.conf: set PACKAGE_CLASSES explicitly to package_rpm

Currently, defaultsetup.conf defaults PACKAGE_CLASSES to ipkg, and Poky's
local.conf.template defaults it to rpm.  So in theory Poky uses RPM, but
only if you actually use the local.conf.template: use Poky but write
your own minimal local.conf and you get ipkg being used.

Resolve this by explicitly setting PACKAGE_CLASSES in poky.conf, and
commentting out the assignment in local.conf.sample.  Users with
existing local.conf files won't notice a change of behaviour, and users
who write their own minimal local.conf will get the behaviour that is
expected, that is RPMs.

(From meta-yocto rev: 0615305e26f7e643cdf91e17902ebaa8e7f8faf8)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index a42e1d4ebb..b4c64c495f 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -30,6 +30,8 @@ DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
 
 TCLIBCAPPEND = ""
 
+PACKAGE_CLASSES ?= "package_rpm"
+
 SANITY_TESTED_DISTROS ?= " \
             poky-3.3 \n \
             poky-3.4 \n \
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample
index d92aa0ef87..4d2fa516fe 100644
--- a/meta-poky/conf/local.conf.sample
+++ b/meta-poky/conf/local.conf.sample
@@ -104,8 +104,8 @@ DISTRO ?= "poky"
 #  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
 #  - 'package_rpm' for rpm style packages
 # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
-# We default to rpm:
-PACKAGE_CLASSES ?= "package_rpm"
+# OE-Core defaults to ipkg, whilst Poky defaults to rpm:
+# PACKAGE_CLASSES ?= "package_rpm"
 
 #
 # SDK target architecture