From 5a8237118f3753685be2eee282dda9ac8e9a5ff4 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Tue, 1 Aug 2017 20:39:26 +0100 Subject: [PATCH 1/7] rules: Added rule for memtext86+ --- rules/memtest86+/default.bash | 31 +++++++++++++++++++++++++++++++ rules/memtest86+/default.bash~ | 14 ++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 rules/memtest86+/default.bash create mode 100644 rules/memtest86+/default.bash~ diff --git a/rules/memtest86+/default.bash b/rules/memtest86+/default.bash new file mode 100644 index 0000000..8b3679f --- /dev/null +++ b/rules/memtest86+/default.bash @@ -0,0 +1,31 @@ +version=\ +( + "5.01" +) + +url=\ +( + "http://www.lsts.pt/glued/memtest86+-$version.tar.gz" +) + +md5=\ +( + "035b85f2edabc9b4a6b0cf6c9c3acf50" +) + +maintainer=\ +( + 'Tiago Sá Marques ' +) + +build() +{ + $cmd_make \ + CC=$cmd_target_cc \ + CXX=$cmd_target_cxx +} + +target_install() +{ + $cmd_cp ./memtest.bin $cfg_dir_rootfs/boot/ +} diff --git a/rules/memtest86+/default.bash~ b/rules/memtest86+/default.bash~ new file mode 100644 index 0000000..f9cb322 --- /dev/null +++ b/rules/memtest86+/default.bash~ @@ -0,0 +1,14 @@ +version=\ +( + "5.01" +) + +url=\ +( + "http://www.memtest.org/download/5.01/memtest86+-$version.tar.gz" +) + +md5=\ +( + "" +) From a6564e1b5ddda093783a9dc419593c2d6ff78520 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Tue, 1 Aug 2017 20:40:12 +0100 Subject: [PATCH 2/7] rules/syslinux/extlinux.conf: Added boot option for memtest. --- rules/syslinux/extlinux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/syslinux/extlinux.conf b/rules/syslinux/extlinux.conf index a7f6aeb..2092f90 100644 --- a/rules/syslinux/extlinux.conf +++ b/rules/syslinux/extlinux.conf @@ -1,3 +1,6 @@ LABEL linux KERNEL /boot/kernel APPEND rootwait root=$cfg_kernel_boot_dev rootfstype=ext2 ro $cfg_kernel_extra_args + +LABEL memtest + LINUX /boot/memtest.bin \ No newline at end of file From d4be30bec62b793954f083df33b25d17ccb99bf5 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Sat, 12 Aug 2017 08:24:17 +0100 Subject: [PATCH 3/7] rules/memtest86+: Added script to start memtest. --- rules/memtest86+/default.bash | 1 + rules/memtest86+/fs/usr/bin/memtester | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 rules/memtest86+/fs/usr/bin/memtester diff --git a/rules/memtest86+/default.bash b/rules/memtest86+/default.bash index 8b3679f..26124b6 100644 --- a/rules/memtest86+/default.bash +++ b/rules/memtest86+/default.bash @@ -28,4 +28,5 @@ build() target_install() { $cmd_cp ./memtest.bin $cfg_dir_rootfs/boot/ + tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f - } diff --git a/rules/memtest86+/fs/usr/bin/memtester b/rules/memtest86+/fs/usr/bin/memtester new file mode 100644 index 0000000..f421d7b --- /dev/null +++ b/rules/memtest86+/fs/usr/bin/memtester @@ -0,0 +1,14 @@ +#! /bin/bash + +echo "Starting memtest in 10 seconds (requires reboot), Ctrl-C to cancel..." +for r in 0 1 2 3 4 5 6 7 8 9; do + printf "." + sleep 1 +done + +mount -o remount,rw / +extlinux -o "memtest" /boot/extlinux/ +mount -o remount,ro / + +echo "* Rebooting now" +reboot From a55b6dbc6a4b2c5422bb662549429f7575e2a252 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Mon, 11 Sep 2017 17:55:47 +0100 Subject: [PATCH 4/7] rules/memtest86+: Removed garbage file. --- rules/memtest86+/default.bash~ | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 rules/memtest86+/default.bash~ diff --git a/rules/memtest86+/default.bash~ b/rules/memtest86+/default.bash~ deleted file mode 100644 index f9cb322..0000000 --- a/rules/memtest86+/default.bash~ +++ /dev/null @@ -1,14 +0,0 @@ -version=\ -( - "5.01" -) - -url=\ -( - "http://www.memtest.org/download/5.01/memtest86+-$version.tar.gz" -) - -md5=\ -( - "" -) From 29298872e81742f9ca49ea90e6a44d38c7e15e83 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Mon, 11 Sep 2017 18:02:15 +0100 Subject: [PATCH 5/7] rules/memtest86+/fs/memtester: Changed shebang. --- rules/memtest86+/fs/usr/bin/memtester | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/memtest86+/fs/usr/bin/memtester b/rules/memtest86+/fs/usr/bin/memtester index f421d7b..e11e2e1 100644 --- a/rules/memtest86+/fs/usr/bin/memtester +++ b/rules/memtest86+/fs/usr/bin/memtester @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh echo "Starting memtest in 10 seconds (requires reboot), Ctrl-C to cancel..." for r in 0 1 2 3 4 5 6 7 8 9; do From dbae4f69f651e5d9a2a1a7cfd472dec81c77cf36 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Tue, 12 Sep 2017 09:46:51 +0100 Subject: [PATCH 6/7] rules/memtest86+/fs: Renamed script. --- rules/memtest86+/fs/usr/bin/{memtester => start-memtest} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rules/memtest86+/fs/usr/bin/{memtester => start-memtest} (100%) diff --git a/rules/memtest86+/fs/usr/bin/memtester b/rules/memtest86+/fs/usr/bin/start-memtest similarity index 100% rename from rules/memtest86+/fs/usr/bin/memtester rename to rules/memtest86+/fs/usr/bin/start-memtest From 7dc03d18c59bbd29bda70e7ececd9a5f420e7f06 Mon Sep 17 00:00:00 2001 From: Tiago Marques Date: Tue, 12 Sep 2017 09:47:28 +0100 Subject: [PATCH 7/7] systems/lctr-a6xx/config: Added memtest86+ package. --- systems/lctr-a6xx/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/lctr-a6xx/config b/systems/lctr-a6xx/config index 83ed805..7031424 100644 --- a/systems/lctr-a6xx/config +++ b/systems/lctr-a6xx/config @@ -4,7 +4,7 @@ cfg_services0='dropbear network storage upgrade syslog escc ptpd setserial' cfg_services1='' cfg_services2='dune' cfg_modules='' -cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2' +cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2 memtest86+' cfg_terminal='ttyS0' cfg_target_linux_kernel='arch/x86/boot/bzImage' cfg_ptpd_master='true'