summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-08-29 14:26:16 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-08-29 14:26:16 (EDT)
commit762983788b9c1fb93f423227522e333b553c3bf0 (patch)
tree6b3637f75780682e33a377d0da840495f426f6f8
parentd406f8beccb29e2eff4b62fae2dca59fa571ca44 (diff)
downloadlibreboot-762983788b9c1fb93f423227522e333b553c3bf0.zip
libreboot-762983788b9c1fb93f423227522e333b553c3bf0.tar.gz
libreboot-762983788b9c1fb93f423227522e333b553c3bf0.tar.bz2
really make memtest86plus naming consistent
-rw-r--r--.gitignore2
-rwxr-xr-xresources/scripts/helpers/build/clean/memtest86plus2
-rwxr-xr-xresources/scripts/helpers/download/memtest86plus4
-rwxr-xr-xresources/utilities/grub-assemble/gen.sh2
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index ebc9027..23ed715 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
/coreboot/
/flashrom/
/grub/
-/memtest86+-5.01/
+/memtest86plus/
/bin/
/release/
/resources/utilities/ich9deblob/*.rom
diff --git a/resources/scripts/helpers/build/clean/memtest86plus b/resources/scripts/helpers/build/clean/memtest86plus
index ad25915..6f3db44 100755
--- a/resources/scripts/helpers/build/clean/memtest86plus
+++ b/resources/scripts/helpers/build/clean/memtest86plus
@@ -29,7 +29,7 @@ set -u -e
printf "Cleaning the previous build of MemTest86+\n"
-cd "memtest86+-5.01"/
+cd "memtest86plus"/
make clean
diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus
index cd2cb86..950607c 100755
--- a/resources/scripts/helpers/download/memtest86plus
+++ b/resources/scripts/helpers/download/memtest86plus
@@ -33,7 +33,7 @@ set -u -e
printf "Downloading MemTest86+\n"
-rm -Rf "memtest86+-5.01/"
+rm -Rf "memtest86plus/"
# Get latest memtest86+:
# ------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ tar -xzf "memtest86+-5.01.tar.gz"
rm -f "memtest86+-5.01.tar.gz"
# make direcotory name consistent
-mv "memtest86+-5.01" "memtest86plus"
+mv "memtest86+-5.01/" "memtest86plus/"
# there are modifications required
cd "memtest86plus/"
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh
index 3dfed2c..95a4ce0 100755
--- a/resources/utilities/grub-assemble/gen.sh
+++ b/resources/utilities/grub-assemble/gen.sh
@@ -50,7 +50,7 @@ then
--modules="${grub_modules}" \
--install-modules="${grub_install_modules}" \
/boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
- /memtest="../../../memtest86+-5.01/memtest" \
+ /memtest="../../../memtest86plus/memtest" \
$(./grub_memdisk_keymap)
else
printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}"