vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

compile and configuration fixes

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-22 13:15:49 +01:00
parent 7f4f3f581c
commit 937d332db3
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/search.c
View file

@ -25,7 +25,7 @@
#include <grub/device.h> #include <grub/device.h>
#include <grub/file.h> #include <grub/file.h>
#include <grub/env.h> #include <grub/env.h>
#include <grub/extcmd.h> #include <grub/command.h>
void void
FUNC_NAME (const char *key, const char *var, int no_floppy) FUNC_NAME (const char *key, const char *var, int no_floppy)

12
commands/search_wrap.c
View file

@ -17,6 +17,14 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <grub/types.h>
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/err.h>
#include <grub/dl.h>
#include <grub/env.h>
#include <grub/extcmd.h>
static const struct grub_arg_option options[] = static const struct grub_arg_option options[] =
{ {
{"file", 'f', 0, "search devices by a file", 0, 0}, {"file", 'f', 0, "search devices by a file", 0, 0},
@ -36,6 +44,10 @@ enum options
SEARCH_NO_FLOPPY, SEARCH_NO_FLOPPY,
}; };
void grub_search_fs_file (const char *key, const char *var, int no_floppy);
void grub_search_fs_uuid (const char *key, const char *var, int no_floppy);
void grub_search_label (const char *key, const char *var, int no_floppy);
static grub_err_t static grub_err_t
grub_cmd_search (grub_extcmd_t cmd, int argc, char **args) grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
{ {

17
conf/common.rmk
View file

@ -370,8 +370,7 @@ scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
# Commands. # Commands.
pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod \ pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod \
ls.mod cmp.mod cat.mod help.mod search_file.mod \ ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod \
search_fs_uuid.mod search_fs_label.mod search.mod loopback.mod \
configfile.mod echo.mod \ configfile.mod echo.mod \
terminfo.mod test.mod blocklist.mod hexdump.mod \ terminfo.mod test.mod blocklist.mod hexdump.mod \
read.mod sleep.mod loadenv.mod crc.mod parttool.mod \ read.mod sleep.mod loadenv.mod crc.mod parttool.mod \
@ -449,10 +448,12 @@ search_mod_SOURCES = commands/search_wrap.c
search_mod_CFLAGS = $(COMMON_CFLAGS) search_mod_CFLAGS = $(COMMON_CFLAGS)
search_mod_LDFLAGS = $(COMMON_LDFLAGS) search_mod_LDFLAGS = $(COMMON_LDFLAGS)
pkglib_MODULES += search_fs_file.mod search_fs_uuid.mod search_label.mod
# For search.mod. # For search.mod.
search_file_mod_SOURCES = commands/search_file.c search_fs_file_mod_SOURCES = commands/search_file.c
search_file_mod_CFLAGS = $(COMMON_CFLAGS) search_fs_file_mod_CFLAGS = $(COMMON_CFLAGS)
search_file_mod_LDFLAGS = $(COMMON_LDFLAGS) search_fs_file_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For search.mod. # For search.mod.
search_label_mod_SOURCES = commands/search_label.c search_label_mod_SOURCES = commands/search_label.c
@ -460,9 +461,9 @@ search_label_mod_CFLAGS = $(COMMON_CFLAGS)
search_label_mod_LDFLAGS = $(COMMON_LDFLAGS) search_label_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For search.mod. # For search.mod.
search_uuid_mod_SOURCES = commands/search_uuid.c search_fs_uuid_mod_SOURCES = commands/search_uuid.c
search_uuid_mod_CFLAGS = $(COMMON_CFLAGS) search_fs_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
search_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS) search_fs_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For test.mod. # For test.mod.
test_mod_SOURCES = commands/test.c test_mod_SOURCES = commands/test.c