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

2005-08-08 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* Makefile.in (LIBLZO): New variable.

        * configure.ac: Check for LZO version 2.

        * util/i386/pc/grub-mkimage.c [HAVE_LZO_LZO1X_H]: Include
        lzo/lzo1x.h instead of lzo1x.h.

        * conf/i386-pc.rmk (grub_mkimage_LDFLAGS): Use $(LIBLZO) instead
        of -llzo.

        * util/i386/pc/grub-setup.c (main): Do not free PREFIX
        twice. Reported by Vladimir Serbinenko <phcoder@gmail.com>.

        * partmap/pc.c (pc_partition_map_probe): Restore P->DATA after
        copying the data from PARTITION to P.
This commit is contained in:
okuji 2005-08-08 23:15:21 +00:00
parent f4917dfdd6
commit 4ac9bd0438
12 changed files with 352 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/i386-pc.mk
View file

@ -305,7 +305,7 @@ grub_mkimage-util_resolve.d: util/resolve.c
-include grub_mkimage-util_resolve.d
grub_mkimage_LDFLAGS = -llzo
grub_mkimage_LDFLAGS = $(LIBLZO)
# For grub-setup.
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \

2
conf/i386-pc.rmk
View file

@ -55,7 +55,7 @@ noinst_UTILITIES = genmoddep
# For grub-mkimage.
grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
util/resolve.c
grub_mkimage_LDFLAGS = -llzo
grub_mkimage_LDFLAGS = $(LIBLZO)
# For grub-setup.
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \