summaryrefslogtreecommitdiff
path: root/resources/utilities/grub-assemble
diff options
context:
space:
mode:
Diffstat (limited to 'resources/utilities/grub-assemble')
-rwxr-xr-xresources/utilities/grub-assemble/gen.txtmode.sh29
-rwxr-xr-xresources/utilities/grub-assemble/gen.vesafb.sh28
-rwxr-xr-xresources/utilities/grub-assemble/grub_memdisk_keymap27
-rw-r--r--resources/utilities/grub-assemble/keymap/.gitignore2
-rw-r--r--resources/utilities/grub-assemble/keymap/COPYING14
-rw-r--r--resources/utilities/grub-assemble/keymap/frazerty.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/frdvbepo.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/itqwerty.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/svenska.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/ukdvorak.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/ukqwerty.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/usdvorak.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/keymap/usqwerty.gkbbin2572 -> 0 bytes
-rw-r--r--resources/utilities/grub-assemble/modules.conf396
14 files changed, 203 insertions, 293 deletions
diff --git a/resources/utilities/grub-assemble/gen.txtmode.sh b/resources/utilities/grub-assemble/gen.txtmode.sh
deleted file mode 100755
index 1906f77..0000000
--- a/resources/utilities/grub-assemble/gen.txtmode.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved. This file is offered as-is,
-# without any warranty.
-
-set -u -e -v
-
-# TODO: Fail (and clean up) if GRUB isn't actually built. Error checking.
-
-# This is where GRUB is expected to be (outside of the grub-assemble, instead in main checkout)
-grubdir="../../../grub"
-
-source "modules.conf"
-
-# Generate the grub.elf
-$grubdir/grub-mkstandalone \
- --grub-mkimage=$grubdir/grub-mkimage \
- -O i386-coreboot \
- -o grub_txtmode.elf \
- -d $grubdir/grub-core/ \
- --fonts= --themes= --locales= \
- --modules="$grub_modules" \
- --install-modules="$grub_install_modules" \
- /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
- /memtest="../../../memtest86+-5.01/memtest" \
- /invaders.exec="../../../grubinvaders/invaders.exec" \
- $(./grub_memdisk_keymap) \
-
diff --git a/resources/utilities/grub-assemble/gen.vesafb.sh b/resources/utilities/grub-assemble/gen.vesafb.sh
deleted file mode 100755
index 627c7d4..0000000
--- a/resources/utilities/grub-assemble/gen.vesafb.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved. This file is offered as-is,
-# without any warranty.
-
-set -u -e -v
-
-# TODO: Fail (and clean up) if GRUB isn't actually built. Error checking.
-
-# This is where GRUB is expected to be (outside of the grub-assemble, instead in main checkout)
-grubdir="../../../grub"
-
-source "modules.conf"
-
-# Generate the grub.elf
-$grubdir/grub-mkstandalone \
- --grub-mkimage=$grubdir/grub-mkimage \
- -O i386-coreboot \
- -o grub_vesafb.elf \
- -d $grubdir/grub-core/ \
- --fonts= --themes= --locales= \
- --modules="$grub_modules" \
- --install-modules="$grub_install_modules" \
- /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
- /background.jpg="../../../resources/grub/background/background.jpg" \
- /dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \
- $(./grub_memdisk_keymap) \
diff --git a/resources/utilities/grub-assemble/grub_memdisk_keymap b/resources/utilities/grub-assemble/grub_memdisk_keymap
deleted file mode 100755
index 2ef0113..0000000
--- a/resources/utilities/grub-assemble/grub_memdisk_keymap
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-#
-# lists keymaps
-#
-# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-set -u -e -v
-
-for keymap in $(ls keymap/original)
-do
- printf "/boot/grub/layouts/$keymap.gkb=keymap/$keymap.gkb "
-done
diff --git a/resources/utilities/grub-assemble/keymap/.gitignore b/resources/utilities/grub-assemble/keymap/.gitignore
new file mode 100644
index 0000000..3af3335
--- /dev/null
+++ b/resources/utilities/grub-assemble/keymap/.gitignore
@@ -0,0 +1,2 @@
+/list.mk
+/*.gkb
diff --git a/resources/utilities/grub-assemble/keymap/COPYING b/resources/utilities/grub-assemble/keymap/COPYING
index 1a47bfa..ec12dba 100644
--- a/resources/utilities/grub-assemble/keymap/COPYING
+++ b/resources/utilities/grub-assemble/keymap/COPYING
@@ -1,13 +1,7 @@
Look at ../../../docs/index.html under the "GRUB2 payload" section to see
-how the following files were generated:
+how the files in ./original/ were generated.
- * dvorak.gkb
- * ukdvorak
- * ukdvorak.gkb
- * ukqwerty
- * ukqwerty.gkb
- * usdvorak
- * usqwerty
- * usqwerty.gkb
+The *.gkb files based off of them are generated by the Makefile at the
+root of libreboot.
-The files listed above are made available in the public domain (the information in them is public knowledge. copyright is pointless). Use them as you wish.
+The files listed above are made available in the public domain (the information in them is public knowledge; copyright is pointless). Use them as you wish.
diff --git a/resources/utilities/grub-assemble/keymap/frazerty.gkb b/resources/utilities/grub-assemble/keymap/frazerty.gkb
deleted file mode 100644
index c048cec..0000000
--- a/resources/utilities/grub-assemble/keymap/frazerty.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/frdvbepo.gkb b/resources/utilities/grub-assemble/keymap/frdvbepo.gkb
deleted file mode 100644
index c90b37c..0000000
--- a/resources/utilities/grub-assemble/keymap/frdvbepo.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/itqwerty.gkb b/resources/utilities/grub-assemble/keymap/itqwerty.gkb
deleted file mode 100644
index f247cd1..0000000
--- a/resources/utilities/grub-assemble/keymap/itqwerty.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/svenska.gkb b/resources/utilities/grub-assemble/keymap/svenska.gkb
deleted file mode 100644
index ec627db..0000000
--- a/resources/utilities/grub-assemble/keymap/svenska.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/ukdvorak.gkb b/resources/utilities/grub-assemble/keymap/ukdvorak.gkb
deleted file mode 100644
index c793cae..0000000
--- a/resources/utilities/grub-assemble/keymap/ukdvorak.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/ukqwerty.gkb b/resources/utilities/grub-assemble/keymap/ukqwerty.gkb
deleted file mode 100644
index 8e5ff29..0000000
--- a/resources/utilities/grub-assemble/keymap/ukqwerty.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/usdvorak.gkb b/resources/utilities/grub-assemble/keymap/usdvorak.gkb
deleted file mode 100644
index 41301ef..0000000
--- a/resources/utilities/grub-assemble/keymap/usdvorak.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/keymap/usqwerty.gkb b/resources/utilities/grub-assemble/keymap/usqwerty.gkb
deleted file mode 100644
index 5fb78d3..0000000
--- a/resources/utilities/grub-assemble/keymap/usqwerty.gkb
+++ /dev/null
Binary files differ
diff --git a/resources/utilities/grub-assemble/modules.conf b/resources/utilities/grub-assemble/modules.conf
index 4bc1650..8380c23 100644
--- a/resources/utilities/grub-assemble/modules.conf
+++ b/resources/utilities/grub-assemble/modules.conf
@@ -1,202 +1,200 @@
# Install modules (installed, but not automatically loaded)
-grub_install_modules=" \
-adler32 \
-all_video \
-archelp \
-ata \
-backtrace \
-bitmap \
-bitmap_scale \
-cmp \
-cpio_be \
-cpio \
-cpuid \
-crc64 \
-cs5536 \
-div_test \
-efiemu \
-elf \
-eval \
-exfat \
-extcmd \
-file \
-fshelp \
-gettext \
-gfxmenu \
-gptsync \
-gzio \
-hashsum \
-hexdump \
-http \
-linux16 \
-loadenv \
-lzopio \
-mda_text \
-mmap \
-mpi \
-msdospart \
-multiboot2 \
-multiboot \
-nativedisk \
-net \
-newc \
-ntfscomp \
-ntfs \
-odc \
-offsetio \
-parttool \
-priority_queue \
-procfs \
-progress \
-read \
-relocator \
-scsi \
-search_fs_file \
-search_fs_uuid \
-search_label \
-search \
-setjmp \
-setpci \
-sleep \
-squash4 \
-tar \
-terminfo \
-testload \
-testspeed \
-tftp \
-time \
-trig \
-tr \
-true \
-udf \
-ufs1_be \
-ufs1 \
-ufs2 \
-usbserial_common \
-usbserial_ftdi \
-usbserial_pl2303 \
-usbserial_usbdebug \
-usbtest \
-video_colors \
-videotest_checksum \
-xzio \
-"
+grub_install_modules = \
+ adler32 \
+ all_video \
+ archelp \
+ ata \
+ backtrace \
+ bitmap \
+ bitmap_scale \
+ cmp \
+ cpio_be \
+ cpio \
+ cpuid \
+ crc64 \
+ cs5536 \
+ div_test \
+ efiemu \
+ elf \
+ eval \
+ exfat \
+ extcmd \
+ file \
+ fshelp \
+ gettext \
+ gfxmenu \
+ gptsync \
+ gzio \
+ hashsum \
+ hexdump \
+ http \
+ linux16 \
+ loadenv \
+ lzopio \
+ mda_text \
+ mmap \
+ mpi \
+ msdospart \
+ multiboot2 \
+ multiboot \
+ nativedisk \
+ net \
+ newc \
+ ntfscomp \
+ ntfs \
+ odc \
+ offsetio \
+ parttool \
+ priority_queue \
+ procfs \
+ progress \
+ read \
+ relocator \
+ scsi \
+ search_fs_file \
+ search_fs_uuid \
+ search_label \
+ search \
+ setjmp \
+ setpci \
+ sleep \
+ squash4 \
+ tar \
+ terminfo \
+ testload \
+ testspeed \
+ tftp \
+ time \
+ trig \
+ tr \
+ true \
+ udf \
+ ufs1_be \
+ ufs1 \
+ ufs2 \
+ usbserial_common \
+ usbserial_ftdi \
+ usbserial_pl2303 \
+ usbserial_usbdebug \
+ usbtest \
+ video_colors \
+ videotest_checksum \
+ xzio
# Modules (and always loaded)
-grub_modules=" \
-acpi \
-ahci \
-at_keyboard \
-boot \
-cat \
-cbfs \
-cbls \
-cbtime \
-chain \
-cmosdump \
-cmostest \
-cbmemc \
-crypto \
-cryptodisk \
-configfile \
-datehook \
-date \
-datetime \
-diskfilter \
-disk \
-echo \
-ext2 \
-ehci \
-fat \
-halt \
-help \
-iorw \
-iso9660 \
-keystatus \
-linux \
-loopback \
-ls \
-lsacpi \
-lsmmap \
-lspci \
-luks \
-lvm \
-memdisk \
-minicmd \
-memrw \
-morse \
-normal \
-ohci \
-part_gpt \
-part_msdos \
-password \
-password_pbkdf2 \
-pbkdf2 \
-pcidump \
-pci \
-play \
-probe \
-reboot \
-serial \
-terminal \
-test \
-usb_keyboard \
-usbms \
-uhci \
-gcry_arcfour \
-gcry_blowfish \
-gcry_camellia \
-gcry_cast5 \
-gcry_crc \
-gcry_des \
-gcry_dsa \
-gcry_idea \
-gcry_md4 \
-gcry_md5 \
-gcry_rfc2268 \
-gcry_rijndael \
-gcry_rmd160 \
-gcry_rsa \
-gcry_seed \
-gcry_serpent \
-gcry_sha1 \
-gcry_sha256 \
-gcry_sha512 \
-gcry_tiger \
-gcry_twofish \
-gcry_whirlpool \
-hdparm \
-regexp \
-spkmodem \
-syslinuxcfg \
-usb \
-verify \
-videoinfo \
-videotest \
-xfs \
-btrfs \
-zfs \
-sfs \
-romfs \
-reiserfs \
-nilfs2 \
-minix_be \
-minix3_be \
-minix3 \
-minix2_be \
-minix2 \
-minix \
-jfs \
-hfsplus \
-hfs \
-bfs \
-afs \
-affs \
-gfxmenu \
-gfxterm_background \
-gfxterm_menu \
-jpeg \
-png \
-tga \
-pata \
-"
+grub_modules = \
+ acpi \
+ ahci \
+ at_keyboard \
+ boot \
+ cat \
+ cbfs \
+ cbls \
+ cbtime \
+ chain \
+ cmosdump \
+ cmostest \
+ cbmemc \
+ crypto \
+ cryptodisk \
+ configfile \
+ datehook \
+ date \
+ datetime \
+ diskfilter \
+ disk \
+ echo \
+ ext2 \
+ ehci \
+ fat \
+ halt \
+ help \
+ iorw \
+ iso9660 \
+ keystatus \
+ linux \
+ loopback \
+ ls \
+ lsacpi \
+ lsmmap \
+ lspci \
+ luks \
+ lvm \
+ memdisk \
+ minicmd \
+ memrw \
+ morse \
+ normal \
+ ohci \
+ part_gpt \
+ part_msdos \
+ password \
+ password_pbkdf2 \
+ pbkdf2 \
+ pcidump \
+ pci \
+ play \
+ probe \
+ reboot \
+ serial \
+ terminal \
+ test \
+ usb_keyboard \
+ usbms \
+ uhci \
+ gcry_arcfour \
+ gcry_blowfish \
+ gcry_camellia \
+ gcry_cast5 \
+ gcry_crc \
+ gcry_des \
+ gcry_dsa \
+ gcry_idea \
+ gcry_md4 \
+ gcry_md5 \
+ gcry_rfc2268 \
+ gcry_rijndael \
+ gcry_rmd160 \
+ gcry_rsa \
+ gcry_seed \
+ gcry_serpent \
+ gcry_sha1 \
+ gcry_sha256 \
+ gcry_sha512 \
+ gcry_tiger \
+ gcry_twofish \
+ gcry_whirlpool \
+ hdparm \
+ regexp \
+ spkmodem \
+ syslinuxcfg \
+ usb \
+ verify \
+ videoinfo \
+ videotest \
+ xfs \
+ btrfs \
+ zfs \
+ sfs \
+ romfs \
+ reiserfs \
+ nilfs2 \
+ minix_be \
+ minix3_be \
+ minix3 \
+ minix2_be \
+ minix2 \
+ minix \
+ jfs \
+ hfsplus \
+ hfs \
+ bfs \
+ afs \
+ affs \
+ gfxmenu \
+ gfxterm_background \
+ gfxterm_menu \
+ jpeg \
+ png \
+ tga \
+ pata