[meta-oe,V2,2/3] packagegroup-meta-oe: Remove arch specific packages as needed

Submitted by Khem Raj on Dec. 4, 2018, 5:46 p.m. | Patch ID: 156897

Details

Message ID 20181204174618.6271-2-raj.khem@gmail.com
State Master Next
Commit 135fe1b5b3ee4ca7918d5b80a6318a4a7588cf66
Headers show

Commit Message

Khem Raj Dec. 4, 2018, 5:46 p.m.
Some packages are not supported on all architectures, therefore they
can not be included unconditionally.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
V2: Add more non-x86 arch specific removals

 .../packagegroups/packagegroup-meta-oe.bb     | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 2a5ff33e57..e79d6ee217 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -1,5 +1,6 @@ 
 SUMMARY = "Meta-oe ptest packagegroups"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 PROVIDES = "${PACKAGES}"
@@ -52,6 +53,8 @@  RDEPENDS_packagegroup-meta-oe-benchmarks = "\
     ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "glmark2", "", d)} \
 "
 
+RDEPENDS_packagegroup-meta-oe-benchmarks_remove_mipsarch = "libhugetlbfs"
+
 RDEPENDS_packagegroup-meta-oe-connectivity ="\
     gammu hostapd irssi krb5 libev libimobiledevice \
     libmbim libmtp libndp libqmi libtorrent \
@@ -83,6 +86,9 @@  RDEPENDS_packagegroup-meta-oe-bsp ="\
     efivar flashrom lmsensors lmsensors-config \
     lsscsi nvme-cli pcmciautils pointercal \
     "
+RDEPENDS_packagegroup-meta-oe-bsp_remove_mipsarch = "efivar efibootmgr"
+RDEPENDS_packagegroup-meta-oe-bsp_remove_powerpc = "efivar efibootmgr"
+
 RDEPENDS_packagegroup-meta-oe-dbs ="\
     leveldb libdbi mariadb mariadb-native \
     mysql-python postgresql psqlodbc rocksdb soci \
@@ -106,6 +112,10 @@  RDEPENDS_packagegroup-meta-oe-devtools ="\
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \
     "
 
+RDEPENDS_packagegroup-meta-oe-devtools_remove_armv5 = "uftrace nodejs"
+RDEPENDS_packagegroup-meta-oe-devtools_remove_mipsarch = "uftrace lshw"
+RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "uftrace lshw"
+
 RDEPENDS_packagegroup-meta-oe-extended ="\
     byacc cfengine cfengine-masterfiles cmpi-bindings \
     ddrescue dialog dumb-init enscript fluentbit \
@@ -130,6 +140,8 @@  RDEPENDS_packagegroup-meta-oe-extended ="\
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \
     ${@bb.utils.contains("BBPATH", "meta-python", "openlmi-tools", "", d)} \
     "
+RDEPENDS_packagegroup-meta-oe-extended_remove_mipsarch = "upm mraa tiptop"
+RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc = "upm mraa"
 
 RDEPENDS_packagegroup-meta-oe-gnome ="\
     atkmm gnome-common gnome-doc-utils-stub gtkmm \
@@ -223,6 +235,9 @@  RDEPENDS_packagegroup-meta-oe-support ="\
     ${NE10} \
     "
 
+RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl"
+RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch_libc-glibc = "gperftools"
+
 RDEPENDS_packagegroup-meta-oe-support-egl ="\
     freerdp libnice opencv \
     "
@@ -232,6 +247,10 @@  RDEPENDS_packagegroup-meta-oe-test ="\
     fwts gtest pm-qa stress-ng testfloat \
     "
 
+RDEPENDS_packagegroup-meta-oe-test_remove_arm = "fwts"
+RDEPENDS_packagegroup-meta-oe-test_remove_mipsarch = "fwts"
+RDEPENDS_packagegroup-meta-oe-test_remove_powerpc = "fwts"
+
 RDEPENDS_packagegroup-meta-oe-ptest-packages = "\
     zeromq-ptest \
     leveldb-ptest \
@@ -242,8 +261,13 @@  RDEPENDS_packagegroup-meta-oe-ptest-packages = "\
     oprofile-ptest \
     libteam-ptest \
     uthash-ptest \
-    mcelog-ptest \
     libee-ptest \
-    numactl-ptest \
     poco-ptest \
     "
+RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = "\
+    mcelog-ptest \
+"
+RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86-64 = "\
+    mcelog-ptest \
+"
+RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_arm = "numactl-ptest"