diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-03-24 17:46:58 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-03-28 12:12:57 -0700 |
commit | e4aec9b81ef1234168932ad3d3d643d2faad1c52 (patch) | |
tree | e89a31c6b9edc526aa13eb3261341bde8412a135 /meta-oe | |
parent | a338989c638034b18b993e05d536c4a9547cef44 (diff) | |
download | meta-openembedded-e4aec9b81ef1234168932ad3d3d643d2faad1c52.tar.gz |
packagegroup-meta-oe: move the packages depending on meta-python2 to separate packages
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 3c8b970668..e9fcf71a76 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -8,12 +8,15 @@ PACKAGES = "\ packagegroup-meta-oe \ packagegroup-meta-oe-benchmarks \ packagegroup-meta-oe-connectivity \ + packagegroup-meta-oe-connectivity-python2 \ packagegroup-meta-oe-core \ packagegroup-meta-oe-crypto \ packagegroup-meta-oe-bsp \ packagegroup-meta-oe-dbs \ + packagegroup-meta-oe-dbs-python2 \ packagegroup-meta-oe-devtools \ packagegroup-meta-oe-extended \ + packagegroup-meta-oe-extended-python2 \ packagegroup-meta-oe-kernel \ packagegroup-meta-oe-multimedia \ packagegroup-meta-oe-navigation \ @@ -21,6 +24,7 @@ PACKAGES = "\ packagegroup-meta-oe-shells \ packagegroup-meta-oe-security \ packagegroup-meta-oe-support \ + packagegroup-meta-oe-support-python2 \ packagegroup-meta-oe-test \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ @@ -32,11 +36,14 @@ RDEPENDS_packagegroup-meta-oe = "\ packagegroup-meta-oe-benchmarks \ packagegroup-meta-oe-bsp \ packagegroup-meta-oe-connectivity \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-connectivity-python2", "", d)} \ packagegroup-meta-oe-core \ packagegroup-meta-oe-crypto \ packagegroup-meta-oe-dbs \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-dbs-python2", "", d)} \ packagegroup-meta-oe-devtools \ packagegroup-meta-oe-extended \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \ packagegroup-meta-oe-kernel \ packagegroup-meta-oe-multimedia \ packagegroup-meta-oe-navigation \ @@ -44,6 +51,7 @@ RDEPENDS_packagegroup-meta-oe = "\ packagegroup-meta-oe-security \ packagegroup-meta-oe-shells \ packagegroup-meta-oe-support \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-support-python2", "", d)} \ packagegroup-meta-oe-test \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ @@ -145,7 +153,6 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ ser2net \ smstools3 \ telepathy-glib \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "telepathy-idle", "", d)} \ thrift \ usbmuxd \ wifi-test-suite \ @@ -156,6 +163,10 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ RDEPENDS_packagegroup-meta-oe-connectivity_append_libc-glibc = " wvstreams wvdial" +RDEPENDS_packagegroup-meta-oe-connectivity-python2 = "\ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "telepathy-idle", "", d)} \ +" + # dracut needs dracut RDEPENDS_packagegroup-meta-oe-core = "\ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker", "", d)} \ @@ -201,7 +212,6 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ leveldb \ libdbi \ mariadb \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "mysql-python", "", d)} \ postgresql \ psqlodbc \ rocksdb \ @@ -209,6 +219,10 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ sqlite \ " +RDEPENDS_packagegroup-meta-oe-dbs-python2 ="\ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "mysql-python", "", d)} \ +" + RDEPENDS_packagegroup-meta-oe-devtools ="\ abseil-cpp \ apitrace \ @@ -347,7 +361,6 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ jansson \ nana \ nicstat \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "openlmi-tools", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \ p7zip \ isomd5sum \ @@ -425,6 +438,10 @@ RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64le = "upm mraa" RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm libleak mraa sysdig tiptop" RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak mraa sysdig tiptop" +RDEPENDS_packagegroup-meta-oe-extended-python2 ="\ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "openlmi-tools", "", d)} \ +" + RDEPENDS_packagegroup-meta-oe-gnome ="\ atkmm \ gcab \ @@ -803,7 +820,6 @@ RDEPENDS_packagegroup-meta-oe-support ="\ libusbg \ libutempter \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "lio-utils", "", d)} \ log4c \ log4cpp \ nspr \ @@ -898,6 +914,11 @@ RDEPENDS_packagegroup-meta-oe-support_append_armv7ve = " ne10" RDEPENDS_packagegroup-meta-oe-support_append_aarch64 = " ne10" RDEPENDS_packagegroup-meta-oe-support_append_x86 = " mcelog mce-inject mce-test open-vm-tools vboxguestdrivers" RDEPENDS_packagegroup-meta-oe-support_append_x86-64 = " mcelog mce-inject mce-test open-vm-tools vboxguestdrivers" + +RDEPENDS_packagegroup-meta-oe-support-python2 ="\ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "lio-utils", "", d)} \ +" + RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch = "gperftools" RDEPENDS_packagegroup-meta-oe-support_remove_riscv64 = "gperftools uim" |