dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0335-pgp-Fix-emu-build-and-tests-after-pgp-module-renamin.patch

5975ab
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
5975ab
From: Colin Watson <cjwatson@ubuntu.com>
5975ab
Date: Wed, 9 Jan 2019 14:54:39 +0000
5975ab
Subject: [PATCH] pgp: Fix emu build and tests after pgp module renaming
5975ab
5975ab
Commit b07feb8746c3bb845e3f0d33d37c0bded704d14d (verifiers: Rename
5975ab
verify module to pgp module) renamed the "verify" module to "pgp", but
5975ab
the GRUB_MOD_INIT and GRUB_MOD_FINI macros were left as "verify", which
5975ab
broke the emu target build; and file_filter_test still referred to the
5975ab
now non-existent "verify" module. Fix both of these.
5975ab
5975ab
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
5975ab
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
5975ab
(cherry picked from commit ed087f0460516737e174222f01e2bf6ccbd45674)
5975ab
Signed-off-by: Daniel Axtens <dja@axtens.net>
5975ab
---
5975ab
 grub-core/commands/pgp.c  | 4 ++--
5975ab
 tests/file_filter_test.in | 2 +-
5975ab
 2 files changed, 3 insertions(+), 3 deletions(-)
5975ab
5975ab
diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
5975ab
index 29e74a64004..5c913c2e2fe 100644
5975ab
--- a/grub-core/commands/pgp.c
5975ab
+++ b/grub-core/commands/pgp.c
5975ab
@@ -950,7 +950,7 @@ struct grub_file_verifier grub_pubkey_verifier =
5975ab
 static grub_extcmd_t cmd, cmd_trust;
5975ab
 static grub_command_t cmd_distrust, cmd_list;
5975ab
 
5975ab
-GRUB_MOD_INIT(verify)
5975ab
+GRUB_MOD_INIT(pgp)
5975ab
 {
5975ab
   const char *val;
5975ab
   struct grub_module_header *header;
5975ab
@@ -1009,7 +1009,7 @@ GRUB_MOD_INIT(verify)
5975ab
   grub_verifier_register (&grub_pubkey_verifier);
5975ab
 }
5975ab
 
5975ab
-GRUB_MOD_FINI(verify)
5975ab
+GRUB_MOD_FINI(pgp)
5975ab
 {
5975ab
   grub_verifier_unregister (&grub_pubkey_verifier);
5975ab
   grub_unregister_extcmd (cmd);
5975ab
diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in
5975ab
index bfb6382274e..ed6abcb5af4 100644
5975ab
--- a/tests/file_filter_test.in
5975ab
+++ b/tests/file_filter_test.in
5975ab
@@ -19,7 +19,7 @@ grubshell=@builddir@/grub-shell
5975ab
 
5975ab
 . "@builddir@/grub-core/modinfo.sh"
5975ab
 
5975ab
-filters="gzio xzio lzopio verify"
5975ab
+filters="gzio xzio lzopio pgp"
5975ab
 modules="cat mpi"
5975ab
 
5975ab
 for mod in $(cut -d ' ' -f 2 "@builddir@/grub-core/crypto.lst"  | sort -u); do