diff options
Diffstat (limited to 'meta/recipes-core/packagegroups')
19 files changed, 275 insertions, 243 deletions
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index aee4a03718..c1d3c25060 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -3,13 +3,15 @@ # SUMMARY = "Host packages for the standalone SDK or external toolchain" -PR = "r12" -inherit packagegroup nativesdk +inherit packagegroup +inherit_defer nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -RDEPENDS_${PN} = "\ +# autoconf pulls in nativesdk-perl but perl-module-integer is needed to +# build some recent linux kernels (5.14+) for arm +RDEPENDS:${PN} = "\ nativesdk-pkgconfig \ nativesdk-qemu \ nativesdk-qemu-helper \ @@ -21,13 +23,16 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ nativesdk-shadow \ nativesdk-makedevs \ - nativesdk-dnf \ nativesdk-cmake \ - nativesdk-postinst-intercept \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \ + nativesdk-meson \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland-tools nativesdk-wayland-dev', '', d)} \ + nativesdk-sdk-provides-dummy \ + nativesdk-bison \ + nativesdk-flex \ + nativesdk-perl-module-integer \ " -RDEPENDS_${PN}_darwin = "\ +RDEPENDS:${PN}:darwin = "\ nativesdk-pkgconfig \ nativesdk-opkg \ nativesdk-libtool \ diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 313628e6c7..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 @@ -7,9 +6,7 @@ PR = "r83" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -inherit bluetooth -PROVIDES = "${PACKAGES}" PACKAGES = ' \ packagegroup-base \ packagegroup-base-extended \ @@ -18,10 +15,8 @@ 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", "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)} \ @@ -50,13 +45,11 @@ VIRTUAL-RUNTIME_keymaps ?= "keymaps" # # packagegroup-base contain stuff needed for base system (machine related) # -RDEPENDS_packagegroup-base = "\ +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)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ @@ -64,7 +57,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)} \ @@ -84,7 +76,7 @@ RDEPENDS_packagegroup-base = "\ " -RRECOMMENDS_packagegroup-base = "\ +RRECOMMENDS:packagegroup-base = "\ kernel-module-nls-utf8 \ kernel-module-input \ kernel-module-uinput \ @@ -93,7 +85,7 @@ RRECOMMENDS_packagegroup-base = "\ kernel-module-rtc-sysfs \ kernel-module-unix" -RDEPENDS_packagegroup-base-extended = "\ +RDEPENDS:packagegroup-base-extended = "\ packagegroup-base \ ${ADD_WIFI} \ ${ADD_BT} \ @@ -114,83 +106,78 @@ python __anonymous () { 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") + d.setVar("ADD_BT", "${MLPREFIX}packagegroup-base-bluetooth") if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): - d.setVar("ADD_WIFI", "packagegroup-base-wifi") + d.setVar("ADD_WIFI", "${MLPREFIX}packagegroup-base-wifi") if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): - d.setVar("ADD_3G", "packagegroup-base-3g") + d.setVar("ADD_3G", "${MLPREFIX}packagegroup-base-3g") if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): - d.setVar("ADD_NFC", "packagegroup-base-nfc") + d.setVar("ADD_NFC", "${MLPREFIX}packagegroup-base-nfc") } # # packages added by distribution # -SUMMARY_packagegroup-distro-base = "${DISTRO} extras" +SUMMARY:packagegroup-distro-base = "${DISTRO} extras" DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}" -RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" -RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" +RDEPENDS:packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" +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}" +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}" -SUMMARY_packagegroup-base-keyboard = "Keyboard support" -RDEPENDS_packagegroup-base-keyboard = "\ +SUMMARY:packagegroup-base-keyboard = "Keyboard support" +RDEPENDS:packagegroup-base-keyboard = "\ ${VIRTUAL-RUNTIME_keymaps}" -SUMMARY_packagegroup-base-pci = "PCI bus support" -RDEPENDS_packagegroup-base-pci = "\ +SUMMARY:packagegroup-base-pci = "PCI bus support" +RDEPENDS:packagegroup-base-pci = "\ pciutils" -SUMMARY_packagegroup-base-acpi = "ACPI support" -RDEPENDS_packagegroup-base-acpi = "\ - acpid \ - libacpi " +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 = "\ - hdparm \ - e2fsprogs \ +SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" +RDEPENDS:packagegroup-base-ext2 = "\ e2fsprogs-e2fsck \ e2fsprogs-mke2fs" -SUMMARY_packagegroup-base-vfat = "FAT filesystem support" -RRECOMMENDS_packagegroup-base-vfat = "\ +RRECOMMENDS:packagegroup-base-ext2 = "\ + hdparm \ + e2fsprogs" + +SUMMARY:packagegroup-base-vfat = "FAT filesystem support" +RRECOMMENDS:packagegroup-base-vfat = "\ kernel-module-msdos \ kernel-module-vfat \ kernel-module-nls-iso8859-1 \ kernel-module-nls-cp437 \ dosfstools" -SUMMARY_packagegroup-base-alsa = "ALSA sound support" -RDEPENDS_packagegroup-base-alsa = "\ +SUMMARY:packagegroup-base-alsa = "ALSA sound support" +RDEPENDS:packagegroup-base-alsa = "\ alsa-utils-alsactl \ - alsa-utils-alsamixer \ + alsa-utils-amixer \ ${VIRTUAL-RUNTIME_alsa-state}" -RRECOMMENDS_packagegroup-base-alsa = "\ +RRECOMMENDS:packagegroup-base-alsa = "\ kernel-module-snd-mixer-oss \ kernel-module-snd-pcm-oss" -SUMMARY_packagegroup-base-pcmcia = "PC card slot support" -RDEPENDS_packagegroup-base-pcmcia = "\ +SUMMARY:packagegroup-base-pcmcia = "PC card slot support" +RDEPENDS:packagegroup-base-pcmcia = "\ pcmciautils \ " -RRECOMMENDS_packagegroup-base-pcmcia = "\ +RRECOMMENDS:packagegroup-base-pcmcia = "\ kernel-module-pcmcia \ kernel-module-airo-cs \ kernel-module-pcnet-cs \ @@ -201,13 +188,12 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" -SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" -RDEPENDS_packagegroup-base-bluetooth = "\ - ${BLUEZ} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \ +SUMMARY:packagegroup-base-bluetooth = "Bluetooth support" +RDEPENDS:packagegroup-base-bluetooth = "\ + bluez5 \ " -RRECOMMENDS_packagegroup-base-bluetooth = "\ +RRECOMMENDS:packagegroup-base-bluetooth = "\ kernel-module-bluetooth \ kernel-module-l2cap \ kernel-module-rfcomm \ @@ -223,36 +209,19 @@ 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 = "\ +SUMMARY:packagegroup-base-usbgadget = "USB gadget support" +RRECOMMENDS:packagegroup-base-usbgadget = "\ kernel-module-pxa27x_udc \ kernel-module-gadgetfs \ kernel-module-g-file-storage \ kernel-module-g-serial \ kernel-module-g-ether" -SUMMARY_packagegroup-base-usbhost = "USB host support" -RDEPENDS_packagegroup-base-usbhost = "\ +SUMMARY:packagegroup-base-usbhost = "USB host support" +RDEPENDS:packagegroup-base-usbhost = "\ usbutils " -RRECOMMENDS_packagegroup-base-usbhost = "\ +RRECOMMENDS:packagegroup-base-usbhost = "\ kernel-module-uhci-hcd \ kernel-module-ohci-hcd \ kernel-module-ehci-hcd \ @@ -266,35 +235,39 @@ RRECOMMENDS_packagegroup-base-usbhost = "\ kernel-module-usbserial \ kernel-module-usb-storage " -SUMMARY_packagegroup-base-ppp = "PPP dial-up protocol support" -RDEPENDS_packagegroup-base-ppp = "\ +SUMMARY:packagegroup-base-ppp = "PPP dial-up protocol support" +RDEPENDS:packagegroup-base-ppp = "\ ppp \ ppp-dialin" -RRECOMMENDS_packagegroup-base-ppp = "\ +RRECOMMENDS:packagegroup-base-ppp = "\ kernel-module-ppp-async \ kernel-module-ppp-deflate \ kernel-module-ppp-generic \ kernel-module-ppp-mppe \ kernel-module-slhc" -SUMMARY_packagegroup-base-ipsec = "IPSEC support" -RDEPENDS_packagegroup-base-ipsec = "\ +SUMMARY:packagegroup-base-ipsec = "IPSEC support" +RDEPENDS:packagegroup-base-ipsec = "\ " -RRECOMMENDS_packagegroup-base-ipsec = "\ +RRECOMMENDS:packagegroup-base-ipsec = "\ kernel-module-ipsec" # # packagegroup-base-wifi contain everything needed to get WiFi working # WEP/WPA connection needs to be supported out-of-box # -SUMMARY_packagegroup-base-wifi = "WiFi support" -RDEPENDS_packagegroup-base-wifi = "\ - ${VIRTUAL-RUNTIME_wireless-tools} \ - wpa-supplicant" - -RRECOMMENDS_packagegroup-base-wifi = "\ +# 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 \ + ${WIRELESS_DAEMON} \ +" + +RRECOMMENDS:packagegroup-base-wifi = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ kernel-module-ieee80211-crypt \ kernel-module-ieee80211-crypt-ccmp \ @@ -308,59 +281,59 @@ RRECOMMENDS_packagegroup-base-wifi = "\ kernel-module-aes-generic \ kernel-module-aes" -SUMMARY_packagegroup-base-nfc = "Near Field Communication support" -RDEPENDS_packagegroup-base-nfc = "\ +SUMMARY:packagegroup-base-nfc = "Near Field Communication support" +RDEPENDS:packagegroup-base-nfc = "\ neard" -RRECOMMENDS_packagegroup-base-nfc = "\ +RRECOMMENDS:packagegroup-base-nfc = "\ kernel-module-nfc" -SUMMARY_packagegroup-base-3g = "Cellular data support" -RDEPENDS_packagegroup-base-3g = "\ +SUMMARY:packagegroup-base-3g = "Cellular data support" +RDEPENDS:packagegroup-base-3g = "\ ofono" -RRECOMMENDS_packagegroup-base-3g = "\ +RRECOMMENDS:packagegroup-base-3g = "\ kernel-module-cdc-acm \ kernel-module-cdc-wdm" -SUMMARY_packagegroup-base-smbfs = "SMB network filesystem support" -RRECOMMENDS_packagegroup-base-smbfs = "\ +SUMMARY:packagegroup-base-smbfs = "SMB network filesystem support" +RRECOMMENDS:packagegroup-base-smbfs = "\ kernel-module-cifs \ kernel-module-smbfs" -SUMMARY_packagegroup-base-cramfs = "cramfs filesystem support" -RRECOMMENDS_packagegroup-base-cramfs = "\ +SUMMARY:packagegroup-base-cramfs = "cramfs filesystem support" +RRECOMMENDS:packagegroup-base-cramfs = "\ kernel-module-cramfs" # # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package # -SUMMARY_packagegroup-base-nfs = "NFS network filesystem support" -RDEPENDS_packagegroup-base-nfs = "\ +SUMMARY:packagegroup-base-nfs = "NFS network filesystem support" +RDEPENDS:packagegroup-base-nfs = "\ rpcbind" -RRECOMMENDS_packagegroup-base-nfs = "\ +RRECOMMENDS:packagegroup-base-nfs = "\ kernel-module-nfs " -SUMMARY_packagegroup-base-zeroconf = "Zeroconf support" -RDEPENDS_packagegroup-base-zeroconf = "\ +SUMMARY:packagegroup-base-zeroconf = "Zeroconf support" +RDEPENDS:packagegroup-base-zeroconf = "\ avahi-daemon" -RDEPENDS_packagegroup-base-zeroconf_append_libc-glibc = "\ +RDEPENDS:packagegroup-base-zeroconf:append:libc-glibc = "\ libnss-mdns \ " -SUMMARY_packagegroup-base-ipv6 = "IPv6 support" -RDEPENDS_packagegroup-base-ipv6 = "\ +SUMMARY:packagegroup-base-ipv6 = "IPv6 support" +RDEPENDS:packagegroup-base-ipv6 = "\ " -RRECOMMENDS_packagegroup-base-ipv6 = "\ +RRECOMMENDS:packagegroup-base-ipv6 = "\ kernel-module-ipv6 " -SUMMARY_packagegroup-base-serial = "Serial port support" -RDEPENDS_packagegroup-base-serial = "\ +SUMMARY:packagegroup-base-serial = "Serial port support" +RDEPENDS:packagegroup-base-serial = "\ setserial \ lrzsz " -SUMMARY_packagegroup-base-phone = "Cellular telephony (voice) support" -RDEPENDS_packagegroup-base-phone = "\ +SUMMARY:packagegroup-base-phone = "Cellular telephony (voice) support" +RDEPENDS:packagegroup-base-phone = "\ ofono" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 04bc0f2b69..fecc3334ea 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -4,37 +4,29 @@ SUMMARY = "Minimal boot requirements" DESCRIPTION = "The minimal set of packages required to boot the system" -PR = "r17" 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 \ ${VIRTUAL-RUNTIME_initscripts} \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ base-files \ base-passwd \ ${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} \ @@ -42,5 +34,9 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_${PN} = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" +RRECOMMENDS:${PN} = "\ + ${VIRTUAL-RUNTIME_base-utils-syslog} \ + ${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-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb index 78cc65db87..2cd67ad05f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb @@ -5,9 +5,12 @@ SUMMARY = "Essential build dependencies" +# libstdc++ gets debian renamed +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup -RDEPENDS_packagegroup-core-buildessential = "\ +RDEPENDS:packagegroup-core-buildessential = "\ autoconf \ automake \ binutils \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb index c45463fc6c..4e91aaf47b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb @@ -2,7 +2,7 @@ SUMMARY = "Remote debugging tools for Eclipse integration" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ gdbserver \ tcf-agent \ openssh-sftp-server \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index b345e314ad..b8a73175e8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb @@ -3,18 +3,16 @@ # SUMMARY = "NFS package groups" -PR = "r2" inherit packagegroup -PROVIDES = "${PACKAGES}" PACKAGES = "${PN}-server ${PN}-client" -SUMMARY_${PN}-client = "NFS client" -RDEPENDS_${PN}-client = "nfs-utils-client" +SUMMARY:${PN}-client = "NFS client" +RDEPENDS:${PN}-client = "nfs-utils-client" -SUMMARY_${PN}-server = "NFS server" -RDEPENDS_${PN}-server = "\ +SUMMARY:${PN}-server = "NFS server" +RDEPENDS:${PN}-server = "\ nfs-utils \ nfs-utils-client \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index af0ce2013e..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,12 +10,16 @@ inherit packagegroup #PACKAGEFUNCS =+ 'generate_sdk_pkgs' -RDEPENDS_packagegroup-core-sdk = "\ +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 \ ccache \ diffutils \ - intltool \ perl-module-re \ perl-module-text-wrap \ findutils \ @@ -24,17 +27,21 @@ 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_aarch64 = "" -SANITIZERS_mipsarch = "" -SANITIZERS_nios2 = "" -SANITIZERS_powerpc64 = "" -SANITIZERS_sparc = "" -SANITIZERS_libc-musl = "" +SANITIZERS:arc = "" +SANITIZERS:microblaze = "" +SANITIZERS:mipsarch = "" +SANITIZERS:nios2 = "" +SANITIZERS:riscv64 = "" +SANITIZERS:riscv32 = "" +SANITIZERS:libc-musl = "" -RRECOMMENDS_packagegroup-core-sdk = "\ +RRECOMMENDS:packagegroup-core-sdk = "\ libgomp \ libgomp-dev \ ${SANITIZERS}" @@ -53,7 +60,7 @@ RRECOMMENDS_packagegroup-core-sdk = "\ # # the package depchain code # spkgdata = read_subpkgdata(pkg, d) # -# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') +# rdepends = explode_deps(spkgdata.get('RDEPENDS:%s' % pkg) or '') # rreclist = [] # # for depend in rdepends: @@ -63,16 +70,16 @@ RRECOMMENDS_packagegroup-core-sdk = "\ # rreclist.append('%s-dev' % name) # else: # deppkgdata = read_subpkgdata(name, d) -# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') +# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS:%s' % name) or '') # for depend in rdepends2: # split_depend = depend.split(' (') # name = split_depend[0].strip() # if packaged('%s-dev' % name, d): # rreclist.append('%s-dev' % name) # -# oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg, False) or '' -# d.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist)) -# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg, False))) +# oldrrec = d.getVar('RRECOMMENDS:%s' % newpkg, False) or '' +# d.setVar('RRECOMMENDS:%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist)) +# # bb.note('RRECOMMENDS:%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS:%s' % newpkg, False))) # # # bb.note('pkgs is %s' % pkgs) # d.setVar('PACKAGES', ' '.join(pkgs)) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 5ec3f6c927..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" +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 703f956aea..392403f21b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb @@ -1,6 +1,5 @@ SUMMARY = "OpenSSH SSH client/server" -PR = "r1" inherit packagegroup -RDEPENDS_${PN} = "openssh" +RDEPENDS:${PN} = "openssh" 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 43fc599c73..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,9 +1,10 @@ SUMMARY = "Target packages for the standalone SDK" -PR = "r8" + +PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ libgcc \ libgcc-dev \ libatomic \ @@ -13,7 +14,7 @@ RDEPENDS_${PN} = "\ ${LIBC_DEPENDENCIES} \ " -RRECOMMENDS_${PN} = "\ +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..56ff1d2b06 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb @@ -4,16 +4,20 @@ SUMMARY = "Debugging tools" +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup -PR = "r3" MTRACE = "" -MTRACE_libc-glibc = "libc-mtrace" +MTRACE:libc-glibc = "libc-mtrace" + +STRACE = "strace" +STRACE:riscv32 = "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ gdb \ gdbserver \ - strace \ ${MTRACE} \ + ${STRACE} \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 51335e232d..b3a24b71de 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -4,69 +4,64 @@ SUMMARY = "Profiling tools" -PR = "r3" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" # 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} = "\ +RRECOMMENDS:${PN} = "\ ${PERF} \ - trace-cmd \ blktrace \ - ${PROFILE_TOOLS_X} \ ${PROFILE_TOOLS_SYSTEMD} \ " PROFILETOOLS = "\ powertop \ - latencytop \ " PERF = "perf" -PERF_libc-musl = "" +PERF:libc-musl = "" +PERF:libc-musl:arm = "perf" +PERF:riscv32 = "" # systemtap needs elfutils which is not fully buildable on some arches/libcs SYSTEMTAP = "systemtap" -SYSTEMTAP_libc-musl = "" -SYSTEMTAP_mipsarch = "" -SYSTEMTAP_nios2 = "" -SYSTEMTAP_aarch64 = "" - -# lttng-ust uses sched_getcpu() which is not there on for some platforms. -LTTNGUST = "lttng-ust" -LTTNGUST_libc-musl = "" +SYSTEMTAP:libc-musl = "" +SYSTEMTAP:nios2 = "" +SYSTEMTAP:riscv32 = "" LTTNGTOOLS = "lttng-tools" -LTTNGTOOLS_libc-musl = "" - -LTTNGMODULES = "lttng-modules" +LTTNGTOOLS:arc = "" +LTTNGTOOLS:riscv32 = "" BABELTRACE = "babeltrace" +BABELTRACE2 = "babeltrace2" # valgrind does not work on the following configurations/architectures VALGRIND = "valgrind" -VALGRIND_libc-musl = "" -VALGRIND_mipsarch = "" -VALGRIND_nios2 = "" -VALGRIND_armv4 = "" -VALGRIND_armv5 = "" -VALGRIND_armv6 = "" -VALGRIND_aarch64 = "" -VALGRIND_linux-gnux32 = "" +VALGRIND:libc-musl = "" +VALGRIND:mipsarch = "" +VALGRIND:nios2 = "" +VALGRIND:arc = "" +VALGRIND:armv4 = "" +VALGRIND:armv5 = "" +VALGRIND:armv6 = "" +VALGRIND:armeb = "" +VALGRIND:aarch64 = "" +VALGRIND:riscv64 = "" +VALGRIND:riscv32 = "" +VALGRIND:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}" +VALGRIND:linux-gnux32 = "" +VALGRIND:linux-gnun32 = "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${PROFILETOOLS} \ - ${LTTNGUST} \ ${LTTNGTOOLS} \ - ${LTTNGMODULES} \ ${BABELTRACE} \ + ${BABELTRACE2} \ ${SYSTEMTAP} \ ${VALGRIND} \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 317097854f..34af40a43f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -4,16 +4,28 @@ SUMMARY = "Testing tools/applications" -PR = "r2" 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_nios2 ?= "" +KEXECTOOLS:e5500-64b ?= "" +KEXECTOOLS:microblaze ?= "" +KEXECTOOLS:nios2 ?= "" +KEXECTOOLS:riscv64 ?= "" +KEXECTOOLS:riscv32 ?= "" + +# go does not support ppc32, only ppc64 +# https://github.com/golang/go/issues/22885 +# gccgo may do better +GOTOOLS ?= "go-helloworld" +GOTOOLS:powerpc ?= "" +GOTOOLS:riscv32 ?= "" + +GSTEXAMPLES ?= "gst-examples" +GSTEXAMPLES:riscv64 = "" X11GLTOOLS = "\ mesa-demos \ @@ -24,18 +36,15 @@ X11GLTOOLS = "\ " X11TOOLS = "\ - fstests \ - gst-player \ + ${GSTEXAMPLES} \ x11perf \ xrestop \ xwininfo \ xprop \ - xvideo-tests \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ blktool \ - lrzsz \ ${KEXECTOOLS} \ alsa-utils-amixer \ alsa-utils-aplay \ @@ -46,4 +55,5 @@ RDEPENDS_${PN} = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \ + ${GOTOOLS} \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index d551147b5a..49c075eb11 100644 --- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb @@ -10,9 +10,15 @@ BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${@all_multilib_tune_values(d, 'BINUTILS')} \ ${@all_multilib_tune_values(d, 'GCC')} \ ${@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 index 3daace1a40..d0596efe7a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb @@ -7,6 +7,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" GO = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" -RDEPENDS_${PN} = " \ +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 index 3e190770a7..c03918acc8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb @@ -2,7 +2,10 @@ SUMMARY = "Target packages for the Go SDK" inherit packagegroup goarch -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ + go \ go-runtime \ go-runtime-dev \ " + +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 new file mode 100644 index 0000000000..bb10a2d34f --- /dev/null +++ b/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb @@ -0,0 +1,21 @@ +SUMMARY = "Host SDK package for Rust cross canadian toolchain" +PN = "packagegroup-rust-cross-canadian-${MACHINE}" + +inherit cross-canadian packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RUST="rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" + +RDEPENDS:${PN} = " \ + ${@all_multilib_tune_values(d, 'RUST')} \ + 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 adb0c56c3a..df71695a97 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -4,9 +4,10 @@ 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" @@ -22,7 +23,7 @@ PACKAGES = "\ packagegroup-self-hosted-host-tools \ " -RDEPENDS_packagegroup-self-hosted = "\ +RDEPENDS:packagegroup-self-hosted = "\ packagegroup-self-hosted-debug \ packagegroup-self-hosted-sdk \ packagegroup-self-hosted-extended \ @@ -30,16 +31,16 @@ RDEPENDS_packagegroup-self-hosted = "\ packagegroup-self-hosted-host-tools \ " -RDEPENDS_packagegroup-self-hosted-host-tools = "\ +RDEPENDS:packagegroup-self-hosted-host-tools = "\ e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ e2fsprogs-tune2fs \ hdparm \ iptables \ - lsb \ + lsb-release \ mc \ - mc-fish \ + mc-shell \ mc-helpers \ mc-helpers-perl \ parted \ @@ -47,9 +48,9 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ screen \ " PSEUDO = "pseudo" -PSEUDO_libc-musl = "" +PSEUDO:libc-musl = "" -RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ +RRECOMMENDS:packagegroup-self-hosted-host-tools = "\ kernel-module-tun \ kernel-module-iptable-raw \ kernel-module-iptable-nat \ @@ -57,7 +58,7 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-iptable-filter \ " -RDEPENDS_packagegroup-self-hosted-sdk = "\ +RDEPENDS:packagegroup-self-hosted-sdk = "\ autoconf \ automake \ binutils \ @@ -73,39 +74,42 @@ 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_libc-glibc = "\ +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 = " \ + +STRACE = "strace" +STRACE:riscv32 = "" +RDEPENDS:packagegroup-self-hosted-debug = " \ gdb \ gdbserver \ rsync \ - strace \ + ${STRACE} \ tcf-agent" -RDEPENDS_packagegroup-self-hosted-extended = "\ +RDEPENDS:packagegroup-self-hosted-extended = "\ bzip2 \ - chkconfig \ chrpath \ cpio \ curl \ @@ -122,13 +126,10 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ grep \ groff \ gzip \ - settings-daemon \ libaio \ libusb1 \ libxml2 \ - lrzsz \ lsof \ - lzo \ man \ man-pages \ mdadm \ @@ -150,8 +151,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ perl-misc \ perl-modules \ perl-pod \ - python \ - python-modules \ python3 \ python3-modules \ python3-git \ @@ -159,13 +158,13 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ readline \ rpm \ setserial \ + settings-daemon \ socat \ subversion \ sudo \ sysstat \ tar \ tcl \ - texi2html \ texinfo \ unzip \ usbutils \ @@ -173,25 +172,23 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ wget \ which \ xinetd \ + xz \ zip \ zlib \ - xz \ + zstd \ " -RDEPENDS_packagegroup-self-hosted-graphics = "\ +RDEPENDS:packagegroup-self-hosted-graphics = "\ + adwaita-icon-theme \ builder \ + l3afpad \ libgl \ libgl-dev \ libglu \ libglu-dev \ - libsdl \ - libsdl-dev \ libx11-dev \ - adwaita-icon-theme \ - xdg-utils \ - epiphany \ - l3afpad \ pcmanfm \ vte \ + xdg-utils \ " |