diff options
| -rwxr-xr-x | build-release | 1 | ||||
| -rwxr-xr-x | builddeps | 5 | ||||
| -rwxr-xr-x | builddeps-grubinvaders | 40 | ||||
| -rwxr-xr-x | cleandeps | 9 | ||||
| -rwxr-xr-x | deps-trisquel | 5 | ||||
| -rw-r--r-- | docs/install/index.html | 2 | ||||
| -rw-r--r-- | docs/release.html | 2 | ||||
| -rwxr-xr-x | getall | 5 | ||||
| -rwxr-xr-x | getgrubinvaders | 66 | ||||
| -rw-r--r-- | resources/grub/config/menuentries/txtmode.cfg | 4 | ||||
| -rw-r--r-- | resources/grubinvaders/patch/compile.sh.patch | 4 | ||||
| -rw-r--r-- | resources/grubinvaders/patch/diff.patch | 45 | ||||
| -rwxr-xr-x | resources/utilities/grub-assemble/gen.sh | 1 |
13 files changed, 2 insertions, 187 deletions
diff --git a/build-release b/build-release index d95ee51..5e5f323 100755 --- a/build-release +++ b/build-release @@ -354,7 +354,6 @@ rm -f libreboot_src/getbucts rm -f libreboot_src/getcb rm -f libreboot_src/getflashrom rm -f libreboot_src/getgrub -rm -f libreboot_src/getgrubinvaders rm -f libreboot_src/getmt86 # ich9deblob: there are certain files in there @@ -50,11 +50,6 @@ fi ./builddeps-flashrom -# Build GRUB Invaders -# -------------------------------------------------------------------- - -./builddeps-grubinvaders - # Build i945-pwm # -------------------------------------------------------------------- diff --git a/builddeps-grubinvaders b/builddeps-grubinvaders deleted file mode 100755 index e888d67..0000000 --- a/builddeps-grubinvaders +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# builddeps-grubinvaders script: builds grub invaders source code -# -# 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 - -# This script is used by the main "builddeps" script in libreboot src/meta archives. -# The reason it is seperated here is so that GRUB Invaders can be built separately aswell. - -# Build GRUB Invaders payload (for GRUB) -# -------------------------------------------------------------------- - -cd grubinvaders - -# clean it first -./clean.sh - -# build grub invaders -./compile.sh - -# done. go back to main directory -cd ../ - -# ------------------- DONE ---------------------- @@ -99,15 +99,6 @@ rm -f flashrom_lenovobios_macronix # done. go back to main directory cd ../ -# clean grubinvaders -# ---------------------------------------------------------- - -cd grubinvaders/ - -./clean.sh - -cd ../ - # clean i945-pwm utility # -------------------------------------------------------------------- diff --git a/deps-trisquel b/deps-trisquel index 29b8975..227affa 100755 --- a/deps-trisquel +++ b/deps-trisquel @@ -59,11 +59,6 @@ fi apt-get -y install build-essential -# GRUB Invaders build dependencies -# ------------------------------------------------------------ - -apt-get -y install build-essential - # i945-pwm build dependencies # ------------------------------------------------------------ diff --git a/docs/install/index.html b/docs/install/index.html index b544909..eda8bfa 100644 --- a/docs/install/index.html +++ b/docs/install/index.html @@ -112,7 +112,7 @@ </p> <p> - _txtmode images come with a working MemTest86+ and GRUB Invaders, both of which require text-mode. + _txtmode images come with MemTest86+. _vesafb images are recommended in most cases. </p> diff --git a/docs/release.html b/docs/release.html index 54e817d..6165191 100644 --- a/docs/release.html +++ b/docs/release.html @@ -400,7 +400,7 @@ Other tasks (non-critical, but still important) </h2> <ul> - <li>Memtest86+ and grubinvaders in the ROM images are currently broken. investigate</li> + <li>Memtest86+ is currently broken. investigate</li> <li>linux 3.18 broke acpi brightness on i945. Libreboot reverted to legacy brightness for now. Look into why it broke on 3.18 (do a git bisect).</li> <li> @@ -45,9 +45,4 @@ set -u -e -v ./getmt86 -# Download GRUB Invaders -# --------------------------------------------------- - -./getgrubinvaders - # ------------------- DONE ---------------------- diff --git a/getgrubinvaders b/getgrubinvaders deleted file mode 100755 index 3dab56d..0000000 --- a/getgrubinvaders +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -# getmt86: Downloads gRUB Invaders and patches it -# -# 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 - -# Get the last version of GRUB invaders used, apply patches, build it. - -# Remove the old version that may exist -# ---------------------------------------------------------------------------------- - -rm -rf grubinvaders - -# Get latest memtest86+: -# ---------------------------------------------------------------------------------- - -# download it using wget -wget http://www.erikyyy.de/invaders/invaders-1.0.0.tar.gz - -# extract it -tar -xf "invaders-1.0.0.tar.gz" - -# delete the tar file (no longer needed) -rm -f "invaders-1.0.0.tar.gz" - -# rename directory (for consistency with script names) -mv invaders grubinvaders - -# there are modifications required -cd grubinvaders/ - -# Apply necessary patches -# --------------------------------------------------------------------------------- - -# Apply patch mentioned on http://www.coreboot.org/GRUB_invaders -cp ../resources/grubinvaders/patch/diff.patch . -cp ../resources/grubinvaders/patch/compile.sh.patch . -patch < diff.patch -patch compile.sh < compile.sh.patch - -# delete the copy of the patch (no longer needed) -rm -f diff.patch -rm -f compile.sh.patch - -# we're done -cd ../ - -# ------------------- DONE ---------------------- - - diff --git a/resources/grub/config/menuentries/txtmode.cfg b/resources/grub/config/menuentries/txtmode.cfg index ded51bd..63166e0 100644 --- a/resources/grub/config/menuentries/txtmode.cfg +++ b/resources/grub/config/menuentries/txtmode.cfg @@ -1,7 +1,3 @@ -menuentry 'Load GRUB Invaders' { - set root='memdisk' - chainloader /invaders.exec -} menuentry 'Load MemTest86+' { set root='memdisk' chainloader /memtest diff --git a/resources/grubinvaders/patch/compile.sh.patch b/resources/grubinvaders/patch/compile.sh.patch deleted file mode 100644 index 0e7c3b8..0000000 --- a/resources/grubinvaders/patch/compile.sh.patch +++ /dev/null @@ -1,4 +0,0 @@ -6c6 -< CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror" ---- -> CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror -fno-stack-protector" diff --git a/resources/grubinvaders/patch/diff.patch b/resources/grubinvaders/patch/diff.patch deleted file mode 100644 index 2867dea..0000000 --- a/resources/grubinvaders/patch/diff.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ur invaders/clean.sh invaders-fixed/clean.sh ---- invaders/clean.sh 2001-05-21 22:43:13.000000000 +0200 -+++ invaders-fixed/clean.sh 2009-04-13 17:03:14.000000000 +0200 -@@ -2,4 +2,4 @@ - - set -e - set -v --rm -f *.o *~ invaders.exec -+rm -f *.o *~ invaders.exec invaders -diff -ur invaders/compile.sh invaders-fixed/compile.sh ---- invaders/compile.sh 2001-05-21 22:26:46.000000000 +0200 -+++ invaders-fixed/compile.sh 2009-04-13 16:59:44.000000000 +0200 -@@ -4,7 +4,7 @@ - set -v - - CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror" --LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000" -+LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none" - gcc $CFLAGS -c keyboard.c - gcc $CFLAGS -c delay.c - gcc $CFLAGS -c common.c -diff -ur invaders/video.c invaders-fixed/video.c ---- invaders/video.c 2001-05-13 15:56:33.000000000 +0200 -+++ invaders-fixed/video.c 2009-04-13 17:01:22.000000000 +0200 -@@ -36,7 +36,7 @@ - video_putchar(x+1,y,hextab[hex&15]); - }; - --void video_putstring(int32 x, int32 y, uint8 *str) -+void video_putstring(int32 x, int32 y, char *str) - { - while (*str) video_putchar(x++,y,*(str++)); - }; -diff -ur invaders/video.h invaders-fixed/video.h ---- invaders/video.h 2001-05-13 15:56:33.000000000 +0200 -+++ invaders-fixed/video.h 2009-04-13 17:01:05.000000000 +0200 -@@ -8,7 +8,7 @@ - void video_putchar(int32 x, int32 y, uint8 code); - void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code); - void video_puthex8(int32 x, int32 y, uint8 hex); --void video_putstring(int32 x, int32 y, uint8 *str); -+void video_putstring(int32 x, int32 y, char *str); - - // immediate effect - void video_update(); diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh index 6090e1e..b908a6a 100755 --- a/resources/utilities/grub-assemble/gen.sh +++ b/resources/utilities/grub-assemble/gen.sh @@ -49,7 +49,6 @@ then --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) else echo "grub-assemble gen.sh: invalid mode '$1'" |