diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
commit | 0e0df451ae365f09d5c0c766b253f23de26901f2 (patch) | |
tree | db4d7d3ce85e02ee01ad58a86ede02ac876aae77 /meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |
parent | e370fd750e2821620ec427f26f8efab0069824ff (diff) | |
parent | 7e10dee74964afa47859704886128dd256acf854 (diff) | |
download | openbmc-0e0df451ae365f09d5c0c766b253f23de26901f2.tar.xz |
Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 261 |
1 files changed, 140 insertions, 121 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 94830e297..59908e2c0 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/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)} \ @@ -138,14 +146,12 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ obexftp \ packagegroup-tools-bluetooth \ paho-mqtt-c \ - phonet-utils \ rabbitmq-c \ rfkill \ rtorrent \ ser2net \ smstools3 \ telepathy-glib \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "telepathy-idle", "", d)} \ thrift \ usbmuxd \ wifi-test-suite \ @@ -156,6 +162,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)} \ @@ -181,7 +191,7 @@ RDEPENDS_packagegroup-meta-oe-core = "\ usleep \ dbus-cxx \ " -RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " glfw" +RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "glfw", "", d)}" RDEPENDS_packagegroup-meta-oe-core_remove_riscv64 = "safec" RDEPENDS_packagegroup-meta-oe-core_remove_riscv32 = "safec" @@ -201,7 +211,6 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ leveldb \ libdbi \ mariadb \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "mysql-python", "", d)} \ postgresql \ psqlodbc \ rocksdb \ @@ -209,6 +218,10 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ sqlite \ " +RDEPENDS_packagegroup-meta-oe-dbs-python2 ="\ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d), "", d)} \ +" + RDEPENDS_packagegroup-meta-oe-devtools ="\ abseil-cpp \ apitrace \ @@ -263,7 +276,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ mpich \ msgpack-c \ mercurial \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "nodejs", "", d)} \ + nodejs \ openocd \ pax-utils \ ipc-run \ @@ -300,117 +313,117 @@ RDEPENDS_packagegroup-meta-oe-devtools_remove_mipsarch = "concurrencykit lshw pl RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64 = "luajit nodejs" RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64el = "luajit nodejs" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad lshw luajit uftrace" -RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools lshw luajit uftrace" -RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools lshw luajit uftrace" +RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools breakpad lshw luajit ply uftrace" +RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools breakpad lshw luajit ply uftrace" RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" -RDEPENDS_packagegroup-meta-oe-devtools_remove_aarch64 = "${@bb.utils.contains("TUNE_FEATURES", "crypto", "", "abseil-cpp", d)} concurrencykit" -RDEPENDS_packagegroup-meta-oe-devtools_remove_x86-64 = "${@bb.utils.contains("TUNE_FEATURES", "corei7", "", "abseil-cpp", d)}" +RDEPENDS_packagegroup-meta-oe-devtools_remove_aarch64 = "concurrencykit" RDEPENDS_packagegroup-meta-oe-devtools_remove_x86 = "ply" RDEPENDS_packagegroup-meta-oe-extended ="\ - bitwise \ + bitwise \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ - brotli \ - byacc \ - cmpi-bindings \ - collectd \ - cfengine-masterfiles \ - cfengine \ - ddrescue \ - dialog \ - enscript \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \ - dlt-daemon \ - docopt.cpp \ - iotop \ - dumb-init \ - konkretcmpi \ - figlet \ - libcec \ - libdivecomputer \ - fluentbit \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \ - liblognorm \ - libmodbus \ - haveged \ - hexedit \ - hiredis \ - hplip \ - hwloc \ - libuio \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \ - lprng \ - icewm \ - md5deep \ - indent \ - jansson \ - nana \ - nicstat \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "openlmi-tools", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \ - p7zip \ - isomd5sum \ - jpnevulator \ - ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \ - rarpd \ - redis \ - libfastjson \ - librelp \ - sblim-cmpi-devel \ - sblim-sfc-common \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \ - sblim-sfcc \ - libblockdev \ - sgpio \ - smartmontools \ - can-utils \ - canutils \ - libsocketcan \ - libconfig \ - linuxconsole \ - uml-utilities \ - libidn \ - libqb \ - wipe \ - libzip \ - zram \ - libplist \ - libusbmuxd \ - liblockfile \ - liblogging \ - libnss-nisplus \ - libpwquality \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "libreport", "", d)} \ - libserialport \ - libstatgrab \ - lockfile-progs \ - logwatch \ - mailx \ - mraa \ - ostree \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \ - pegtl \ - libfile-fnmatch-perl \ - rrdtool \ - sanlock \ - scsirastools \ - sedutil \ - libsigrok \ - libsigrokdecode \ - sigrok-cli \ - snappy \ - tipcutils \ - tiptop \ - tmux \ - triggerhappy \ - upm \ - vlock \ - volume-key \ - wxwidgets \ - zlog \ - zstd \ - redis-plus-plus \ + brotli \ + byacc \ + cmpi-bindings \ + collectd \ + cfengine-masterfiles \ + cfengine \ + ddrescue \ + dialog \ + enscript \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \ + dlt-daemon \ + docopt.cpp \ + iotop \ + dumb-init \ + konkretcmpi \ + figlet \ + libcec \ + libdivecomputer \ + fluentbit \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \ + liblognorm \ + libmodbus \ + haveged \ + hexedit \ + hiredis \ + hplip \ + hwloc \ + libleak \ + libuio \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \ + lprng \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \ + md5deep \ + indent \ + jansson \ + nana \ + nicstat \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \ + p7zip \ + isomd5sum \ + jpnevulator \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \ + rarpd \ + redis \ + libfastjson \ + librelp \ + sblim-cmpi-devel \ + sblim-sfc-common \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \ + sblim-sfcc \ + libblockdev \ + sgpio \ + smartmontools \ + can-utils \ + canutils \ + libsocketcan \ + libconfig \ + linuxconsole \ + uml-utilities \ + libidn \ + libqb \ + wipe \ + libzip \ + zram \ + libplist \ + libusbmuxd \ + liblockfile \ + liblogging \ + libnss-nisplus \ + libpwquality \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "libreport", "", d)} \ + libserialport \ + libstatgrab \ + lockfile-progs \ + logwatch \ + mailx \ + mraa \ + ostree \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \ + pegtl \ + libfile-fnmatch-perl \ + rrdtool \ + sanlock \ + scsirastools \ + sedutil \ + libsigrok \ + libsigrokdecode \ + sigrok-cli \ + snappy \ + tipcutils \ + tiptop \ + tmate \ + tmux \ + triggerhappy \ + upm \ + vlock \ + volume-key \ + wxwidgets \ + zlog \ + zstd \ + redis-plus-plus \ " RDEPENDS_packagegroup-meta-oe-extended_append_libc-musl = " libexecinfo" RDEPENDS_packagegroup-meta-oe-extended_append_x86-64 = " pmdk libx86-1" @@ -422,8 +435,12 @@ RDEPENDS_packagegroup-meta-oe-extended_remove_mips = "sysdig" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc = "upm mraa minifi-cpp" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64 = "upm mraa minifi-cpp" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64le = "upm mraa" -RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm mraa sysdig tiptop" -RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm mraa sysdig tiptop" +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", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \ +" RDEPENDS_packagegroup-meta-oe-gnome ="\ atkmm \ @@ -607,12 +624,12 @@ RDEPENDS_packagegroup-meta-oe-kernel ="\ trace-cmd \ " RDEPENDS_packagegroup-meta-oe-kernel_append_x86 = " intel-speed-select ipmiutil pm-graph turbostat" -RDEPENDS_packagegroup-meta-oe-kernel_append_x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat" +RDEPENDS_packagegroup-meta-oe-kernel_append_x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat bpftool" RDEPENDS_packagegroup-meta-oe-kernel_append_poerpc64 = " libpfm4" # Kernel-selftest does not build with 5.8 and its exluded from build too so until its fixed remove it RDEPENDS_packagegroup-meta-oe-kernel_remove = "kernel-selftest" -RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash intel-speed-select kernel-selftest minicoredumper turbostat" +RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "bpftool crash intel-speed-select kernel-selftest minicoredumper turbostat" RDEPENDS_packagegroup-meta-oe-kernel_remove_mipsarch = "makedumpfile" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" @@ -653,7 +670,6 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "mpv", "", d)} \ - pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \ libopusenc \ " @@ -695,7 +711,6 @@ RDEPENDS_packagegroup-meta-oe-support ="\ ace-cloud-editor \ frame \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \ - geis \ grail \ asio \ augeas \ @@ -745,7 +760,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ ccid \ zchunk \ libgpiod \ - libgpiod \ + libmanette \ ckermit \ libcereal \ daemontools \ @@ -803,7 +818,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 \ @@ -879,7 +893,6 @@ RDEPENDS_packagegroup-meta-oe-support ="\ unixodbc \ daemonize \ upower \ - xxhash \ unicode-ucd \ xdelta3 \ uriparser \ @@ -897,13 +910,19 @@ RDEPENDS_packagegroup-meta-oe-support ="\ RDEPENDS_packagegroup-meta-oe-support_append_armv7a = " ne10" 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_append_x86 = " mcelog mce-inject mce-test vboxguestdrivers" +RDEPENDS_packagegroup-meta-oe-support_append_x86-64 = " mcelog mce-inject mce-test vboxguestdrivers" + +RDEPENDS_packagegroup-meta-oe-support-python2 ="\ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils', '', d), "", 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" RDEPENDS_packagegroup-meta-oe-support_remove_riscv32 = "gperftools uim" RDEPENDS_packagegroup-meta-oe-support_remove_powerpc = "ssiapi" +RDEPENDS_packagegroup-meta-oe-support_remove_powerpc64le = "ssiapi" RDEPENDS_packagegroup-meta-oe-test ="\ bats \ |