diff options
Diffstat (limited to 'meta/recipes-core/packagegroups')
12 files changed, 95 insertions, 99 deletions
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 2c2abed33c..ae989011f4 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -4,7 +4,6 @@ SUMMARY = "Host packages for the standalone SDK or external toolchain" PR = "r12" -LICENSE = "MIT" inherit packagegroup nativesdk @@ -22,9 +21,12 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ nativesdk-shadow \ nativesdk-makedevs \ - nativesdk-smartpm \ - nativesdk-postinst-intercept \ + nativesdk-cmake \ + nativesdk-meson \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \ + nativesdk-sdk-provides-dummy \ + nativesdk-bison \ + nativesdk-flex \ " RDEPENDS_${PN}_darwin = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 2e94fdefb5..1f802da09b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -7,7 +7,6 @@ PR = "r83" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -inherit bluetooth PROVIDES = "${PACKAGES}" PACKAGES = ' \ @@ -21,7 +20,6 @@ PACKAGES = ' \ ${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \ @@ -54,7 +52,6 @@ RDEPENDS_packagegroup-base = "\ packagegroup-distro-base \ packagegroup-machine-base \ \ - sysfsutils \ module-init-tools \ ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ @@ -64,7 +61,6 @@ RDEPENDS_packagegroup-base = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \ ${@bb.utils.contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \ ${@bb.utils.contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \ ${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \ ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \ ${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \ @@ -110,8 +106,8 @@ python __anonymous () { # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) # then include packagegroup-base-wifi in packagegroup-base - distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) - machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) + distro_features = set(d.getVar("DISTRO_FEATURES").split()) + machine_features= set(d.getVar("MACHINE_FEATURES").split()) if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): d.setVar("ADD_BT", "packagegroup-base-bluetooth") @@ -152,8 +148,7 @@ RDEPENDS_packagegroup-base-pci = "\ SUMMARY_packagegroup-base-acpi = "ACPI support" RDEPENDS_packagegroup-base-acpi = "\ - acpid \ - libacpi " + acpid" SUMMARY_packagegroup-base-apm = "APM support" RDEPENDS_packagegroup-base-apm = "\ @@ -203,8 +198,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" RDEPENDS_packagegroup-base-bluetooth = "\ - ${BLUEZ} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ + bluez5 \ " RRECOMMENDS_packagegroup-base-bluetooth = "\ @@ -223,23 +217,6 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ " -SUMMARY_packagegroup-base-irda = "IrDA support" -RDEPENDS_packagegroup-base-irda = "\ - irda-utils" - -RRECOMMENDS_packagegroup-base-irda = "\ - kernel-module-pxaficp-ir \ - kernel-module-irda \ - kernel-module-ircomm \ - kernel-module-ircomm-tty \ - kernel-module-irlan \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ - kernel-module-irport \ - kernel-module-irtty \ - kernel-module-irtty-sir \ - kernel-module-sir-dev \ - ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " - SUMMARY_packagegroup-base-usbgadget = "USB gadget support" RRECOMMENDS_packagegroup-base-usbgadget = "\ kernel-module-pxa27x_udc \ @@ -291,9 +268,8 @@ RRECOMMENDS_packagegroup-base-ipsec = "\ # SUMMARY_packagegroup-base-wifi = "WiFi support" RDEPENDS_packagegroup-base-wifi = "\ - ${VIRTUAL-RUNTIME_wireless-tools} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ + iw \ + wireless-regdb-static \ wpa-supplicant" RRECOMMENDS_packagegroup-base-wifi = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 04bc0f2b69..abbee14bd4 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -10,19 +10,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" -VIRTUAL-RUNTIME_login_manager ?= "busybox" -VIRTUAL-RUNTIME_init_manager ?= "sysvinit" -VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" +EFI_PROVIDER ??= "grub-efi" + SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ modutils-initscripts \ init-ifupdown \ @@ -35,6 +28,7 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_base-utils} \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER} kernel", "", d)} \ netbase \ ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ @@ -43,4 +37,5 @@ RDEPENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" RRECOMMENDS_${PN} = "\ + ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index aceba78ded..03fa5296c1 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -16,7 +16,6 @@ RDEPENDS_packagegroup-core-sdk = "\ coreutils \ ccache \ diffutils \ - intltool \ perl-module-re \ perl-module-text-wrap \ findutils \ @@ -27,16 +26,13 @@ RDEPENDS_packagegroup-core-sdk = "\ tcl" SANITIZERS = "libasan-dev libubsan-dev" -SANITIZERS_aarch64 = "" -SANITIZERS_mips = "" -SANITIZERS_mipsel = "" -SANITIZERS_mips64 = "" -SANITIZERS_mips64n32 = "" +SANITIZERS_arc = "" +SANITIZERS_microblaze = "" +SANITIZERS_mipsarch = "" SANITIZERS_nios2 = "" -SANITIZERS_powerpc64 = "" -SANITIZERS_sparc = "" +SANITIZERS_riscv64 = "" +SANITIZERS_riscv32 = "" SANITIZERS_libc-musl = "" -SANITIZERS_libc-uclibc = "" RRECOMMENDS_packagegroup-core-sdk = "\ libgomp \ @@ -45,7 +41,7 @@ RRECOMMENDS_packagegroup-core-sdk = "\ #python generate_sdk_pkgs () { # poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES'] -# pkgs = d.getVar('PACKAGES', True).split() +# pkgs = d.getVar('PACKAGES').split() # for pkg in poky_pkgs.split(): # newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk') # diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 274e11a8b0..2a54f1ca3e 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -1,6 +1,8 @@ SUMMARY = "Target packages for the standalone SDK" PR = "r8" +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup RDEPENDS_${PN} = "\ @@ -12,3 +14,8 @@ RDEPENDS_${PN} = "\ libstdc++-dev \ ${LIBC_DEPENDENCIES} \ " + +RRECOMMENDS_${PN}_mingw32 = "\ + libssp \ + libssp-dev \ + " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb index 9fc2b0ef4d..81fbdf4608 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb @@ -4,6 +4,8 @@ SUMMARY = "Debugging tools" +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup PR = "r3" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index dd9844504b..3fd423c592 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -18,7 +18,6 @@ PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'sys RRECOMMENDS_${PN} = "\ ${PERF} \ - trace-cmd \ blktrace \ ${PROFILE_TOOLS_X} \ ${PROFILE_TOOLS_SYSTEMD} \ @@ -26,54 +25,43 @@ RRECOMMENDS_${PN} = "\ PROFILETOOLS = "\ powertop \ - latencytop \ " PERF = "perf" PERF_libc-musl = "" -# systemtap needs elfutils which is not fully buildable on uclibc -# hence we exclude it from uclibc based builds +# systemtap needs elfutils which is not fully buildable on some arches/libcs SYSTEMTAP = "systemtap" -SYSTEMTAP_libc-uclibc = "" SYSTEMTAP_libc-musl = "" -SYSTEMTAP_mips = "" -SYSTEMTAP_mipsel = "" -SYSTEMTAP_mips64 = "" -SYSTEMTAP_mips64n32 = "" SYSTEMTAP_nios2 = "" -SYSTEMTAP_aarch64 = "" - -# lttng-ust uses sched_getcpu() which is not there on uclibc -# for some of the architectures it can be patched to call the -# syscall directly but for x86_64 __NR_getcpu is a vsyscall -# which means we can not use syscall() to call it. So we ignore -# it for x86_64/uclibc +SYSTEMTAP_riscv64 = "" +# lttng-ust uses sched_getcpu() which is not there on for some platforms. LTTNGUST = "lttng-ust" -LTTNGUST_libc-uclibc = "" -LTTNGUST_libc-musl = "" +LTTNGUST_arc = "" LTTNGTOOLS = "lttng-tools" -LTTNGTOOLS_libc-musl = "" +LTTNGTOOLS_arc = "" LTTNGMODULES = "lttng-modules" +LTTNGMODULES_arc = "" BABELTRACE = "babeltrace" # valgrind does not work on the following configurations/architectures VALGRIND = "valgrind" -VALGRIND_libc-uclibc = "" VALGRIND_libc-musl = "" -VALGRIND_mips = "" -VALGRIND_mipsel = "" -VALGRIND_mips64 = "" -VALGRIND_mips64n32 = "" +VALGRIND_mipsarch = "" VALGRIND_nios2 = "" +VALGRIND_arc = "" VALGRIND_armv4 = "" VALGRIND_armv5 = "" VALGRIND_armv6 = "" +VALGRIND_armeb = "" VALGRIND_aarch64 = "" +VALGRIND_riscv64 = "" +VALGRIND_linux-gnux32 = "" +VALGRIND_linux-gnun32 = "" RDEPENDS_${PN} = "\ ${PROFILETOOLS} \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 317097854f..a5fc152859 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -10,10 +10,15 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -# kexec-tools doesn't work on e5500-64b and nios2 yet +# kexec-tools doesn't work on e5500-64b, microblaze and nios2 yet KEXECTOOLS ?= "kexec" KEXECTOOLS_e5500-64b ?= "" +KEXECTOOLS_microblaze ?= "" KEXECTOOLS_nios2 ?= "" +KEXECTOOLS_riscv64 ?= "" + +GSTEXAMPLES ?= "gst-examples" +GSTEXAMPLES_riscv64 = "" X11GLTOOLS = "\ mesa-demos \ @@ -24,18 +29,15 @@ X11GLTOOLS = "\ " X11TOOLS = "\ - fstests \ - gst-player \ + ${GSTEXAMPLES} \ x11perf \ xrestop \ xwininfo \ xprop \ - xvideo-tests \ " RDEPENDS_${PN} = "\ blktool \ - lrzsz \ ${KEXECTOOLS} \ alsa-utils-amixer \ alsa-utils-aplay \ diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index d551147b5a..3b430c0814 100644 --- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb @@ -16,3 +16,9 @@ RDEPENDS_${PN} = "\ ${@all_multilib_tune_values(d, 'GDB')} \ meta-environment-${MACHINE} \ " + +# When TUNE_ARCH changes but MACHINE does not (for example when a machine definition is updated), +# cross-canadian.bbclass prevents variable dependency propagation to TRANSLATED_TARGET_ARCH +# This will result in erroneous reuse of previous sstate packages. The following line +# establishes a direct dependency instead. +do_package[vardeps] += "TUNE_ARCH" diff --git a/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb new file mode 100644 index 0000000000..3daace1a40 --- /dev/null +++ b/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb @@ -0,0 +1,12 @@ +SUMMARY = "Host SDK package for Go cross canadian toolchain" +PN = "packagegroup-go-cross-canadian-${MACHINE}" + +inherit cross-canadian packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +GO = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" + +RDEPENDS_${PN} = " \ + ${@all_multilib_tune_values(d, 'GO')} \ +" diff --git a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb new file mode 100644 index 0000000000..5afb490aac --- /dev/null +++ b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb @@ -0,0 +1,11 @@ +SUMMARY = "Target packages for the Go SDK" + +inherit packagegroup goarch + +RDEPENDS_${PN} = " \ + go-runtime \ + go-runtime-dev \ + go-runtime-staticdev \ +" + +COMPATIBLE_HOST = "^(?!riscv64).*" diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 73430b86cd..ea6d567301 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -6,10 +6,15 @@ SUMMARY = "Self-hosting" DESCRIPTION = "Packages required to run the build system" PR = "r13" -inherit packagegroup distro_features_check +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit packagegroup features_check # rdepends on libx11-dev REQUIRED_DISTRO_FEATURES = "x11" +# rdepends on libgl +REQUIRED_DISTRO_FEATURES += "opengl" + PACKAGES = "\ packagegroup-self-hosted \ packagegroup-self-hosted-debug \ @@ -34,12 +39,11 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ e2fsprogs-tune2fs \ hdparm \ iptables \ - lsb \ + lsb-release \ mc \ mc-fish \ mc-helpers \ mc-helpers-perl \ - mc-helpers-python \ parted \ ${PSEUDO} \ screen \ @@ -71,27 +75,28 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ g++-symlinks \ gcc \ gcc-symlinks \ - intltool \ ldd \ less \ - libssp \ - libssp-dev \ - libssp-staticdev \ libstdc++ \ libstdc++-dev \ libtool \ make \ - mktemp \ perl-module-re \ perl-module-text-wrap \ pkgconfig \ quilt \ sed \ " -# glibc-utils: for rpcgen +RDEPENDS_packagegroup-self-hosted-sdk_append_mingw32 = "\ + libssp \ + libssp-dev \ + libssp-staticdev \ + " +# rpcsvc-proto: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ glibc-gconv-ibm850 \ glibc-utils \ + rpcsvc-proto \ " RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \ @@ -124,7 +129,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ libaio \ libusb1 \ libxml2 \ - lrzsz \ lsof \ lzo \ man \ @@ -134,21 +138,20 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ mtools \ ncurses \ ncurses-terminfo-base \ - neon \ nfs-utils \ nfs-utils-client \ openssl \ + openssh-scp \ openssh-sftp-server \ + openssh-ssh \ opkg \ opkg-utils \ patch \ perl \ perl-dev \ + perl-misc \ perl-modules \ perl-pod \ - python \ - python-modules \ - python-git \ python3 \ python3-modules \ python3-git \ @@ -162,7 +165,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ sysstat \ tar \ tcl \ - texi2html \ texinfo \ unzip \ usbutils \ @@ -182,12 +184,9 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\ libgl-dev \ libglu \ libglu-dev \ - libsdl \ - libsdl-dev \ libx11-dev \ adwaita-icon-theme \ xdg-utils \ - epiphany \ l3afpad \ pcmanfm \ vte \ |