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

Fix grub-emu build on FreeBSD.

Browse source 
* Makefile.util.def (grub-mount): Add LIBGEOM to ldadd.
* grub-core/net/drivers/emu/emunet.c: Only include Linux-specific
headers on Linux.
(GRUB_MOD_INIT): Return immediately on non-Linux platforms; this
implementation is currently Linux-specific.
* util/getroot.c (exec_pipe): Define only on Linux or when either
libzfs or libnvpair is unavailable.
(find_root_devices_from_poolname): Remove unused path variable.
This commit is contained in:
Colin Watson 2012-09-22 21:19:58 +01:00
parent 86d08fdb18
commit 794c8c3375
4 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.util.def
View file

@ -266,7 +266,7 @@ program = {
ldadd = libgrubgcry.a;
ldadd = libgrubkern.a;
ldadd = grub-core/gnulib/libgnu.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse';
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';
condition = COND_GRUB_MOUNT;
};