GNUBoot/gnuboot
GNUBoot
/
gnuboot
mirror of https://git.savannah.gnu.org/git/gnuboot.git
2
1
Fork 0
Code Issues Releases Activity

dependencies: fix installation when the package is already installed. 

Without that fix already the installation script fails on PureOS when
some packages are already installed :
    # ./resources/dependencies/debian
    [...]
    [...] Package not found: wget
    [...] Command failed: The selected packages may already be installed.

Since most other dependencies installation scripts also use
PackageKit, they are likely to behave in the same way and so we also
apply the same fix.

This was broken by the commit 0f74569af0
("dependencies: switch arch, debian, fedora35, ubuntu2004 to
packagekit").

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
This commit is contained in:
Denis 'GNUtoo' Carikli 2023-12-08 02:55:25 +01:00 committed by Adrien 'neox' Bourmault
parent 28247e6aa1
commit e8f42a4180
Signed by: neox
GPG Key ID: 2974E1D5F25DFCC8
4 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/dependencies/arch
View File

@ -33,58 +33,58 @@ pacman -S --needed --noconfirm packagekit
# This is so that they can moved to separate scripts. # This is so that they can moved to separate scripts.
# #
pkcon -y install wget pkcon -y --allow-reinstall install wget
# For downloading source code # For downloading source code
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install git pkcon -y --allow-reinstall install git
# For Tianocore and iPXE # For Tianocore and iPXE
# TODO: check whether this is the full list # TODO: check whether this is the full list
pkcon -y install nasm perl-libwww python2 subversion pkcon -y --allow-reinstall install nasm perl-libwww python2 subversion
# For building source code: # For building source code:
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install base-devel pkcon -y --allow-reinstall install base-devel
# for running the crostool script (to get mrc.bin file for t440p) # for running the crostool script (to get mrc.bin file for t440p)
pkcon -y install sharutils curl parted e2fsprogs unzip pkcon -y --allow-reinstall install sharutils curl parted e2fsprogs unzip
# for cross-compiling ARM binaries # for cross-compiling ARM binaries
pkcon -y install arm-none-eabi-gcc pkcon -y --allow-reinstall install arm-none-eabi-gcc
# Memtest86+ build dependencies # Memtest86+ build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install base-devel python2 pkcon -y --allow-reinstall install base-devel python2
# i945-pwm build dependencies # i945-pwm build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install base-devel perl pkcon -y --allow-reinstall install base-devel perl
# Coreboot build dependencies (also requires build-essential and git) # Coreboot build dependencies (also requires build-essential and git)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install ncurses doxygen acpica gdb flex bison base-devel git openssl gcc-ada pkcon -y --allow-reinstall install ncurses doxygen acpica gdb flex bison base-devel git openssl gcc-ada
# GRUB build dependencies (also requires build-essential, bison and flex) # GRUB build dependencies (also requires build-essential, bison and flex)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install bdf-unifont autogen help2man base-devel bison flex ttf-dejavu texinfo rsync python libusb xz gawk device-mapper fuse2 gettext freetype2 pkcon -y --allow-reinstall install bdf-unifont autogen help2man base-devel bison flex ttf-dejavu texinfo rsync python libusb xz gawk device-mapper fuse2 gettext freetype2
# BucTS build dependencies (external script) # BucTS build dependencies (external script)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install base-devel pkcon -y --allow-reinstall install base-devel
# Flashrom build dependencies (also requires build-essential) # Flashrom build dependencies (also requires build-essential)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install libpciaccess pciutils zlib libftdi base-devel libusb pkcon -y --allow-reinstall install libpciaccess pciutils zlib libftdi base-devel libusb
# For running make check # For running make check
# ---------------------- # ----------------------

40
resources/dependencies/debian
View File

@ -32,80 +32,80 @@ apt-get -y install packagekit
# This is so that they can moved to separate scripts. # This is so that they can moved to separate scripts.
# #
pkcon -y install wget pkcon -y --allow-reinstall install wget
# For downloading source code # For downloading source code
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install git pkcon -y --allow-reinstall install git
# For Tianocore and iPXE # For Tianocore and iPXE
# TODO: check whether this is the full list # TODO: check whether this is the full list
pkcon -y install uuid-dev nasm pkcon -y --allow-reinstall install uuid-dev nasm
# For building source code: # For building source code:
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential pkcon -y --allow-reinstall install build-essential
# for running the crostool script (to get mrc.bin file for t440p) # for running the crostool script (to get mrc.bin file for t440p)
pkcon -y install sharutils curl parted e2fsprogs unzip pkcon -y --allow-reinstall install sharutils curl parted e2fsprogs unzip
# to use the right software versions and links for compiling # to use the right software versions and links for compiling
pkcon -y install pkg-config pkcon -y --allow-reinstall install pkg-config
# for cross-compiling ARM binaries # for cross-compiling ARM binaries
pkcon -y install gcc-arm-linux-gnueabi pkcon -y --allow-reinstall install gcc-arm-linux-gnueabi
[ "$(uname -i)" = x86_64 ] || [ "$(uname -m)" = x86_64 ] [ "$(uname -i)" = x86_64 ] || [ "$(uname -m)" = x86_64 ]
arch=${?} arch=${?}
# For cross-compiling i686 target on x86_64 host. # For cross-compiling i686 target on x86_64 host.
if [ "${arch}" -eq 0 ]; then if [ "${arch}" -eq 0 ]; then
pkcon -y install gcc-multilib libc6-i386 libc6-dev-i386 pkcon -y --allow-reinstall install gcc-multilib libc6-i386 libc6-dev-i386
pkcon -y install lib32stdc++6 g++-multilib dh-autoreconf pkcon -y --allow-reinstall install lib32stdc++6 g++-multilib dh-autoreconf
# recommended, but not sure what for: # recommended, but not sure what for:
pkcon -y install lib32tinfo-dev pkcon -y --allow-reinstall install lib32tinfo-dev
fi fi
# Memtest86+ build dependencies # Memtest86+ build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential python2.7 python-is-python3 pkcon -y --allow-reinstall install build-essential python2.7 python-is-python3
# i945-pwm build dependencies # i945-pwm build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential perl pkcon -y --allow-reinstall install build-essential perl
# Coreboot build dependencies (also requires build-essential and git) # Coreboot build dependencies (also requires build-essential and git)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install libncurses5-dev doxygen iasl gdb flex bison build-essential git libssl-dev gnat pkcon -y --allow-reinstall install libncurses5-dev doxygen iasl gdb flex bison build-essential git libssl-dev gnat
# For cross-compiling i686 target on x86_64 host. # For cross-compiling i686 target on x86_64 host.
[ "${arch}" -eq 0 ] && pkcon -y install lib32ncurses5-dev [ "${arch}" -eq 0 ] && pkcon -y --allow-reinstall install lib32ncurses5-dev
# GRUB build dependencies (also requires build-essential, bison and flex) # GRUB build dependencies (also requires build-essential, bison and flex)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install fonts-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 pkcon -y --allow-reinstall install fonts-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
# BucTS build dependencies (external script) # BucTS build dependencies (external script)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential pkcon -y --allow-reinstall install build-essential
# Flashrom build dependencies (also requires build-essential) # Flashrom build dependencies (also requires build-essential)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential libusb-1.0-0-dev libusb-1.0 libusb-1.0-0-dev libusb-dev pkcon -y --allow-reinstall install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential libusb-1.0-0-dev libusb-1.0 libusb-1.0-0-dev libusb-dev
# For cross-compiling i686 target on x86_64 host. # For cross-compiling i686 target on x86_64 host.
[ "${arch}" -eq 0 ] && pkcon -y install lib32z1-dev [ "${arch}" -eq 0 ] && pkcon -y --allow-reinstall install lib32z1-dev
# For running make check # For running make check
# ---------------------- # ----------------------
pkcon -y install shellcheck # lint pkcon -y --allow-reinstall install shellcheck # lint
pkcon -y install gawk git grep lzip make sed tar xz-utils # u-boot-libre pkcon -y --allow-reinstall install gawk git grep lzip make sed tar xz-utils # u-boot-libre

30
resources/dependencies/fedora35
View File

@ -34,65 +34,65 @@ dnf -y install PackageKit
# This is so that they can moved to separate scripts. # This is so that they can moved to separate scripts.
# #
pkcon -y install wget pkcon -y --allow-reinstall install wget
# For downloading source code # For downloading source code
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install git pkcon -y --allow-reinstall install git
# For building the documentation # For building the documentation
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install pandoc pkcon -y --allow-reinstall install pandoc
# For Tianocore and iPXE # For Tianocore and iPXE
# TODO: check whether this is the full list # TODO: check whether this is the full list
pkcon -y install nasm perl-libwww-perl python2 subversion pkcon -y --allow-reinstall install nasm perl-libwww-perl python2 subversion
# For building source code: # For building source code:
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install gcc pkcon -y --allow-reinstall install gcc
# for running the crostool script (to get mrc.bin file for t440p) # for running the crostool script (to get mrc.bin file for t440p)
pkcon -y install sharutils curl parted e2fsprogs unzip pkcon -y --allow-reinstall install sharutils curl parted e2fsprogs unzip
# for cross-compiling ARM binaries # for cross-compiling ARM binaries
pkcon -y install arm-none-eabi-gcc-cs pkcon -y --allow-reinstall install arm-none-eabi-gcc-cs
# Memtest86+ build dependencies # Memtest86+ build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install gcc python2 pkcon -y --allow-reinstall install gcc python2
# i945-pwm build dependencies # i945-pwm build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install gcc perl pkcon -y --allow-reinstall install gcc perl
# Coreboot build dependencies (also requires build-essential and git) # Coreboot build dependencies (also requires build-essential and git)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install gcc-gnat ncurses-devel doxygen acpica-tools gdb flex bison gcc git openssl-devel gprbuild bzip2 pkcon -y --allow-reinstall install gcc-gnat ncurses-devel doxygen acpica-tools gdb flex bison gcc git openssl-devel gprbuild bzip2
# GRUB build dependencies (also requires build-essential, bison and flex) # GRUB build dependencies (also requires build-essential, bison and flex)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install unifont-fonts autogen help2man gcc bison flex dejavu-fonts-all texinfo rsync python libusb xz gawk device-mapper fuse gettext freetype-devel intltool libselinux-devel pkcon -y --allow-reinstall install unifont-fonts autogen help2man gcc bison flex dejavu-fonts-all texinfo rsync python libusb xz gawk device-mapper fuse gettext freetype-devel intltool libselinux-devel
# BucTS build dependencies (external script) # BucTS build dependencies (external script)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install gcc pkcon -y --allow-reinstall install gcc
# Flashrom build dependencies (also requires build-essential) # Flashrom build dependencies (also requires build-essential)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install pciutils-devel zlib-devel libftdi-devel gcc libusb-devel pkcon -y --allow-reinstall install pciutils-devel zlib-devel libftdi-devel gcc libusb-devel
# For running make check # For running make check
# ---------------------- # ----------------------
pkcon -y install ShellCheck # lint pkcon -y --allow-reinstall install ShellCheck # lint
pkcon -y install gawk git grep lzip make sed tar xz # u-boot-libre pkcon -y --allow-reinstall install gawk git grep lzip make sed tar xz # u-boot-libre

40
resources/dependencies/ubuntu2004
View File

@ -32,80 +32,80 @@ apt-get -y install packagekit-tools
# This is so that they can moved to separate scripts. # This is so that they can moved to separate scripts.
# #
pkcon -y install wget pkcon -y --allow-reinstall install wget
# For downloading source code # For downloading source code
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install git pkcon -y --allow-reinstall install git
# For Tianocore and iPXE # For Tianocore and iPXE
# TODO: check whether this is the full list # TODO: check whether this is the full list
pkcon -y install uuid-dev nasm pkcon -y --allow-reinstall install uuid-dev nasm
# For building source code: # For building source code:
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential pkcon -y --allow-reinstall install build-essential
# for running the crostool script (to get mrc.bin file for t440p) # for running the crostool script (to get mrc.bin file for t440p)
pkcon -y install sharutils curl parted e2fsprogs unzip pkcon -y --allow-reinstall install sharutils curl parted e2fsprogs unzip
# to use the right software versions and links for compiling # to use the right software versions and links for compiling
pkcon -y install pkg-config pkcon -y --allow-reinstall install pkg-config
# for cross-compiling ARM binaries # for cross-compiling ARM binaries
pkcon -y install gcc-arm-linux-gnueabi pkcon -y --allow-reinstall install gcc-arm-linux-gnueabi
[ "$(uname -i)" = x86_64 ] || [ "$(uname -m)" = x86_64 ] [ "$(uname -i)" = x86_64 ] || [ "$(uname -m)" = x86_64 ]
arch=${?} arch=${?}
# For cross-compiling i686 target on x86_64 host. # For cross-compiling i686 target on x86_64 host.
if [ "${arch}" -eq 0 ]; then if [ "${arch}" -eq 0 ]; then
pkcon -y install gcc-multilib libc6-i386 libc6-dev-i386 pkcon -y --allow-reinstall install gcc-multilib libc6-i386 libc6-dev-i386
pkcon -y install lib32stdc++6 g++-multilib dh-autoreconf pkcon -y --allow-reinstall install lib32stdc++6 g++-multilib dh-autoreconf
# recommended, but not sure what for: # recommended, but not sure what for:
pkcon -y install lib32tinfo-dev pkcon -y --allow-reinstall install lib32tinfo-dev
fi fi
# Memtest86+ build dependencies # Memtest86+ build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential python2.7 pkcon -y --allow-reinstall install build-essential python2.7
# i945-pwm build dependencies # i945-pwm build dependencies
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential perl pkcon -y --allow-reinstall install build-essential perl
# Coreboot build dependencies (also requires build-essential and git) # Coreboot build dependencies (also requires build-essential and git)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install libncurses5-dev doxygen iasl gdb flex bison build-essential git libssl-dev gnat pkcon -y --allow-reinstall install libncurses5-dev doxygen iasl gdb flex bison build-essential git libssl-dev gnat
# For cross-compiling i686 target on x86_64 host. # For cross-compiling i686 target on x86_64 host.
[ "${arch}" -eq 0 ] && pkcon -y install lib32ncurses5-dev [ "${arch}" -eq 0 ] && pkcon -y --allow-reinstall install lib32ncurses5-dev
# GRUB build dependencies (also requires build-essential, bison and flex) # GRUB build dependencies (also requires build-essential, bison and flex)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install 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 pkcon -y --allow-reinstall install 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
# BucTS build dependencies (external script) # BucTS build dependencies (external script)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install build-essential pkcon -y --allow-reinstall install build-essential
# Flashrom build dependencies (also requires build-essential) # Flashrom build dependencies (also requires build-essential)
# ------------------------------------------------------------ # ------------------------------------------------------------
pkcon -y install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential libusb-1.0-0-dev libusb-1.0 libusb-1.0-0-dev libusb-dev pkcon -y --allow-reinstall install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential libusb-1.0-0-dev libusb-1.0 libusb-1.0-0-dev libusb-dev
# For cross-compiling i686 target on x86_64 host. # For cross-compiling i686 target on x86_64 host.
[ "${arch}" -eq 0 ] && pkcon -y install lib32z1-dev [ "${arch}" -eq 0 ] && pkcon -y --allow-reinstall install lib32z1-dev
# For running make check # For running make check
# ---------------------- # ----------------------
pkcon -y install shellcheck # lint pkcon -y --allow-reinstall install shellcheck # lint
pkcon -y install gawk git grep lzip make sed tar xz-utils # u-boot-libre pkcon -y --allow-reinstall install gawk git grep lzip make sed tar xz-utils # u-boot-libre