1 files changed, 323 insertions, 313 deletions

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index a8565982fc..6dbe194cd2 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -7,10 +7,10 @@ PROVIDES = "${PACKAGES}"
 PACKAGES = "\
     packagegroup-meta-oe \
     packagegroup-meta-oe-benchmarks \
+    packagegroup-meta-oe-bsp \
     packagegroup-meta-oe-connectivity \
     packagegroup-meta-oe-core \
     packagegroup-meta-oe-crypto \
-    packagegroup-meta-oe-bsp \
     packagegroup-meta-oe-dbs \
     packagegroup-meta-oe-devtools \
     packagegroup-meta-oe-extended \
@@ -18,8 +18,8 @@ PACKAGES = "\
     packagegroup-meta-oe-multimedia \
     packagegroup-meta-oe-navigation \
     packagegroup-meta-oe-printing \
-    packagegroup-meta-oe-shells \
     packagegroup-meta-oe-security \
+    packagegroup-meta-oe-shells \
     packagegroup-meta-oe-support \
     packagegroup-meta-oe-test \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
@@ -95,10 +95,10 @@ RDEPENDS:packagegroup-meta-oe-bsp = "\
     fwupd \
     fwupd-efi \
     irda-utils \
+    lmsensors \
     lmsensors-config-cgi \
     lmsensors-config-fancontrol \
     lmsensors-config-sensord \
-    lmsensors \
     lsscsi \
     nvme-cli \
     pcmciautils \
@@ -117,6 +117,7 @@ RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv32 = "efivar efibootmgr fwupd fwup
 
 RDEPENDS:packagegroup-meta-oe-connectivity = "\
     cyrus-sasl \
+    czmq \
     gammu \
     gattlib \
     gensio \
@@ -140,8 +141,8 @@ RDEPENDS:packagegroup-meta-oe-connectivity = "\
     modemmanager \
     mosh \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \
-    openobex \
     obexftp \
+    openobex \
     packagegroup-tools-bluetooth \
     paho-mqtt-c \
     paho-mqtt-cpp \
@@ -155,7 +156,6 @@ RDEPENDS:packagegroup-meta-oe-connectivity = "\
     usbmuxd \
     wifi-test-suite \
     zabbix \
-    czmq \
     zeromq \
 "
 
@@ -164,26 +164,26 @@ RDEPENDS:packagegroup-meta-oe-connectivity:append:libc-glibc = " wvstreams wvdia
 # dracut needs dracut
 RDEPENDS:packagegroup-meta-oe-core = "\
     ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker", "", d)} \
+    dbus-cxx \
     dbus-daemon-proxy \
-    libdbus-c++ \
+    distro-feed-configs \
     emlog \
-    kernel-module-emlog \
     glibmm \
+    kernel-module-emlog \
+    libdbus-c++ \
     libnfc \
     libsigc++-2.0 \
     libsigc++-3 \
     mdbus2 \
-    distro-feed-configs \
     mm-common \
     ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "ndctl", "", d)} \
     pim435 \
     proxy-libintl \
     safec \
-    sdbus-c++-tools \
     sdbus-c++ \
+    sdbus-c++-tools \
     toybox \
     usleep \
-    dbus-cxx \
 "
 RDEPENDS:packagegroup-meta-oe-core:append:libc-glibc = " ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "glfw", "", d)}"
 RDEPENDS:packagegroup-meta-oe-core:remove:riscv64 = "safec"
@@ -215,84 +215,84 @@ RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb"
 
 RDEPENDS:packagegroup-meta-oe-devtools = "\
     abseil-cpp \
+    android-tools \
+    android-tools-conf \
     apitrace \
     breakpad \
-    android-tools-conf \
-    android-tools \
-    concurrencykit \
+    capnproto-compiler \
     cgdb \
-    ctags \
-    debootstrap \
     cjson \
     cloc \
-    icon-slicer \
+    concurrencykit \
     cscope \
+    ctags \
     dbd-mariadb \
+    debootstrap \
     dmalloc \
     ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnf-plugin-tui", "", d)} \
     doxygen \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
-    jemalloc \
-    lemon \
     flatbuffers \
-    heaptrack \
-    libparse-yapp-perl \
-    libubox \
-    ltrace \
-    luajit \
-    mcpp \
-    memstat \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
     giflib \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "glade", "", d)} \
     grpc \
     guider \
-    php \
+    heaptrack \
+    icon-slicer \
+    ipc-run \
     iptraf-ng \
+    jemalloc \
     jq \
-    json-spirit \
-    serialcheck \
-    tclap \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "tk", "", d)} \
-    uw-imap \
     jsoncpp \
     jsonrpc \
-    yajl \
+    json-schema-validator \
+    json-spirit \
     kconfig-frontends \
+    lemon \
+    libdbi-perl \
+    libdev-checklib-perl \
     libgee \
+    libio-pty-perl \
+    libjson-perl \
+    libparse-yapp-perl \
+    libperlio-gzip-perl \
     libsombok3 \
+    libubox \
+    libxerces-c \
     lshw \
+    ltrace \
+    luajit \
     luaposix \
-    capnproto-compiler \
+    mcpp \
+    memstat \
+    mercurial \
+    microsoft-gsl \
     mpich \
     msgpack-c \
     msgpack-cpp \
-    mercurial \
     nodejs \
     openocd \
     pax-utils \
-    ipc-run \
-    libdbi-perl \
-    libdev-checklib-perl \
-    libio-pty-perl \
-    libjson-perl \
-    libperlio-gzip-perl \
+    php \
     ply \
-    protobuf-c \
+    poke \
     protobuf \
+    protobuf-c \
     pugixml \
     python3-distutils-extra \
     python3-pycups \
     rapidjson \
+    serialcheck \
     squashfs-tools-ng \
+    tclap \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "tk", "", d)} \
     uftrace \
+    uw-imap \
     valijson \
-    libxerces-c \
     xerces-c-samples \
     xmlrpc-c \
+    yajl \
     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"
@@ -320,105 +320,105 @@ RDEPENDS:packagegroup-meta-oe-extended = "\
     ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \
     brotli \
     byacc \
+    can-utils \
+    canutils \
     cmatrix \
     cmpi-bindings \
     collectd \
     ddrescue \
     dialog \
-    duktape \
-    enscript \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \
     dlt-daemon \
     docopt.cpp \
-    iotop \
+    duktape \
     dumb-init \
-    konkretcmpi \
+    enscript \
     figlet \
-    libcec \
-    libdivecomputer \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \
-    liblognorm \
-    libmodbus \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \
     haveged \
     hexedit \
     hiredis \
     hplip \
     hwloc \
-    libleak \
-    libuio \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
-    libyang \
-    lprng \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \
-    md5deep \
     indent \
-    jansson \
-    nana \
-    nicstat \
-    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \
-    p7zip \
+    iotop \
     isomd5sum \
+    jansson \
     jpnevulator \
-    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \
-    rarpd \
-    redis \
-    libfastjson \
-    librelp \
-    sblim-cmpi-devel \
-    sblim-sfc-common \
-    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \
-    sblim-sfcc \
+    konkretcmpi \
     libblockdev \
-    sgpio \
-    smartmontools \
-    can-utils \
-    canutils \
-    libsocketcan \
+    libcec \
     libconfig \
-    linuxconsole \
-    uml-utilities \
+    libdivecomputer \
+    libfastjson \
+    libfile-fnmatch-perl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \
     libidn \
-    libqb \
-    wipe \
-    libzip \
-    zram \
-    libplist \
-    libusbmuxd \
+    libleak \
     liblockfile \
     liblogging \
+    liblognorm \
+    libmodbus \
+    libplist \
     libpwquality \
+    libqb \
+    librelp \
     ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "libreport", "", d)} \
     libserialport \
+    libsigrok \
+    libsigrokdecode \
+    libsocketcan \
     libstatgrab \
+    libuio \
+    libusbmuxd \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
+    libyang \
+    libzip \
+    linuxconsole \
     lockfile-progs \
     logwatch \
+    lprng \
+    md5deep \
     mraa \
+    nana \
+    nicstat \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \
     ostree \
+    p7zip \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \
     pegtl \
-    libfile-fnmatch-perl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \
+    rarpd \
+    redis \
+    redis-plus-plus \
     rrdtool \
     sanlock \
+    sblim-cmpi-devel \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \
+    sblim-sfcc \
+    sblim-sfc-common \
     scsirastools \
     sedutil \
-    libsigrok \
-    libsigrokdecode \
-    s-nail \
+    sgpio \
     sigrok-cli \
+    smartmontools \
+    s-nail \
     snappy \
     tipcutils \
     tiptop \
     tmate \
     tmux \
     triggerhappy \
+    uml-utilities \
     upm \
     vlock \
     volume-key \
+    wipe \
     wxwidgets \
     zlog \
+    zram \
     zstd \
     zsync-curl \
-    redis-plus-plus \
 "
 RDEPENDS:packagegroup-meta-oe-extended:append:libc-musl = " libexecinfo"
 RDEPENDS:packagegroup-meta-oe-extended:append:x86-64 = " pmdk libx86-1"
@@ -436,164 +436,174 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak mraa sysdig
 RDEPENDS:packagegroup-meta-oe-gnome = "\
     atkmm \
     gcab \
-    gnome-common \
     gmime \
-    libjcat \
+    gnome-common \
+    gnome-theme-adwaita \
     gtk+ \
-    gtkmm3 \
     gtkmm \
+    gtkmm3 \
+    libjcat \
     ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libpeas", "", d)} \
     pyxdg \
-    gnome-theme-adwaita \
 "
 
 RDEPENDS:packagegroup-meta-oe-graphics = "\
+    bdftopcf \
     cairomm \
-    directfb-examples \
-    directfb \
-    fbgrab \
+    deqp-runner \
     dietsplash \
+    directfb \
+    directfb-examples \
     ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora", "", d)} \
-    fontforge \
+    fbgrab \
     fbida \
     feh \
+    font-adobe-100dpi \
+    font-adobe-utopia-100dpi \
+    font-bh-100dpi \
+    font-bh-lucidatypewriter-100dpi \
+    font-bitstream-100dpi \
+    font-cursor-misc \
+    fontforge \
+    font-misc-misc \
     ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut", "", d)} \
     ftgl \
     fvwm \
-    gtkperf \
     gphoto2 \
-    imlib2 \
-    libgphoto2 \
     graphviz \
+    gtkperf \
     gtkwave \
+    iceauth \
+    imlib2 \
     jasper \
-    libforms \
-    lxdm \
-    numlockx \
-    nyancat \
-    obconf \
-    openbox \
-    packagegroup-fonts-truetype \
-    qrencode \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
     leptonica \
-    libvncserver \
+    libforms \
+    libgphoto2 \
     libmng \
+    libsdl \
+    libsdl2-image \
+    libsdl2-mixer \
+    libsdl2-net \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
     libsdl-gfx \
     libsdl-image \
     libsdl-mixer \
     libsdl-net \
     libsdl-ttf \
-    libsdl2-image \
-    libsdl2-mixer \
-    libsdl2-net \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
-    libsdl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \
+    libvncserver \
+    libxaw6 \
+    libxpresent \
+    libyui \
+    libyui-ncurses \
     lvgl \
-    ttf-arphic-uming \
-    ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \
-    ttf-abyssinica \
+    lxdm \
+    numlockx \
+    nyancat \
+    obconf \
+    openbox \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
+    openjpeg \
+    packagegroup-fonts-truetype \
+    pangomm \
+    parallel-deqp-runner \
+    qrencode \
+    sessreg \
+    setxkbmap \
+    source-code-pro-fonts \
     source-han-sans-cn-fonts \
     source-han-sans-jp-fonts \
     source-han-sans-kr-fonts \
     source-han-sans-tw-fonts \
-    source-code-pro-fonts \
+    spirv-shader-generator \
+    spirv-tools \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
+    stalonetray \
+    surf \
+    terminus-font-consolefonts \
+    terminus-font-pcf \
+    tesseract \
+    tesseract-lang \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \
+    tslib \
+    ttf-abyssinica \
+    ttf-arphic-uming \
+    ttf-dejavu-common \
+    ttf-dejavu-mathtexgyre \
     ttf-dejavu-sans \
     ttf-dejavu-sans-condensed \
     ttf-dejavu-sans-mono \
     ttf-dejavu-serif \
     ttf-dejavu-serif-condensed \
-    ttf-dejavu-mathtexgyre \
-    ttf-dejavu-common \
+    ttf-droid-sans \
+    ttf-droid-sans-fallback \
+    ttf-droid-sans-japanese \
+    ttf-droid-sans-mono \
+    ttf-droid-serif \
     ttf-gentium \
     ttf-hunky-sans \
     ttf-hunky-serif \
-    ttf-ipag ttf-ipagp ttf-ipamp ttf-ipam \
-    ttf-lohit \
     ttf-inconsolata \
-    ttf-liberation-sans-narrow \
+    ttf-ipag \
+    ttf-ipagp \
+    ttf-ipam \
+    ttf-ipamp \
     ttf-liberation-mono \
     ttf-liberation-sans \
+    ttf-liberation-sans-narrow \
     ttf-liberation-serif \
     ttf-lklug \
+    ttf-lohit \
     ttf-noto-emoji-color \
     ttf-noto-emoji-regular \
+    ttf-pt-sans \
+    ttf-roboto \
     ttf-sazanami-gothic \
     ttf-sazanami-mincho \
-    ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho \
+    ttf-takao-gothic \
+    ttf-takao-mincho \
+    ttf-takao-pgothic \
+    ttf-takao-pmincho \
     ttf-tlwg \
-    ttf-roboto \
-    ttf-wqy-zenhei \
-    ttf-pt-sans \
-    ttf-vlgothic \
     ttf-ubuntu-mono \
     ttf-ubuntu-sans \
-    libyui-ncurses \
-    libyui \
-    x11vnc \
-    terminus-font-consolefonts \
-    terminus-font-pcf \
-    xdotool \
-    xkbevd \
-    bdftopcf \
-    iceauth \
-    sessreg \
-    xgamma \
-    setxkbmap \
-    xkbutils \
+    ttf-vlgothic \
+    ttf-wqy-zenhei \
     twm \
+    unclutter-xfixes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \
+    x11vnc \
+    xcb-util-cursor \
     xclock \
+    xcursorgen \
+    xdotool \
+    xf86-input-tslib \
+    xf86-input-void \
+    xf86-video-armsoc \
+    xf86-video-ati \
     xfontsel \
+    xgamma \
+    xkbevd \
     xkbprint \
+    xkbutils \
     xlsatoms \
     xlsclients \
     xlsfonts \
     xmag \
     xmessage \
+    xorg-fonts-100dpi \
+    xorg-sgml-doctools \
     xrdb \
     xrefresh \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \
+    xserver-common \
     xsetroot \
     xstdcmap \
     xterm \
     xwd \
     xwud \
-    xorg-sgml-doctools \
-    xf86-input-tslib \
-    xf86-input-void \
-    xf86-video-armsoc \
-    xf86-video-ati \
-    font-adobe-100dpi \
-    font-adobe-utopia-100dpi \
-    font-bh-100dpi \
-    font-bh-lucidatypewriter-100dpi \
-    font-bitstream-100dpi \
-    font-cursor-misc \
-    font-misc-misc \
-    xorg-fonts-100dpi \
-    libxaw6 \
-    libxpresent \
-    xcb-util-cursor \
-    xserver-common \
-    openjpeg \
-    pangomm \
-    spirv-shader-generator \
-    spirv-tools \
-    stalonetray \
-    surf \
-    tesseract-lang \
-    tesseract \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \
-    tslib \
-    unclutter-xfixes \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \
-    xcursorgen \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \
     yad \
     ydotool \
-    parallel-deqp-runner \
-    deqp-runner \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \
 "
 RDEPENDS:packagegroup-meta-oe-graphics:append:x86 = " renderdoc xf86-video-nouveau xf86-video-mga"
 RDEPENDS:packagegroup-meta-oe-graphics:append:x86-64 = " renderdoc xf86-video-nouveau xf86-video-mga"
@@ -604,10 +614,10 @@ RDEPENDS:packagegroup-meta-oe-graphics:remove:libc-musl = "renderdoc"
 
 RDEPENDS:packagegroup-meta-oe-kernel = "\
     agent-proxy \
-    crash \
+    broadcom-bt-firmware \
     cpupower \
+    crash \
     ipmitool \
-    broadcom-bt-firmware \
     kernel-selftest \
     minicoredumper \
     oprofile \
@@ -632,42 +642,42 @@ RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv64 = "crash oprofile"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofile"
 
 RDEPENDS:packagegroup-meta-oe-multimedia = "\
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
+    a2jmidid \
+    audiofile \
     dirsplit \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
     genisoimage \
     icedax \
-    wodim \
     id3lib \
-    audiofile \
-    a2jmidid \
     jack-server \
     jack-utils \
     libass \
-    libcdio-paranoia \
     libcdio \
+    libcdio-paranoia \
+    libdvdread \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \
+    libmikmod \
     libmms \
-    libdvdread \
+    libmodplug \
     libopus \
+    libopusenc \
+    libvpx \
     live555-examples \
     live555-mediaserver \
-    libmikmod \
-    libmodplug \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
     sound-theme-freedesktop \
-    yavta \
     v4l-utils \
     wavpack \
-    libvpx \
+    wodim \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
-    libopusenc \
+    yavta \
 "
 
 RDEPENDS:packagegroup-meta-oe-navigation = "\
+    geoclue \
     geos \
     ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \
-    geoclue \
     libspatialite \
     proj \
 "
@@ -679,12 +689,12 @@ RDEPENDS:packagegroup-meta-oe-printing = "\
 "
 
 RDEPENDS:packagegroup-meta-oe-security = "\
+    auditd \
     keyutils \
     nmap \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "passwdqc", "", d)} \
     softhsm \
     tomoyo-tools \
-    auditd \
 "
 
 RDEPENDS:packagegroup-meta-oe-shells = "\
@@ -695,209 +705,209 @@ RDEPENDS:packagegroup-meta-oe-shells = "\
 "
 
 RDEPENDS:packagegroup-meta-oe-support = "\
-    anthy \
-    atop \
     ace-cloud-editor \
-    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \
-    frame \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
-    grail \
+    anthy \
     asio \
+    atop \
     augeas \
     avro-c \
     bdwgc \
     c-ares \
+    ccid \
+    ckermit \
+    clinfo \
     cmark \
     ${@bb.utils.contains("DISTRO_FEATURES", "polkit gobject-introspection-data", "colord", "", d)} \
     consolation \
+    c-periphery \
     cpprest \
     ctapi-common \
+    daemonize \
+    daemontools \
+    devmem2 \
     dfu-util \
     dhex \
     digitemp \
     dool \
+    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \
+    eject \
+    emacs \
+    enca \
+    epeg \
     espeak \
     evemu-tools \
     exiv2 \
-    libnice \
-    c-periphery \
+    fbset \
+    fbset-modes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "fltk", "", d)} \
+    frame \
+    freerdp \
     function2 \
+    funyahoo-plusplus \
     gd \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
+    gengetopt \
     gflags \
     glog \
+    googlebenchmark \
     gperftools \
     gpm \
+    gradm \
+    grail \
+    gsl \
     gsoap \
+    hddtemp \
     hdf5 \
+    hidapi \
     hstr \
     htop \
-    hunspell-dictionaries \
     hunspell \
+    hunspell-dictionaries \
     hwdata \
+    icyque \
     iksemel \
-    gengetopt \
-    googlebenchmark \
     imagemagick \
+    imapfilter \
     iniparser \
     inotify-tools \
     joe \
     lcms \
     lcov \
-    imapfilter \
+    libatasmart \
     libbytesize \
+    libcanberra \
+    libcereal \
     libcyusbserial \
+    libdevmapper \
     libestr \
     libfann \
     libftdi \
-    libjs-jquery-globalize \
-    libjs-jquery-cookie \
-    ccid \
-    zchunk \
-    libgpiod \
-    libmanette \
-    ckermit \
-    libcereal \
-    daemontools \
-    libiio \
-    devmem2 \
     libgit2 \
+    libgpiod \
+    libgusb \
     libharu \
-    eject \
-    enca \
-    epeg \
+    libiio \
+    libinih \
+    libjs-jquery-cookie \
+    libjs-jquery-globalize \
+    libjs-jquery-icheck \
+    libjs-sizzle \
+    libmanette \
+    libmicrohttpd \
+    libmimetic \
     libmxml \
-    fbset-modes \
-    fbset \
+    libnice \
+    liboauth \
     liboop \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "fltk", "", d)} \
-    freerdp \
-    libgusb \
-    emacs \
+    libotr \
     libp11 \
     libraw1394 \
-    gradm \
-    gsl \
     librsync \
-    hddtemp \
-    hidapi \
+    libsass \
+    libsmi \
     libsoc \
-    libmimetic \
-    libinih \
+    libssh \
+    libssh2 \
     libtar \
     libteam \
+    libtinyxml \
+    libtinyxml2 \
+    liburing \
     libusb-compat \
-    libatasmart \
-    libcanberra \
-    libssh \
-    libssh2 \
-    libusbgx-config \
+    libusbg \
     libusbgx \
+    libusbgx-config \
+    libutempter \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \
     lockdev \
+    log4c \
+    log4cpp \
     logwarn \
-    libjs-sizzle \
+    lvm2 \
     mailcap \
-    liboauth \
+    mbuffer \
     mg \
+    mime-support \
+    minini \
     monit \
     mscgen \
-    libsmi \
-    remmina \
+    multipath-tools \
+    nano \
     neon \
     nmon \
-    libjs-jquery-icheck \
-    libtinyxml \
-    libusbg \
-    libutempter \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \
-    log4c \
-    log4cpp \
     nspr \
-    libdevmapper \
-    lvm2 \
     nss \
-    mbuffer \
-    onig \
-    mime-support \
-    minini \
-    multipath-tools \
     numactl \
-    clinfo \
-    opencv \
-    opensc \
+    onig \
     openct \
+    opencv \
     openldap \
-    wbxml2 \
+    opensc \
     p910nd \
-    libtinyxml2 \
+    pcp \
+    pcsc-lite \
+    pcsc-tools \
     picocom \
-    funyahoo-plusplus \
-    icyque \
-    libotr \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
     pidgin \
-    purple-skypeweb \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
     pidgin-sipe \
     pngcheck \
     poco \
-    poppler-data \
     poppler \
+    poppler-data \
     portaudio-v19 \
+    pps-tools \
     procmail \
-    pxaregs \
+    purple-skypeweb \
     pv \
-    rsnapshot \
-    pps-tools \
+    pxaregs \
     raptor2 \
     rdfind \
     re2 \
+    read-edid \
+    remmina \
+    rsnapshot \
+    sassc \
+    satyr \
     sdmon \
     sdparm \
     serial-forward \
-    read-edid \
-    spitools \
-    libsass \
-    sassc \
+    sg3-utils \
+    sharutils \
     smarty \
+    spitools \
+    srecord \
+    ssiapi \
+    stm32flash \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "synergy", "", d)} \
     syslog-ng \
     system-config-keyboard \
     tbb \
-    satyr \
-    pcp \
-    pcsc-lite \
-    pcsc-tools \
-    sharutils \
-    sg3-utils \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \
-    uchardet \
-    srecord \
-    ssiapi \
+    thin-provisioning-tools \
+    tokyocabinet \
     tree \
-    utouch-evemu \
-    utouch-frame \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "utouch-mtview", "", d)} \
+    uchardet \
     ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2", "", d)} \
-    stm32flash \
-    tokyocabinet \
-    xmlstarlet \
-    thin-provisioning-tools \
     uhubctl \
-    zile \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \
+    unicode-ucd \
     unixodbc \
-    daemonize \
     upower \
-    unicode-ucd \
-    xdelta3 \
     uriparser \
-    nano \
+    usb-modeswitch \
+    usb-modeswitch-data \
+    utouch-evemu \
+    utouch-frame \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "utouch-mtview", "", d)} \
+    wbxml2 \
+    xdelta3 \
     xdg-user-dirs \
     xmlsec1 \
-    usb-modeswitch-data \
-    usb-modeswitch \
-    liburing \
-    zbar \
-    libmicrohttpd \
+    xmlstarlet \
     yaml-cpp \
+    zbar \
+    zchunk \
+    zile \
 "
 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)}"
@@ -937,18 +947,18 @@ RDEPENDS:packagegroup-meta-oe-test:remove:riscv64 = "fwts"
 RDEPENDS:packagegroup-meta-oe-test:remove:riscv32 = "fwts"
 
 RDEPENDS:packagegroup-meta-oe-ptest-packages = "\
-    zeromq-ptest \
+    cmocka-ptest \
+    hiredis-ptest \
     leveldb-ptest \
-    psqlodbc-ptest \
+    libteam-ptest \
+    minicoredumper-ptest \
+    oprofile-ptest \
+    poco-ptest \
     protobuf-ptest \
+    psqlodbc-ptest \
     rsyslog-ptest \
-    oprofile-ptest \
-    libteam-ptest \
     uthash-ptest \
-    poco-ptest \
-    cmocka-ptest \
-    minicoredumper-ptest \
-    hiredis-ptest \
+    zeromq-ptest \
 "
 RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86 = " mcelog-ptest"
 RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest"