debian: Reinstall various packages again

These packages have been added back to testing so let's install them
again.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66311374f2747c62442c4583b206a9a7c063f53d..de94c807804d3b6c222b133a154ef884bb6f1eb6 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -122,9 +122,6 @@ jobs:
           # TODO: Try again once Arch gets a new rpm release.
           - distro: centos
             tools: arch
-          # TODO: Re-enable once pacman-package-manager is back in testing
-          - distro: arch
-            tools: debian
 
     steps:
     - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b

diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
index 050df6339d2416a772eb804b3d4d748c916327e6..a65670a82622ba3a7b9e37dd34bb9c470c5215f9 100644 (file)
--- a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
@@ -9,8 +9,6 @@ Packages=
         archlinux-keyring
         dbus-broker
         dnf
-        # TODO: Add back again once makepkg is back in testing.
-        # makepkg
-        # TODO: Add back again once pacman-package-manager is back in testing.
-        # pacman-package-manager
+        makepkg
+        pacman-package-manager
         swtpm

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
index 0ca27c2093feb4017dd55d086834e5b18047a21d..7a787b8d95d1d26b6d13debf5009de653c4d2cf9 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
@@ -10,8 +10,7 @@ Packages=
         apt
         archlinux-keyring
         btrfs-progs
-        # TODO: Re-enable once createrepo-c is back in testing.
-        # createrepo-c
+        createrepo-c
         curl
         debian-archive-keyring
         erofs-utils
@@ -19,12 +18,10 @@ Packages=
         grub2
         libarchive-tools
         libtss2-dev
-        # TODO: Re-enable once makepkg is back in testing.
-        # makepkg
+        makepkg
         openssh-client
         ovmf
-        # TODO: Re-enable once pacman-package-manager is back in testing.
-        # pacman-package-manager
+        pacman-package-manager
         pesign
         policycoreutils
         python3-cryptography

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf
deleted file mode 100644 (file)
index 6f337fe..0000000
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=ubuntu
-
-[Content]
-Packages=
-        # TODO: Remove once createrepo-c is back in debian testing.
-        createrepo-c
-        # TODO: Remove once pacman-package-manager is back in debian testing.
-        pacman-package-manager
-        makepkg