grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Fix emu build and tests after pgp module renaming


From: Colin Watson
Subject: [PATCH] Fix emu build and tests after pgp module renaming
Date: Wed, 9 Jan 2019 14:54:39 +0000
User-agent: NeoMutt/20170113 (1.7.2)

Commit b07feb8746c3bb845e3f0d33d37c0bded704d14d renamed the "verify"
module to "pgp", but the GRUB_MOD_INIT and GRUB_MOD_FINI macros were
left as "verify", which broke the emu target build; and file_filter_test
still referred to the now non-existent "verify" module.  Fix both of
these.

Signed-off-by: Colin Watson <address@hidden>
---
 grub-core/commands/pgp.c  | 4 ++--
 tests/file_filter_test.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
index 0487479af..d39846d8c 100644
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -949,7 +949,7 @@ struct grub_file_verifier grub_pubkey_verifier =
 static grub_extcmd_t cmd, cmd_trust;
 static grub_command_t cmd_distrust, cmd_list;
 
-GRUB_MOD_INIT(verify)
+GRUB_MOD_INIT(pgp)
 {
   const char *val;
   struct grub_module_header *header;
@@ -1008,7 +1008,7 @@ GRUB_MOD_INIT(verify)
   grub_verifier_register (&grub_pubkey_verifier);
 }
 
-GRUB_MOD_FINI(verify)
+GRUB_MOD_FINI(pgp)
 {
   grub_verifier_unregister (&grub_pubkey_verifier);
   grub_unregister_extcmd (cmd);
diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in
index bfb638227..ed6abcb5a 100644
--- a/tests/file_filter_test.in
+++ b/tests/file_filter_test.in
@@ -19,7 +19,7 @@ address@hidden@/grub-shell
 
 . "@builddir@/grub-core/modinfo.sh"
 
-filters="gzio xzio lzopio verify"
+filters="gzio xzio lzopio pgp"
 modules="cat mpi"
 
 for mod in $(cut -d ' ' -f 2 "@builddir@/grub-core/crypto.lst"  | sort -u); do
-- 
2.20.1



reply via email to

[Prev in Thread] Current Thread [Next in Thread]