diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-04-09 23:18:39 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-04-15 22:06:36 +0100 |
| commit | e8776cdc56be26520efb4007c319d2356a30055a (patch) | |
| tree | 0699ce41bd770bff0e04a7769ee79412a2b91600 /bootloader/Makefile | |
| parent | 043333dda03be66fef493921b7e595557611e58a (diff) | |
| download | drakiso-e8776cdc56be26520efb4007c319d2356a30055a.tar drakiso-e8776cdc56be26520efb4007c319d2356a30055a.tar.gz drakiso-e8776cdc56be26520efb4007c319d2356a30055a.tar.bz2 drakiso-e8776cdc56be26520efb4007c319d2356a30055a.tar.xz drakiso-e8776cdc56be26520efb4007c319d2356a30055a.zip | |
GRUB2 at_keyboard is unreliable on real hardware, so don't use it.
Currently I don't see any way to reliably support different keyboard
layouts in GRUB2, so remove all support for that. The keyboard menu
is still useful for selecting the keyboard layout when using the
minimal ISO example.
Diffstat (limited to 'bootloader/Makefile')
| -rw-r--r-- | bootloader/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile index 74437f7..f625342 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -1,11 +1,10 @@ -MY_TARGETS = images kbd-names.txt lang-kbds.txt layouts maggy unicode.pf2 +MY_TARGETS = images kbd-names.txt lang-kbds.txt maggy unicode.pf2 ARCH = $(shell uname -m) GRUB2_MODULES = iso9660 ext2 fat jfs reiserfs xfs \ part_apple part_bsd part_gpt part_msdos \ - all_video font png gfxterm gfxmenu \ - keylayouts at_keyboard usb_keyboard \ + all_video font gfxterm gfxmenu png \ boot chain configfile echo gettext \ linux linux16 ls search test @@ -39,11 +38,9 @@ images/bootx64.efi: @mkdir -p images grub2-mkimage --output $@ --prefix /EFI/BOOT --format x86_64-efi $(GRUB2_MODULES) -kbd-names%txt lang-kbds%txt: layouts +kbd-names%txt lang-kbds%txt: make-kbd-info -layouts: - maggy: /boot/grub2/themes/maggy cp -rL $< $@ @@ -56,12 +53,10 @@ unicode.pf2: /usr/share/grub/unicode.pf2 install: all mkdir -p $(INSTALL_DIR)/images - mkdir -p $(INSTALL_DIR)/layouts mkdir -p $(INSTALL_DIR)/messages mkdir -p $(INSTALL_DIR)/maggy install -m 0644 *.txt *.pf2 $(INSTALL_DIR) install -m 0644 images/* $(INSTALL_DIR)/images - install -m 0644 layouts/* $(INSTALL_DIR)/layouts install -m 0644 maggy/* $(INSTALL_DIR)/maggy install -m 0644 po/*.mo $(INSTALL_DIR)/messages |