diff options
| author | Klemens Nanni <contact@autoboot.org> | 2015-08-27 18:20:49 +0200 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-08-29 19:02:33 +0100 |
| commit | d406f8beccb29e2eff4b62fae2dca59fa571ca44 (patch) | |
| tree | b8c7c2a1863394279fb5fb96a5c4aebc84986bb4 | |
| parent | 7c25df4580a8fcd763497214ee66c9e2e192a757 (diff) | |
| download | librebootfr-d406f8beccb29e2eff4b62fae2dca59fa571ca44.tar.gz librebootfr-d406f8beccb29e2eff4b62fae2dca59fa571ca44.zip | |
Make memtest86plus be named consistently
Conflicts:
resources/utilities/grub-assemble/gen.sh
| -rw-r--r-- | resources/memtest86plus/patch/COPYING (renamed from resources/memtest86/patch/COPYING) | 0 | ||||
| -rw-r--r-- | resources/memtest86plus/patch/Makefile (renamed from resources/memtest86/patch/Makefile) | 0 | ||||
| -rw-r--r-- | resources/memtest86plus/patch/config.h (renamed from resources/memtest86/patch/config.h) | 0 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/module/memtest86plus | 2 | ||||
| -rwxr-xr-x | resources/scripts/helpers/download/memtest86plus | 10 |
5 files changed, 8 insertions, 4 deletions
diff --git a/resources/memtest86/patch/COPYING b/resources/memtest86plus/patch/COPYING index b3d325f6..b3d325f6 100644 --- a/resources/memtest86/patch/COPYING +++ b/resources/memtest86plus/patch/COPYING diff --git a/resources/memtest86/patch/Makefile b/resources/memtest86plus/patch/Makefile index 1a187b62..1a187b62 100644 --- a/resources/memtest86/patch/Makefile +++ b/resources/memtest86plus/patch/Makefile diff --git a/resources/memtest86/patch/config.h b/resources/memtest86plus/patch/config.h index 10ac525a..10ac525a 100644 --- a/resources/memtest86/patch/config.h +++ b/resources/memtest86plus/patch/config.h diff --git a/resources/scripts/helpers/build/module/memtest86plus b/resources/scripts/helpers/build/module/memtest86plus index ca9c7b7c..f5c8f657 100755 --- a/resources/scripts/helpers/build/module/memtest86plus +++ b/resources/scripts/helpers/build/module/memtest86plus @@ -30,7 +30,7 @@ set -u -e printf "Building MemTest86+\n" -cd "memtest86+-5.01/" +cd "memtest86plus/1" # clean it first make clean diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus index 7d231b98..cd2cb866 100755 --- a/resources/scripts/helpers/download/memtest86plus +++ b/resources/scripts/helpers/download/memtest86plus @@ -4,6 +4,7 @@ # # Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> # Copyright (C) 2015 Joseph Michael Thompson <jmt@josepht.me> +# Copyright (C) 2015 Klemens Nanni <contact@autoboot.org> # # 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 @@ -54,19 +55,22 @@ tar -xzf "memtest86+-5.01.tar.gz" # delete the tar file (no longer needed) rm -f "memtest86+-5.01.tar.gz" +# make direcotory name consistent +mv "memtest86+-5.01" "memtest86plus" + # there are modifications required -cd "memtest86+-5.01/" +cd "memtest86plus/" # Apply necessary patches # ------------------------------------------------------------------------------ # place the right config rm -f "config.h" -cp "../resources/memtest86/patch/config.h" . +cp "../resources/memtest86plus/patch/config.h" . # place the right Makefile rm -f "Makefile" -cp "../resources/memtest86/patch/Makefile" . +cp "../resources/memtest86plus/patch/Makefile" . # (diff them with defaults to see what changed) |