diff options
Diffstat (limited to 'meta/recipes-core/packagegroups')
15 files changed, 53 insertions, 44 deletions
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 9166a0851f..c1d3c25060 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -3,9 +3,9 @@ # SUMMARY = "Host packages for the standalone SDK or external toolchain" -PR = "r12" -inherit packagegroup nativesdk +inherit packagegroup +inherit_defer nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 7489ef61b0..70a1035003 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -1,5 +1,4 @@ SUMMARY = "Merge machine and distro options to create a basic machine task/package" -PR = "r83" # # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH @@ -16,7 +15,6 @@ PACKAGES = ' \ \ ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ - ${@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", "keyboard", "packagegroup-base-keyboard", "", d)} \ @@ -52,7 +50,6 @@ RDEPENDS:packagegroup-base = "\ packagegroup-machine-base \ \ module-init-tools \ - ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ @@ -132,7 +129,6 @@ RRECOMMENDS:packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" # # packages added by machine config # -SUMMARY:packagegroup-machine-base = "${MACHINE} extras" SUMMARY:packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware" RDEPENDS:packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" RRECOMMENDS:packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" @@ -149,11 +145,6 @@ SUMMARY:packagegroup-base-acpi = "ACPI support" RDEPENDS:packagegroup-base-acpi = "\ acpid" -SUMMARY:packagegroup-base-apm = "APM support" -RDEPENDS:packagegroup-base-apm = "\ - ${VIRTUAL-RUNTIME_apm} \ - apmd" - SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" RDEPENDS:packagegroup-base-ext2 = "\ e2fsprogs-e2fsck \ @@ -267,11 +258,14 @@ RRECOMMENDS:packagegroup-base-ipsec = "\ # packagegroup-base-wifi contain everything needed to get WiFi working # WEP/WPA connection needs to be supported out-of-box # +# Choose either 'wpa-supplicant' or 'iwd' as wireless-daemon +WIRELESS_DAEMON ??= "wpa-supplicant" SUMMARY:packagegroup-base-wifi = "WiFi support" RDEPENDS:packagegroup-base-wifi = "\ iw \ wireless-regdb-static \ - wpa-supplicant" + ${WIRELESS_DAEMON} \ +" RRECOMMENDS:packagegroup-base-wifi = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index faf7bc0026..fecc3334ea 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -4,7 +4,6 @@ SUMMARY = "Minimal boot requirements" DESCRIPTION = "The minimal set of packages required to boot the system" -PR = "r17" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -18,7 +17,6 @@ EFI_PROVIDER ??= "grub-efi" SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ modutils-initscripts \ - init-ifupdown \ ${VIRTUAL-RUNTIME_initscripts} \ " @@ -38,4 +36,7 @@ RDEPENDS:${PN} = "\ RRECOMMENDS:${PN} = "\ ${VIRTUAL-RUNTIME_base-utils-syslog} \ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ + ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "init-ifupdown", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit pni-names", "ifupdown", "", d)} \ + " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 35beb3fc05..b8a73175e8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb @@ -3,7 +3,6 @@ # SUMMARY = "NFS package groups" -PR = "r2" inherit packagegroup diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index d70aff22c7..84e1a41d9a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -3,7 +3,6 @@ # SUMMARY = "Software development tools" -PR = "r9" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -11,6 +10,11 @@ inherit packagegroup #PACKAGEFUNCS =+ 'generate_sdk_pkgs' +TARGET_TOOLCHAIN_LANGS ??= "${SDK_TOOLCHAIN_LANGS}" +TARGET_TOOLCHAIN_LANGS:remove:sdkmingw32 = "rust" +# libstd-rs doesn't build for mips n32 with compiler constraint errors +TARGET_TOOLCHAIN_LANGS:remove:mipsarchn32 = "rust" + RDEPENDS:packagegroup-core-sdk = "\ packagegroup-core-buildessential \ coreutils \ @@ -23,7 +27,10 @@ RDEPENDS:packagegroup-core-sdk = "\ less \ ldd \ file \ - tcl" + tcl \ + ${@bb.utils.contains('TARGET_TOOLCHAIN_LANGS', 'go', 'packagegroup-go-sdk-target', '', d)} \ + ${@bb.utils.contains('TARGET_TOOLCHAIN_LANGS', 'rust', 'packagegroup-rust-sdk-target', '', d)} \ +" SANITIZERS = "libasan-dev libubsan-dev" SANITIZERS:arc = "" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 4f844ad925..206292ace4 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb @@ -1,6 +1,6 @@ SUMMARY = "Dropbear SSH client/server" -PR = "r1" inherit packagegroup RDEPENDS:${PN} = "dropbear" +RRECOMMENDS:${PN} = "openssh-sftp-server" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb index 846df12bc7..392403f21b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb @@ -1,5 +1,4 @@ SUMMARY = "OpenSSH SSH client/server" -PR = "r1" inherit packagegroup 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 5ebcbcec82..06fdda90c7 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -1,5 +1,4 @@ SUMMARY = "Target packages for the standalone SDK" -PR = "r8" PACKAGE_ARCH = "${TUNE_PKGARCH}" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb index c75850aa64..56ff1d2b06 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb @@ -8,7 +8,6 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit packagegroup -PR = "r3" MTRACE = "" MTRACE:libc-glibc = "libc-mtrace" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 84eb46b9c2..b3a24b71de 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -4,22 +4,17 @@ SUMMARY = "Profiling tools" -PR = "r3" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -PROFILE_TOOLS_X = "" # sysprof doesn't support aarch64 and nios2 -PROFILE_TOOLS_X:aarch64 = "" -PROFILE_TOOLS_X:nios2 = "" PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" RRECOMMENDS:${PN} = "\ ${PERF} \ blktrace \ - ${PROFILE_TOOLS_X} \ ${PROFILE_TOOLS_SYSTEMD} \ " @@ -35,7 +30,6 @@ PERF:riscv32 = "" SYSTEMTAP = "systemtap" SYSTEMTAP:libc-musl = "" SYSTEMTAP:nios2 = "" -SYSTEMTAP:riscv64 = "" SYSTEMTAP:riscv32 = "" LTTNGTOOLS = "lttng-tools" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 1fee1c925d..34af40a43f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -4,7 +4,6 @@ SUMMARY = "Testing tools/applications" -PR = "r2" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb index 61629d273c..c03918acc8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb @@ -6,7 +6,6 @@ RDEPENDS:${PN} = " \ go \ go-runtime \ go-runtime-dev \ - go-runtime-staticdev \ " COMPATIBLE_HOST = "^(?!riscv32).*" diff --git a/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb index 0d4f5ec9ef..bb10a2d34f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb @@ -6,13 +6,16 @@ inherit cross-canadian packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RUST="rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" -CARGO="cargo-cross-canadian-${TRANSLATED_TARGET_ARCH}" -RUST_TOOLS="rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH}" RDEPENDS:${PN} = " \ ${@all_multilib_tune_values(d, 'RUST')} \ - ${@all_multilib_tune_values(d, 'CARGO')} \ - rust-cross-canadian-src \ - ${@all_multilib_tune_values(d, 'RUST_TOOLS')} \ + nativesdk-binutils \ + nativesdk-gcc \ + nativesdk-glibc-dev \ + nativesdk-libgcc-dev \ + nativesdk-rust \ + nativesdk-cargo \ + nativesdk-rust-tools-clippy \ + nativesdk-rust-tools-rustfmt \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-rust-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-rust-sdk-target.bb new file mode 100644 index 0000000000..59874c4c2c --- /dev/null +++ b/meta/recipes-core/packagegroups/packagegroup-rust-sdk-target.bb @@ -0,0 +1,14 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "Target packages for the Rust SDK" + +inherit packagegroup + +RDEPENDS:${PN} = " \ + rust \ + cargo \ +" diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 9523aadd15..df71695a97 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -4,7 +4,6 @@ SUMMARY = "Self-hosting" DESCRIPTION = "Packages required to run the build system" -PR = "r13" PACKAGE_ARCH = "${TUNE_PKGARCH}" @@ -41,7 +40,7 @@ RDEPENDS:packagegroup-self-hosted-host-tools = "\ iptables \ lsb-release \ mc \ - mc-fish \ + mc-shell \ mc-helpers \ mc-helpers-perl \ parted \ @@ -98,11 +97,14 @@ RDEPENDS:packagegroup-self-hosted-sdk:append:libc-glibc = "\ glibc-utils \ rpcsvc-proto \ " + +STRACE = "strace" +STRACE:riscv32 = "" RDEPENDS:packagegroup-self-hosted-debug = " \ gdb \ gdbserver \ rsync \ - strace \ + ${STRACE} \ tcf-agent" @@ -124,12 +126,10 @@ RDEPENDS:packagegroup-self-hosted-extended = "\ grep \ groff \ gzip \ - settings-daemon \ libaio \ libusb1 \ libxml2 \ lsof \ - lzo \ man \ man-pages \ mdadm \ @@ -158,6 +158,7 @@ RDEPENDS:packagegroup-self-hosted-extended = "\ readline \ rpm \ setserial \ + settings-daemon \ socat \ subversion \ sudo \ @@ -171,22 +172,23 @@ RDEPENDS:packagegroup-self-hosted-extended = "\ wget \ which \ xinetd \ + xz \ zip \ zlib \ - xz \ + zstd \ " RDEPENDS:packagegroup-self-hosted-graphics = "\ + adwaita-icon-theme \ builder \ + l3afpad \ libgl \ libgl-dev \ libglu \ libglu-dev \ libx11-dev \ - adwaita-icon-theme \ - xdg-utils \ - l3afpad \ pcmanfm \ vte \ + xdg-utils \ " |