Fix F38/Ubuntu 20.04 dependencies

Dependencies for Fedora 38 and Ubuntu 20.04 are now deduplicated and sorted.
Missing packages added and packages names updated where needed.

2 files changed, 19 insertions, 24 deletions

diff --git a/config/dependencies/fedora38 b/config/dependencies/fedora38
index a6cd9c32..e9fcd386 100755
--- a/config/dependencies/fedora38
+++ b/config/dependencies/fedora38
@@ -1,11 +1,11 @@
 pkg_add="dnf -y install"
 pkglist=" \
-wget git pandoc nasm perl-libwww-perl python3 subversion gcc sharutils curl \
-parted e2fsprogs unzip arm-none-eabi-gcc-cs gcc python3 gcc perl gcc-gnat \
-ncurses-devel doxygen acpica-tools gdb flex bison gcc git openssl-devel gprbuild \
-bzip2 unifont-fonts unifont unifont-ttf-fonts autogen help2man gcc bison flex \
-dejavu-fonts-all texinfo rsync python3 libusb xz gawk device-mapper fuse gettext \
-freetype-devel intltool libselinux-devel gcc pciutils-devel zlib-devel \
-libftdi-devel gcc libusb-devel cmake innoextract p7zip p7zip-plugins unar \
-arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib cmake \
+acpica-tools arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-gcc-cs \
+arm-none-eabi-newlib autogen bison bzip2 cmake curl dejavu-fonts-all \
+device-mapper doxygen e2fsprogs flex freetype-devel fuse gawk gcc gcc-gnat \
+gdb gettext gettext-devel git gprbuild help2man innoextract intltool \
+libftdi-devel libselinux-devel libusb1 libusb1-devel nasm ncurses-devel \
+openssl-devel p7zip p7zip-plugins pandoc parted pciutils-devel perl \
+perl-libwww-perl python3 rsync sharutils subversion texinfo unar unifont \
+unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel \
 "
diff --git a/config/dependencies/ubuntu2004 b/config/dependencies/ubuntu2004
index 4649aa9e..02661ca5 100755
--- a/config/dependencies/ubuntu2004
+++ b/config/dependencies/ubuntu2004
@@ -1,19 +1,14 @@
 pkg_add="apt-get -y install"
 pkglist=" \
-wget git uuid-dev nasm build-essential sharutils curl parted e2fsprogs unzip \
-pkg-config gcc-arm-linux-gnueabi \
-build-essential python3 \
-build-essential perl python3-setuptools libncurses5-dev doxygen iasl gdb flex \
-bison build-essential git libssl-dev gnat python-is-python3 \
-ttf-unifont libopts25 libselinux1-dev autogen m4 autoconf help2man \
-libopts25-dev libfont-freetype-perl automake autotools-dev build-essential bison \
-flex libfuse-dev liblzma-dev gawk libdevmapper-dev libtool libfreetype6-dev \
-gettext unifont bc bison build-essential device-tree-compiler efitools flex \
-libfdt-dev liblz4-tool libgnutls28-dev libncurses-dev libpython3-dev libsdl2-dev \
-libssl-dev lz4 lzma lzma-alone openssl pkg-config python3 python3-distutils \
-python3-pkg-resources python3-pycryptodome python3-pyelftools swig uuid-dev \
-build-essential libpci-dev pciutils zlib1g-dev libftdi-dev build-essential \
-libusb-1.0-0-dev libusb-1.0 libusb-1.0-0-dev libusb-dev cmake \
-innoextract p7zip p7zip-full unar \
-binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi cmake \
+autoconf autogen automake autopoint autotools-dev bc binutils-arm-none-eabi \
+bison build-essential cmake curl device-tree-compiler doxygen e2fsprogs efitools \
+flex gawk gcc-arm-linux-gnueabi gcc-arm-none-eabi gdb gettext git gnat help2man \
+innoextract libdevmapper-dev libfdt-dev libfont-freetype-perl libfreetype6-dev \
+libftdi-dev libfuse-dev libgnutls28-dev liblz4-tool liblzma-dev libncurses5-dev \
+libncurses-dev libnewlib-arm-none-eabi libopts25 libopts25-dev libpci-dev \
+libpython3-dev libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 \
+libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \
+pciutils perl pkg-config python3 python3-distutils python3-pkg-resources \
+python3-pycryptodome python3-pyelftools python3-setuptools python-is-python3 \
+sharutils swig ttf-unifont unar unifont unzip uuid-dev wget zlib1g-dev \
 "