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

Merge branch 'fu/disk_common'

Browse source
This commit is contained in:
Andrey Borzenkov 2013-10-27 23:45:43 +04:00
commit 11d81fc6d1
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-10-14 Andrey Borzenkov <arvidjaar@gmail.com>
* Makefile.util.def: Add grub-core/kern/disk_common.c to library
extra_dist.
* grub-core/Makefile.core.def: Add kern/disk_common.c to disk module
extra_dist.
2013-10-27 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkfont.c (main): Show error message when FT_Set_Pixel_Sizes

1
Makefile.util.def
View file

@ -15,6 +15,7 @@ library = {
common = grub-core/osdep/getroot.c;
common = grub-core/osdep/devmapper/getroot.c;
common = grub-core/osdep/relpath.c;
extra_dist = grub-core/kern/disk_common.c;
extra_dist = grub-core/osdep/unix/relpath.c;
extra_dist = grub-core/osdep/aros/relpath.c;
extra_dist = grub-core/osdep/windows/relpath.c;

1
grub-core/Makefile.core.def
View file

@ -458,6 +458,7 @@ image = {
module = {
name = disk;
common = lib/disk.c;
extra_dist = kern/disk_common.c;
};
module = {