diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-28 15:18:20 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-28 15:18:20 -0500 |
| commit | e413b035997fff2bcef4285247836a56edf92615 (patch) | |
| tree | d74d9d464659a40d0a070d2c8c2d21fe92645610 | |
| parent | a45f20c0266103ed948d4a644e6d6d1c33a90b38 (diff) | |
small fixes
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | bin/.gitignore | 2 | ||||
| -rw-r--r-- | buildrom-withgrub.mk | 3 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | tmp/.gitignore | 2 |
5 files changed, 20 insertions, 13 deletions
@@ -37,19 +37,19 @@ $(eval _loop = $(_loop_str)) $(_loop) endef -include modules.mk -include build.mk -include grub-mkstandalone.mk -include buildrom-withgrub.mk - $(keymapdir)/list.mk: $(keymapdir)/original/ echo keymaps = $$(ls $<) > $@ -resources/grub/font/dejavusansmono.pf2: src/dejavu/ttv/DejaVuSansMono.ttf $(GRUB_MKFONT) +resources/grub/font/dejavusansmono.pf2: src/dejavu/ttv/DejaVuSansMono.ttf $(firstword $(GRUB_MKFONT)) $(GRUB_MKFONT) -o $@ $< # % = $(keymap) -$(keymapdir)/keymap/%.gkb: $(keymapdir)/orignal/% builddeps-grub +$(keymapdir)/%.gkb: $(keymapdir)/original/% $(firstword $(GRUB_MKLAYOUT)) $(GRUB_MKLAYOUT) -o $@ < $< + +include modules.mk +include build.mk +include grub-mkstandalone.mk +include buildrom-withgrub.mk diff --git a/bin/.gitignore b/bin/.gitignore index 6164c78..78d9101 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,2 @@ -/ +/* !.gitignore diff --git a/buildrom-withgrub.mk b/buildrom-withgrub.mk index 42970f8..420346c 100644 --- a/buildrom-withgrub.mk +++ b/buildrom-withgrub.mk @@ -1,7 +1,8 @@ define rule_rom_nokeyboard -tmp/$(board)_nokeyboard_$(romtype).rom: \ +tmp/$(board)_nokeyboard_$(romtype).rom: builddeps-coreboot \ tmp/grub_$(romtype).elf \ resources/libreboot/config/$(board)_$(romtype)_config + rm -f src/coreboot/.config src/coreboot/grub.elf $(MAKE) -C src/coreboot clean ln resources/libreboot/config/$(board)_$(romtype)_config src/coreboot/.config ln tmp/grub_$(romtype).elf src/coreboot/grub.elf diff --git a/configure.ac b/configure.ac index f1cd957..4ded3ef 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,11 @@ if test "x$HAVE_GIT" = x ; then AC_MSG_ERROR([Please install the 'git' utility]) fi +AC_CHECK_PROG(HAVE_WGET,WGET,yes) +if test "x$HAVE_WGET" = x ; then + AC_MSG_ERROR([Please install the 'wget' utility]) +fi + dnl 'sh' does not nescessarily imply 'bash' AC_CHECK_PROG(HAVE_BASH,bash,yes) if test "x$HAVE_BASH" = x ; then @@ -66,9 +71,10 @@ AC_MSG_RESULT([yes]) dnl This is at least needed by memtest AC_LANG_PUSH([C]) -AC_MSG_NOTICE([----------------------------------------------------------------]) -AC_MSG_NOTICE([The next few tests are for 32-bit C, NOT the native architecture]) -AC_MSG_NOTICE([----------------------------------------------------------------]) +AC_MSG_NOTICE([----------------------------------------------------------------------------]) +AC_MSG_NOTICE([The next few tests are for 32-bit C, NOT necessarily the native architecture]) +AC_MSG_NOTICE([----------------------------------------------------------------------------]) +AC_MSG_NOTICE([If you have GCC, but these fail, look for a 'gcc-multilib' package]) CFLAGS='-march=i486 -m32' AC_CHECK_HEADERS([stdint.h sys/io.h],,[AC_MSG_ERROR([Could not find libc headers])]) AC_LANG_POP([C]) diff --git a/tmp/.gitignore b/tmp/.gitignore index 6164c78..78d9101 100644 --- a/tmp/.gitignore +++ b/tmp/.gitignore @@ -1,2 +1,2 @@ -/ +/* !.gitignore |