Skip to contentSkip to conversation

generic/blocklist: Fix flag name

PATCH In review David Michael 2 participants 3 messages Jul 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generic/blocklist: Fix flag name

---

Hi,

I tried to test the new release and hit this build failure:

In file included from ../grub-core/osdep/blocklist.c:6:0:
../grub-core/osdep/generic/blocklist.c: In function ‘grub_install_get_blocklist’:
../grub-core/osdep/generic/blocklist.c:62:67: error: ‘FILE_TYPE_NO_DECOMPRESS’ undeclared (first use in this function); did you mean ‘GRUB_FILE_TYPE_NO_DECOMPRESS’?

       file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
                                                                   ^~~~~~~~~~~~~~~~~~~~~~~
                                                                   GRUB_FILE_TYPE_NO_DECOMPRESS

../grub-core/osdep/generic/blocklist.c:62:67: note: each undeclared identifier is reported only once for each function it appears in

It seems to be fixed by this change. Can it be applied for the next release?

Thanks.

David

 grub-core/osdep/generic/blocklist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
grub-core/osdep/generic/blocklist.c +2 -2
index ea2a511b6..2d9040302 100644
@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
 
       grub_disk_cache_invalidate_all ();
 
-      file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
+      file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
       if (file)
 	{
 	  if (grub_file_size (file) != core_size)
@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
 
   grub_file_t file;
   /* Now read the core image to determine where the sectors are.  */
-  file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
+  file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
   if (! file)
     grub_util_error ("%s", grub_errmsg);
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 10 lines · David Michael

---

Hi,

I tried to test the new release and hit this build failure:

In file included from ../grub-core/osdep/blocklist.c:6:0:
../grub-core/osdep/generic/blocklist.c: In function ‘grub_install_get_blocklist’:
../grub-core/osdep/generic/blocklist.c:62:67: error: ‘FILE_TYPE_NO_DECOMPRESS’ undeclared (first use in this function); did you mean ‘GRUB_FILE_TYPE_NO_DECOMPRESS’?

Quoted 6 lines
       file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
                                                                   ^~~~~~~~~~~~~~~~~~~~~~~
                                                                   GRUB_FILE_TYPE_NO_DECOMPRESS

../grub-core/osdep/generic/blocklist.c:62:67: note: each undeclared identifier is reported only once for each function it appears in

It seems to be fixed by this change. Can it be applied for the next release?

Hmmm... How come? Several people at least build tested GRUB before release and this did not surface. Could you tell us which options you use with configure script? Anyway, patch LGTM but I want to know why the breakage did not appeared earlier.

Daniel

#2 lore raw
Quoted 17 lines · Daniel Kiper
Quoted 15 lines · David Michael

---

Hi,

I tried to test the new release and hit this build failure:

In file included from ../grub-core/osdep/blocklist.c:6:0:
../grub-core/osdep/generic/blocklist.c: In function ‘grub_install_get_blocklist’:
../grub-core/osdep/generic/blocklist.c:62:67: error: ‘FILE_TYPE_NO_DECOMPRESS’ undeclared (first use in this function); did you mean ‘GRUB_FILE_TYPE_NO_DECOMPRESS’?

       file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
                                                                   ^~~~~~~~~~~~~~~~~~~~~~~
                                                                   GRUB_FILE_TYPE_NO_DECOMPRESS

../grub-core/osdep/generic/blocklist.c:62:67: note: each undeclared identifier is reported only once for each function it appears in

Quoted 6 lines
Quoted 1 line

It seems to be fixed by this change. Can it be applied for the next release?

Hmmm... How come? Several people at least build tested GRUB before release and this did not surface. Could you tell us which options you use with configure script? Anyway, patch LGTM but I want to know why the breakage did not appeared earlier.

It looks like it's because I built it for Hurd, and the error is only present in the non-Linux/Windows version of that file. The top-level osdep/blocklist.c file is just the following:

#ifdef __linux__
#include "linux/blocklist.c"
#elif defined (__MINGW32__) || defined (__CYGWIN__) #include "windows/blocklist.c"
#else
#include "generic/blocklist.c"
#endif

So I think the release is okay for the common platforms.

Thanks.

David