diff options
Diffstat (limited to 'meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb')
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 95 |
1 files changed, 51 insertions, 44 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 80af309cfa..19242ba545 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -77,14 +77,16 @@ RDEPENDS:packagegroup-meta-oe-benchmarks = "\ qperf \ s-suite \ stressapptest \ - sysbench \ tinymembench \ tiobench \ whetstone \ " -RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7a = " cpuburn-arm" -RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7ve = " cpuburn-arm" -RDEPENDS:packagegroup-meta-oe-benchmarks:append:aarch64 = " cpuburn-arm" +RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7a = " cpuburn-arm sysbench" +RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7ve = " cpuburn-arm sysbench" +RDEPENDS:packagegroup-meta-oe-benchmarks:append:aarch64 = " cpuburn-arm sysbench" +RDEPENDS:packagegroup-meta-oe-benchmarks:append:x86 = " sysbench" +RDEPENDS:packagegroup-meta-oe-benchmarks:append:x86-64 = " sysbench" +RDEPENDS:packagegroup-meta-oe-benchmarks:append:mips = " sysbench" RDEPENDS:packagegroup-meta-oe-benchmarks:remove:mipsarch = "libhugetlbfs" RDEPENDS:packagegroup-meta-oe-benchmarks:remove:mips64 = "tinymembench" @@ -96,7 +98,7 @@ RDEPENDS:packagegroup-meta-oe-bsp ="\ acpitool \ cpufrequtils \ edac-utils \ - firmwared \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "firmwared", "", d)} \ flashrom \ fwupd \ fwupd-efi \ @@ -122,6 +124,7 @@ RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv64 = "efivar efibootmgr fwupd fwup RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv32 = "efivar efibootmgr fwupd fwupd-efi" RDEPENDS:packagegroup-meta-oe-connectivity ="\ + cyrus-sasl \ gammu \ gattlib \ gensio \ @@ -181,12 +184,10 @@ RDEPENDS:packagegroup-meta-oe-core = "\ libnfc \ libsigc++-2.0 \ libsigc++-3 \ - libxml++ \ mdbus2 \ distro-feed-configs \ mm-common \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "ndctl", "", d)} \ - opencl-icd-loader \ pim435 \ proxy-libintl \ safec \ @@ -221,8 +222,8 @@ RDEPENDS:packagegroup-meta-oe-dbs ="\ psqlodbc \ rocksdb \ soci \ - sqlite \ " +RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb" 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)} \ @@ -297,16 +298,18 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ protobuf \ pugixml \ python3-distutils-extra \ + python3-pycups \ rapidjson \ - sip3 \ squashfs-tools-ng \ uftrace \ + valijson \ libxerces-c \ xerces-c-samples \ xmlrpc-c \ yasm \ json-schema-validator \ poke \ + microsoft-gsl \ " RDEPENDS:packagegroup-meta-oe-devtools:append:x86 = " cpuid msr-tools pahole pmtools" RDEPENDS:packagegroup-meta-oe-devtools:append:x86-64 = " cpuid msr-tools pahole pcimem pmtools" @@ -323,19 +326,23 @@ 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 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:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply" RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" +RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php" RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit" RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply" RDEPENDS:packagegroup-meta-oe-extended ="\ bitwise \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ brotli \ byacc \ + cmatrix \ cmpi-bindings \ collectd \ ddrescue \ dialog \ + duktape \ enscript \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \ dlt-daemon \ @@ -403,7 +410,6 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ libstatgrab \ lockfile-progs \ logwatch \ - mailx \ mraa \ ostree \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \ @@ -415,6 +421,7 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ sedutil \ libsigrok \ libsigrokdecode \ + s-nail \ sigrok-cli \ snappy \ tipcutils \ @@ -440,9 +447,9 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:mipsarch = "upm mraa minifi-cpp ti 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 libleak libyang mraa sysdig tiptop" -RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak libyang mraa sysdig tiptop" +RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa sysdig" +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)} \ @@ -457,11 +464,9 @@ RDEPENDS:packagegroup-meta-oe-gnome ="\ gtk+ \ gtkmm3 \ gtkmm \ - libpeas \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libpeas", "", d)} \ pyxdg \ - vte9 \ gnome-theme-adwaita \ - libxmlb \ " RDEPENDS:packagegroup-meta-oe-graphics ="\ @@ -506,7 +511,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ libsdl2-net \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \ libsdl \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "lv-drivers lvgl lv-lib-png", "", d)} \ + lvgl \ ttf-arphic-uming \ ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \ ttf-abyssinica \ @@ -562,7 +567,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ xclock \ xfontsel \ xkbprint \ - xsetmode \ xlsatoms \ xlsclients \ xlsfonts \ @@ -588,9 +592,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ font-cursor-misc \ font-misc-misc \ xorg-fonts-100dpi \ - liblbxutil \ libxaw6 \ - libxkbui \ libxpresent \ xcb-util-cursor \ xserver-common \ @@ -602,13 +604,14 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ surf \ tesseract-lang \ tesseract \ - tigervnc \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \ tslib \ unclutter-xfixes \ libvdpau \ xcursorgen \ - xscreensaver \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \ yad \ + ydotool \ parallel-deqp-runner \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \ @@ -631,25 +634,26 @@ RDEPENDS:packagegroup-meta-oe-kernel ="\ oprofile \ spidev-test \ trace-cmd \ + usbip-tools \ " 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 bpftool" +RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64 = " intel-speed-select ipmiutil pm-graph turbostat bpftool" +RDEPENDS:packagegroup-meta-oe-kernel:append:x86-64:libc-glibc = " kpatch" RDEPENDS:packagegroup-meta-oe-kernel:append:powerpc64 = " 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 = "bpftool crash intel-speed-select kernel-selftest minicoredumper turbostat" -RDEPENDS:packagegroup-meta-oe-kernel:remove:mipsarch = "makedumpfile" +RDEPENDS:packagegroup-meta-oe-kernel:remove:mipsarcho32 = "makedumpfile" RDEPENDS:packagegroup-meta-oe-kernel:remove:mips64 = "crash" RDEPENDS:packagegroup-meta-oe-kernel:remove:mips64el = "crash" -RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv64 = "crash makedumpfile oprofile" +RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv64 = "crash oprofile" RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofile" RDEPENDS:packagegroup-meta-oe-multimedia ="\ - alsa-oss \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faad2", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \ dirsplit \ genisoimage \ icedax \ @@ -660,10 +664,9 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ jack-server \ jack-utils \ libass \ - libburn \ libcdio-paranoia \ libcdio \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \ libmms \ libdvdread \ libopus \ @@ -677,17 +680,14 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ wavpack \ libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "mpv", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \ libopusenc \ " -RDEPENDS:packagegroup-meta-oe-multimedia:remove:libc-musl = "alsa-oss" - RDEPENDS:packagegroup-meta-oe-navigation ="\ geos \ ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "orrery", "", d)} \ geoclue \ libspatialite \ proj \ @@ -695,6 +695,7 @@ RDEPENDS:packagegroup-meta-oe-navigation ="\ RDEPENDS:packagegroup-meta-oe-printing ="\ cups-filters \ + gutenprint \ qpdf \ " @@ -718,7 +719,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ anthy \ atop \ ace-cloud-editor \ - driverctl \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \ frame \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \ grail \ @@ -735,7 +736,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ dfu-util \ dhex \ digitemp \ - dstat \ + dool \ espeak \ evemu-tools \ exiv2 \ @@ -750,12 +751,14 @@ RDEPENDS:packagegroup-meta-oe-support ="\ gpm \ gsoap \ hdf5 \ + hstr \ htop \ hunspell-dictionaries \ hunspell \ hwdata \ iksemel \ gengetopt \ + googlebenchmark \ imagemagick \ iniparser \ inotify-tools \ @@ -814,12 +817,10 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libusbgx \ lockdev \ logwarn \ - libjs-jquery \ libjs-sizzle \ liblinebreak \ mailcap \ liboauth \ - libol \ mg \ monit \ mscgen \ @@ -873,6 +874,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ raptor2 \ rdfind \ re2 \ + sdmon \ sdparm \ serial-forward \ read-edid \ @@ -885,10 +887,10 @@ RDEPENDS:packagegroup-meta-oe-support ="\ system-config-keyboard \ tbb \ satyr \ + pcp \ pcsc-lite \ pcsc-tools \ sharutils \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "toscoterm", "", d)} \ sg3-utils \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \ uchardet \ @@ -921,8 +923,8 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libmicrohttpd \ yaml-cpp \ " -RDEPENDS:packagegroup-meta-oe-support:append:armv7a = " ne10" -RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = " ne10" +RDEPENDS:packagegroup-meta-oe-support:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10" 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" @@ -935,8 +937,10 @@ 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 tbb" -RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "libcereal ssiapi tbb" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi" +RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp" +RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl" RDEPENDS:packagegroup-meta-oe-test ="\ bats \ @@ -972,6 +976,8 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ libee-ptest \ poco-ptest \ cmocka-ptest \ + minicoredumper-ptest \ + hiredis-ptest \ " RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86 = " mcelog-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest" @@ -979,6 +985,7 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:riscv64 = "oprofile-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:riscv32 = "oprofile-ptest" RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:arm = "numactl-ptest" +RDEPENDS:packagegroup-meta-oe-ptest-packages:remove:libc-musl = "minicoredumper-ptest" RDEPENDS:packagegroup-meta-oe-fortran-packages = "\ @@ -990,7 +997,7 @@ RDEPENDS:packagegroup-meta-oe-fortran-packages = "\ # They wont be built as part of images but might be interesting to include # with dev-pkgs images # -# opencl-headers sdbus-c++-libsystemd boost-url nlohmann-fifo sqlite-orm +# opencl-headers sdbus-c++-libsystemd nlohmann-fifo sqlite-orm # nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub # glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade # spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib |