From d406f8beccb29e2eff4b62fae2dca59fa571ca44 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Thu, 27 Aug 2015 18:20:49 +0200 Subject: Make memtest86plus be named consistently Conflicts: resources/utilities/grub-assemble/gen.sh --- resources/scripts/helpers/build/module/memtest86plus | 2 +- resources/scripts/helpers/download/memtest86plus | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'resources/scripts/helpers') 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 # Copyright (C) 2015 Joseph Michael Thompson +# Copyright (C) 2015 Klemens Nanni # # 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) -- cgit v1.2.3-70-g09d2