diff options
Diffstat (limited to 'meta/recipes-core/packagegroups')
15 files changed, 77 insertions, 96 deletions
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 0c6a530be6..2ca639294a 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -22,8 +22,10 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ nativesdk-shadow \ nativesdk-makedevs \ - nativesdk-smartpm \ + nativesdk-dnf \ + nativesdk-cmake \ nativesdk-postinst-intercept \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \ " RDEPENDS_${PN}_darwin = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 369b63ea49..0069e3e0f7 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" -LICENSE = "MIT" PR = "r83" # @@ -111,8 +110,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") @@ -292,7 +291,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\ # SUMMARY_packagegroup-base-wifi = "WiFi support" RDEPENDS_packagegroup-base-wifi = "\ - wireless-tools \ + ${VIRTUAL-RUNTIME_wireless-tools} \ ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ ${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ wpa-supplicant" @@ -347,8 +346,10 @@ RRECOMMENDS_packagegroup-base-nfs = "\ SUMMARY_packagegroup-base-zeroconf = "Zeroconf support" RDEPENDS_packagegroup-base-zeroconf = "\ - libnss-mdns \ avahi-daemon" +RDEPENDS_packagegroup-base-zeroconf_append_libc-glibc = "\ + libnss-mdns \ + " SUMMARY_packagegroup-base-ipv6 = "IPv6 support" RDEPENDS_packagegroup-base-ipv6 = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 09f537372e..04bc0f2b69 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" -LICENSE = "MIT" PR = "r17" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -24,7 +23,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" -SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ +SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ modutils-initscripts \ init-ifupdown \ ${VIRTUAL-RUNTIME_initscripts} \ @@ -33,7 +32,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc RDEPENDS_${PN} = "\ base-files \ base-passwd \ - busybox \ + ${VIRTUAL-RUNTIME_base-utils} \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ netbase \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb index 74ed247512..78cc65db87 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb @@ -4,7 +4,6 @@ # SUMMARY = "Essential build dependencies" -LICENSE = "MIT" inherit packagegroup diff --git a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb index e7b013d406..c45463fc6c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb @@ -1,5 +1,4 @@ SUMMARY = "Remote debugging tools for Eclipse integration" -LICENSE = "MIT" inherit packagegroup diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 247a30e063..b345e314ad 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb @@ -3,12 +3,15 @@ # SUMMARY = "NFS package groups" -LICENSE = "MIT" PR = "r2" inherit packagegroup -PACKAGES = "${PN}-server" +PROVIDES = "${PACKAGES}" +PACKAGES = "${PN}-server ${PN}-client" + +SUMMARY_${PN}-client = "NFS client" +RDEPENDS_${PN}-client = "nfs-utils-client" SUMMARY_${PN}-server = "NFS server" RDEPENDS_${PN}-server = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index a41eada5af..7d6d41473a 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" -LICENSE = "MIT" PR = "r9" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -23,18 +22,18 @@ RDEPENDS_packagegroup-core-sdk = "\ findutils \ quilt \ less \ - distcc \ ldd \ file \ tcl" SANITIZERS = "libasan-dev libubsan-dev" SANITIZERS_aarch64 = "" -SANITIZERS_mips = "" -SANITIZERS_mips64 = "" -SANITIZERS_mips64n32 = "" +SANITIZERS_mipsarch = "" +SANITIZERS_nios2 = "" SANITIZERS_powerpc64 = "" SANITIZERS_sparc = "" +SANITIZERS_libc-musl = "" +SANITIZERS_libc-uclibc = "" RRECOMMENDS_packagegroup-core-sdk = "\ libgomp \ @@ -43,7 +42,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') # @@ -72,9 +71,9 @@ RRECOMMENDS_packagegroup-core-sdk = "\ # if packaged('%s-dev' % name, d): # rreclist.append('%s-dev' % name) # -# oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg) or '' +# 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))) +# # 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 e99946f0a7..5ec3f6c927 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb @@ -1,5 +1,4 @@ SUMMARY = "Dropbear SSH client/server" -LICENSE = "MIT" PR = "r1" inherit packagegroup diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb index 32d20e6214..703f956aea 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" -LICENSE = "MIT" 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 154a55cea2..43fc599c73 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -1,15 +1,19 @@ SUMMARY = "Target packages for the standalone SDK" PR = "r8" -LICENSE = "MIT" inherit packagegroup RDEPENDS_${PN} = "\ libgcc \ libgcc-dev \ - libgcov-dev \ + libatomic \ + libatomic-dev \ libstdc++ \ libstdc++-dev \ ${LIBC_DEPENDENCIES} \ - qemuwrapper-cross \ + " + +RRECOMMENDS_${PN} = "\ + 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 82347b975d..9fc2b0ef4d 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb @@ -3,7 +3,6 @@ # SUMMARY = "Debugging tools" -LICENSE = "MIT" inherit packagegroup diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 6f4842f182..946c947c8f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -3,7 +3,6 @@ # SUMMARY = "Profiling tools" -LICENSE = "MIT" PR = "r3" @@ -12,33 +11,33 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" -# sysprof doesn't support aarch64 +# 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 \ + ${PERF} \ trace-cmd \ - kernel-module-oprofile \ blktrace \ ${PROFILE_TOOLS_X} \ ${PROFILE_TOOLS_SYSTEMD} \ " PROFILETOOLS = "\ - oprofile \ - oprofileui-server \ 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 = "systemtap" SYSTEMTAP_libc-uclibc = "" -SYSTEMTAP_mips = "" -SYSTEMTAP_mips64 = "" -SYSTEMTAP_mips64n32 = "" +SYSTEMTAP_libc-musl = "" +SYSTEMTAP_mipsarch = "" +SYSTEMTAP_nios2 = "" SYSTEMTAP_aarch64 = "" # lttng-ust uses sched_getcpu() which is not there on uclibc @@ -49,29 +48,27 @@ SYSTEMTAP_aarch64 = "" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" -LTTNGUST_aarch64 = "" +LTTNGUST_libc-musl = "" LTTNGTOOLS = "lttng-tools" -LTTNGTOOLS_aarch64 = "" +LTTNGTOOLS_libc-musl = "" LTTNGMODULES = "lttng-modules" -LTTNGMODULES_aarch64 = "" BABELTRACE = "babeltrace" -BABELTRACE_aarch64 = "" -# valgrind does not work on mips +# valgrind does not work on the following configurations/architectures VALGRIND = "valgrind" VALGRIND_libc-uclibc = "" -VALGRIND_mips = "" -VALGRIND_mips64 = "" -VALGRIND_mips64n32 = "" -VALGRIND_arm = "" +VALGRIND_libc-musl = "" +VALGRIND_mipsarch = "" +VALGRIND_nios2 = "" +VALGRIND_armv4 = "" +VALGRIND_armv5 = "" +VALGRIND_armv6 = "" VALGRIND_aarch64 = "" - -# exmap-console -# exmap-server +VALGRIND_linux-gnux32 = "" 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 4177c450aa..317097854f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -3,7 +3,6 @@ # SUMMARY = "Testing tools/applications" -LICENSE = "MIT" PR = "r2" @@ -11,17 +10,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -# kexec-tools doesn't work on Mips +# kexec-tools doesn't work on e5500-64b and nios2 yet KEXECTOOLS ?= "kexec" -KEXECTOOLS_mips ?= "" -KEXECTOOLS_mipsel ?= "" -KEXECTOOLS_powerpc ?= "" KEXECTOOLS_e5500-64b ?= "" -KEXECTOOLS_aarch64 ?= "" +KEXECTOOLS_nios2 ?= "" X11GLTOOLS = "\ mesa-demos \ - piglit \ " 3GTOOLS = "\ @@ -30,7 +25,7 @@ X11GLTOOLS = "\ X11TOOLS = "\ fstests \ - gst-player-bin \ + gst-player \ x11perf \ xrestop \ xwininfo \ @@ -40,14 +35,10 @@ X11TOOLS = "\ RDEPENDS_${PN} = "\ blktool \ - tslib-calibrate \ - tslib-tests \ lrzsz \ ${KEXECTOOLS} \ alsa-utils-amixer \ alsa-utils-aplay \ - gst-meta-video \ - gst-meta-audio \ ltp \ connman-tools \ connman-tests \ diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index e3b1c18fa9..d551147b5a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb @@ -1,18 +1,18 @@ SUMMARY = "Host SDK package for cross canadian toolchain" PN = "packagegroup-cross-canadian-${MACHINE}" -LICENSE = "MIT" - -# Save TRANSLATED_TARGET_ARCH before allarch tramples it -TRANSLATED_TARGET_ARCH = "${@d.getVar('TUNE_ARCH', True).replace('_', '-')}" inherit cross-canadian packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" +# Use indirection to stop these being expanded prematurely +BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" +GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" +GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" + RDEPENDS_${PN} = "\ - binutils-cross-canadian-${@' binutils-cross-canadian-'.join(all_multilib_tune_values(d,'TRANSLATED_TARGET_ARCH').split())} \ - gdb-cross-canadian-${@' gdb-cross-canadian-'.join(all_multilib_tune_values(d, 'TRANSLATED_TARGET_ARCH').split())} \ - gcc-cross-canadian-${@' gcc-cross-canadian-'.join(all_multilib_tune_values(d, 'TRANSLATED_TARGET_ARCH').split())} \ + ${@all_multilib_tune_values(d, 'BINUTILS')} \ + ${@all_multilib_tune_values(d, 'GCC')} \ + ${@all_multilib_tune_values(d, 'GDB')} \ meta-environment-${MACHINE} \ " - diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 47589b6ad6..c1bbdfcf37 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -5,12 +5,14 @@ SUMMARY = "Self-hosting" DESCRIPTION = "Packages required to run the build system" PR = "r13" -LICENSE = "MIT" inherit packagegroup distro_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 \ @@ -28,15 +30,7 @@ RDEPENDS_packagegroup-self-hosted = "\ packagegroup-self-hosted-host-tools \ " -# midori depends on webkit-gtk which could not build for mips64 -MIDORI = "midori" -MIDORI_mips64 = "" -MIDORI_mips64n32 = "" - RDEPENDS_packagegroup-self-hosted-host-tools = "\ - connman \ - connman-plugin-ethernet \ - dhcp-client \ e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ @@ -50,9 +44,11 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ mc-helpers-perl \ mc-helpers-python \ parted \ - pseudo \ + ${PSEUDO} \ screen \ " +PSEUDO = "pseudo" +PSEUDO_libc-musl = "" RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-tun \ @@ -62,7 +58,6 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-iptable-filter \ " -# glibc-utils: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk = "\ autoconf \ automake \ @@ -73,8 +68,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ cpp \ cpp-symlinks \ distcc \ - glibc-utils \ - glibc-gconv-ibm850 \ file \ findutils \ g++ \ @@ -98,7 +91,11 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ quilt \ sed \ " - +# glibc-utils: for rpcgen +RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ + glibc-gconv-ibm850 \ + glibc-utils \ + " RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \ gdbserver \ @@ -117,7 +114,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ diffutils \ elfutils \ expat \ - gamin \ gawk \ gdbm \ gettext \ @@ -128,8 +124,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ groff \ gzip \ settings-daemon \ - hicolor-icon-theme \ - sato-icon-theme \ libaio \ libusb1 \ libxml2 \ @@ -155,13 +149,12 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ perl-dev \ perl-modules \ perl-pod \ - ${PTH} \ python \ - python-compiler \ - python-git \ - python-misc \ python-modules \ - python-rpm \ + python-git \ + python3 \ + python3-modules \ + python3-git \ quota \ readline \ rpm \ @@ -195,13 +188,10 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\ libsdl \ libsdl-dev \ libx11-dev \ - python-pygtk \ - gtk-theme-clearlooks \ + adwaita-icon-theme \ xdg-utils \ - ${MIDORI} \ - leafpad \ + epiphany \ + l3afpad \ pcmanfm \ vte \ " -PTH = "pth" -PTH_libc-uclibc = "" |