diff options
| author | Martin Whitaker <mageia@martin.whitaker.me.uk> | 2020-11-29 21:43:23 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin.whitaker.me.uk> | 2020-11-29 23:00:20 +0000 |
| commit | b8c24deef6124de4542c1e940658b13f27f5a62c (patch) | |
| tree | 9ab6244d37a3a1db95bc6a1e10844bc9de4ba7f3 | |
| parent | 927106a2deb42618b2626dd2cd22df9a9f810a45 (diff) | |
| download | drakclassic-config-b8c24deef6124de4542c1e940658b13f27f5a62c.tar drakclassic-config-b8c24deef6124de4542c1e940658b13f27f5a62c.tar.gz drakclassic-config-b8c24deef6124de4542c1e940658b13f27f5a62c.tar.bz2 drakclassic-config-b8c24deef6124de4542c1e940658b13f27f5a62c.tar.xz drakclassic-config-b8c24deef6124de4542c1e940658b13f27f5a62c.zip | |
pcmemtest can now be copied directly from the repository.
| -rwxr-xr-x | build_all.sh | 1 | ||||
| -rwxr-xr-x | build_one.sh | 1 | ||||
| -rw-r--r-- | config/build.cfg | 2 | ||||
| -rwxr-xr-x | update_pcmemtest_files.sh | 25 |
4 files changed, 1 insertions, 28 deletions
diff --git a/build_all.sh b/build_all.sh index a14ec26..d95287d 100755 --- a/build_all.sh +++ b/build_all.sh @@ -12,7 +12,6 @@ case $(hostname) in esac ./update_bootloader_files.sh -./update_pcmemtest_files.sh for arch in $archs; do isoname=$distro-$release-$arch $sudo drakclassic --clean --all --define arch=$arch diff --git a/build_one.sh b/build_one.sh index 079e9ba..4454ed6 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 drakclassic $* else diff --git a/config/build.cfg b/config/build.cfg index 16a6640..5e8c954 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -69,7 +69,7 @@ my $config = { 'dosutils' => 'files/dosutils', "isolinux/$arch2/all.rdz" => "boot/all.rdz", "isolinux/$arch2/vmlinuz" => "boot/vmlinuz", - 'isolinux/pcmemtest' => "boot/pcmemtest", + 'isolinux/memtest' => "boot/pcmemtest", 'doc' => "files/$arch/doc", 'install/extra' => "files/$arch/install/extra", 'install/stage2/mdkinst.sqfs' => "files/$arch/install/stage2/mdkinst.sqfs", 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 |