From f6913af653ae106866f45ab3629c747b9a13fb1c Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 29 Nov 2020 23:03:16 +0000
Subject: pcmemtest can now becopied directly from the repository.

---
 build_all.sh              |  1 -
 build_one.sh              |  1 -
 config/build.cfg          |  2 +-
 update_pcmemtest_files.sh | 25 -------------------------
 4 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100755 update_pcmemtest_files.sh

diff --git a/build_all.sh b/build_all.sh
index 331ab04..860dea6 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -18,7 +18,6 @@ case $(hostname) in
 esac
 
 ./update_bootloader_files.sh
-./update_pcmemtest_files.sh
 for arch in $archs; do
   for desktop in ${desktops[$arch]}; do
     isoname=$distro-$release-Live-$desktop-$arch
diff --git a/build_one.sh b/build_one.sh
index 6e32fbb..dff302d 100755
--- a/build_one.sh
+++ b/build_one.sh
@@ -5,7 +5,6 @@ case $(hostname) in
 esac
 
 ./update_bootloader_files.sh
-./update_pcmemtest_files.sh
 if [ $# -gt 0 ] ; then
   $sudo draklive2 $*
 else
diff --git a/config/build.cfg b/config/build.cfg
index 2d4b8ae..19ec919 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -387,7 +387,7 @@ my $config = {
         copy_from_repo => [
             'autorun.inf'        => 'files/autorun.inf',
             'dosutils'           => 'files/dosutils',
-            'isolinux/pcmemtest' => "boot/pcmemtest",
+            'isolinux/memtest'   => "boot/pcmemtest",
         ],
         checksums           => [ qw(md5 sha2 sha3) ],
     },
diff --git a/update_pcmemtest_files.sh b/update_pcmemtest_files.sh
deleted file mode 100755
index 6ebc987..0000000
--- a/update_pcmemtest_files.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-repository=$(grep repository config/settings.cfg | sed s/repository=//)
-echo "Unpacking pcmemtest file in $repository"
-
-case $(hostname) in
-  *.mageia.org)  sudo="sudo -u bcd";;
-esac
-
-archs="i586 x86_64"
-for arch in $archs; do
-  path=`ls -1v $repository/$arch/media/core/{release,updates}/pcmemtest*.rpm 2> /dev/null | tail -1`
-  if [ -z $path ] ; then
-    echo "ERROR: couldn't find $arch pcmemtest RPM in $repository."
-    exit 1
-  else
-    echo "Unpacking $arch pcmemtest file in repository."
-    rpm2cpio $path | cpio -idm --quiet
-    if [ $? -ne 0 ] ; then
-      echo "ERROR: failed to extract files from archive."
-      exit 1
-    fi
-  fi
-  $sudo cp -u boot/pcmemtest $repository/$arch/isolinux/pcmemtest
-  rm -r boot etc usr
-done
-- 
cgit v1.2.1