From e50f311c45a3c03cfd512b6a27e95a7b6b58fbce Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 22 Nov 2024 23:14:34 +0100 Subject: [PATCH] dependencies: pureos: go back to apt (instead of packagekit). In the commit 0f74569af0c355278a62ecc66a1397c9c3701498 ("dependencies: switch arch, debian, fedora35, ubuntu2004 to packagekit"), the Trisquel script was converted to use packagekit to then be able to unify the dependency management between several distributions. However GNU Boot doesn't build directly on Parabola, and the build is completely untested on Fedora and Void, so the other scripts are less important. In contrast building GNU Boot is regularely tested on PureOS 10 (byzantium) and Trisquel 11 (aramo). Since the Guix debootstrap package can be used to safely create chroots of PureOS and Trisquel, it may be possible to use that to build GNU Boot on any distributions. However packagekit requires a daemon to work: # pkcon install guix Failed to contact PackageKit: Could not connect: No such file or directory And in turn the /usr/libexec/packagekitd daemon requires dbus as shown by the /lib/systemd/system/packagekit.service file: [Unit] Description=PackageKit Daemon # PK doesn't know how to do anything on ostree-managed systems; # currently the design is to have dedicated daemons like # eos-updater and rpm-ostree, and gnome-software talks to those. ConditionPathExists=!/run/ostree-booted Wants=network-online.target [Service] Type=dbus BusName=org.freedesktop.PackageKit User=root ExecStart=/usr/libexec/packagekitd So reverting back to apt seems a safe choice for now. Signed-off-by: Denis 'GNUtoo' Carikli Acked-by: Adrien 'neox' Bourmault --- resources/dependencies/pureos-10 | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/dependencies/pureos-10 b/resources/dependencies/pureos-10 index 2360ea8..0e5f815 100755 --- a/resources/dependencies/pureos-10 +++ b/resources/dependencies/pureos-10 @@ -32,80 +32,80 @@ apt-get -y install packagekit # This is so that they can moved to separate scripts. # -pkcon -y --allow-reinstall install wget +apt install -y --allow-reinstall install wget # For downloading source code # ------------------------------------------------------------ -pkcon -y --allow-reinstall install git +apt install -y --allow-reinstall install git # For Tianocore and iPXE # TODO: check whether this is the full list -pkcon -y --allow-reinstall install uuid-dev nasm +apt install -y --allow-reinstall install uuid-dev nasm # For building source code: # ------------------------------------------------------------ -pkcon -y --allow-reinstall install build-essential +apt install -y --allow-reinstall install build-essential # for running the crostool script (to get mrc.bin file for t440p) -pkcon -y --allow-reinstall install sharutils curl parted e2fsprogs unzip +apt install -y --allow-reinstall install sharutils curl parted e2fsprogs unzip # to use the right software versions and links for compiling -pkcon -y --allow-reinstall install pkg-config +apt install -y --allow-reinstall install pkg-config # for cross-compiling ARM binaries -pkcon -y --allow-reinstall install gcc-arm-linux-gnueabi +apt install -y --allow-reinstall install gcc-arm-linux-gnueabi [ "$(uname -i)" = x86_64 ] || [ "$(uname -m)" = x86_64 ] arch=${?} # For cross-compiling i686 target on x86_64 host. if [ "${arch}" -eq 0 ]; then - pkcon -y --allow-reinstall install gcc-multilib libc6-i386 libc6-dev-i386 - pkcon -y --allow-reinstall install lib32stdc++6 g++-multilib dh-autoreconf + apt install -y --allow-reinstall install gcc-multilib libc6-i386 libc6-dev-i386 + apt install -y --allow-reinstall install lib32stdc++6 g++-multilib dh-autoreconf fi # Memtest86+ build dependencies # ------------------------------------------------------------ -pkcon -y --allow-reinstall install build-essential python2.7 python-is-python3 +apt install -y --allow-reinstall install build-essential python2.7 python-is-python3 # i945-pwm build dependencies # ------------------------------------------------------------ -pkcon -y --allow-reinstall install build-essential perl +apt install -y --allow-reinstall install build-essential perl # Coreboot build dependencies (also requires build-essential and git) # ------------------------------------------------------------ -pkcon -y --allow-reinstall install libncurses5-dev doxygen acpica-tools gdb flex bison build-essential git libssl-dev gnat +apt install -y --allow-reinstall install libncurses5-dev doxygen acpica-tools gdb flex bison build-essential git libssl-dev gnat # GRUB build dependencies (also requires build-essential, bison and flex) # ------------------------------------------------------------ -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-bin libfreetype6-dev +apt install -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-bin libfreetype6-dev # BucTS build dependencies (external script) # ------------------------------------------------------------ -pkcon -y --allow-reinstall install build-essential +apt install -y --allow-reinstall install build-essential # Flashrom build dependencies (also requires build-essential) # ------------------------------------------------------------ -pkcon -y --allow-reinstall install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential libusb-1.0-0-dev libusb-1.0-0 +apt install -y --allow-reinstall install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential libusb-1.0-0-dev libusb-1.0-0 # For cross-compiling i686 target on x86_64 host. -[ "${arch}" -eq 0 ] && pkcon -y --allow-reinstall install lib32z1-dev +[ "${arch}" -eq 0 ] && apt install -y --allow-reinstall install lib32z1-dev # For running make check # ---------------------- -pkcon -y --allow-reinstall install shellcheck # lint -pkcon -y --allow-reinstall install gawk git grep lzip make sed tar xz-utils # u-boot-libre +apt install -y --allow-reinstall install shellcheck # lint +apt install -y --allow-reinstall install gawk git grep lzip make sed tar xz-utils # u-boot-libre # For building the website tarball -pkcon -y --allow-reinstall install \ +apt install -y --allow-reinstall install \ graphviz \ pandoc