replace rpm gpg with gpg1 in fedora31

[build.git] / config.lxc / bootcd.pkgs

diff --git a/config.lxc/bootcd.pkgs b/config.lxc/bootcd.pkgs
index 295c4a5..53e7e2d 100644 (file)
--- a/config.lxc/bootcd.pkgs
+++ b/config.lxc/bootcd.pkgs
@@ -12,6 +12,12 @@ package: coreutils
 package: iputils
 package: kernel
 package>=f23: kernel-modules kernel-modules-extra
+# f31: building root images with a kernel with kernel-core
+# apparently this requires grubby-deprecated;
+# it might even be safer to install that one 
+# earlier so that we can be sure that grubby-deprecated is there
+# when the kernel-core install scriptlet triggers
+package>=f31: grubby-deprecated kernel-core 
 package>=f24: systemd-udev
 package: bzip2
 package: diffutils
@@ -36,7 +42,9 @@ package: authconfig
 package: hdparm
 package: lvm2
 package: kexec-tools
-package>=f8 package>=centos5: gnupg
+# see myplc/plc.d/gpg
+package<=f29: gnupg
+package>=f31: gnupg1
 package>=sl6: gnupg2
 package: nano
 package: parted