summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD24
2 files changed, 17 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 42053609d236..a40da97a82d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = memtest86-efi
pkgdesc = A free, thorough, stand alone memory test as an EFI application
- pkgver = 7.5.b1001
+ pkgver = 7.5.1001
pkgrel = 1
url = http://www.memtest86.com
install = memtest86-efi.install
@@ -8,18 +8,18 @@ pkgbase = memtest86-efi
arch = x86_64
license = GPL2
license = custom:PassMark
- makedepends = libarchive
+ makedepends = p7zip
optdepends = efibootmgr: to add a new EFI boot entry
optdepends = grub: to add MemTest86 entry in GRUB2 menu
backup = etc/memtest86-efi/memtest86-efi.conf
- source = memtest86-7.5.b1001.iso.tar.gz::http://www.memtest86.com/downloads/memtest86-iso.tar.gz
+ source = https://www.passmark.com/ftp/memtest86-usb-7.5.1001.tar.gz
source = memtest86-efi
source = memtest86-efi.conf
source = grub.conf
source = systemd-boot.conf
source = memtest86-efi-update.hook
source = memtest86-efi-remove.hook
- sha512sums = 200b955147b10c5fc084f3413f710bb4563ae293fad45144a0178cdada92f3043e61f5b9a2534a5a9991ca646e91a31ee54258d8b9c86f98b7d36ff571861c84
+ sha512sums = 10232a1c3a589407e06257f7fff14a28b524d3998bc712317d25081e3e67f87549bf36cb9e79f50ee9676e32b050d38bbfa74d2f536899d358bcd05edea3b97a
sha512sums = 001151346736fc901dac0f5f2b07557b049f2e2cf2a7de0aae7019e7fde126e4e6cf291328dea920d5af45b21b08366b6465b8a8aa453f7af0fd760ced3952aa
sha512sums = 947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8
sha512sums = df883042a5bad262e74b69e2ca0cd8c9c21a4e4eb5132aed0041a07050b5ab7f280e94681ffe106e6de547d00b621fd2a019cf5b669e00876a32e637687395f8
diff --git a/PKGBUILD b/PKGBUILD
index 47e6111dad0c..b55a8222103f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,25 @@
_pkgbasename=memtest86
pkgname=$_pkgbasename-efi
-_shortver=7.5
-pkgver=$_shortver.b1001
+pkgver=7.5.1001
pkgrel=1
pkgdesc="A free, thorough, stand alone memory test as an EFI application"
arch=('i686' 'x86_64')
url="http://www.memtest86.com"
license=('GPL2' 'custom:PassMark')
-makedepends=('libarchive')
+makedepends=('p7zip')
optdepends=('efibootmgr: to add a new EFI boot entry'
'grub: to add MemTest86 entry in GRUB2 menu')
backup=(etc/$pkgname/$pkgname.conf)
install=$pkgname.install
-source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_pkgbasename-iso.tar.gz"
+source=("https://www.passmark.com/ftp/$_pkgbasename-usb-$pkgver.tar.gz"
"memtest86-efi"
"memtest86-efi.conf"
"grub.conf"
"systemd-boot.conf"
"memtest86-efi-update.hook"
"memtest86-efi-remove.hook")
-sha512sums=('200b955147b10c5fc084f3413f710bb4563ae293fad45144a0178cdada92f3043e61f5b9a2534a5a9991ca646e91a31ee54258d8b9c86f98b7d36ff571861c84'
+sha512sums=('10232a1c3a589407e06257f7fff14a28b524d3998bc712317d25081e3e67f87549bf36cb9e79f50ee9676e32b050d38bbfa74d2f536899d358bcd05edea3b97a'
'001151346736fc901dac0f5f2b07557b049f2e2cf2a7de0aae7019e7fde126e4e6cf291328dea920d5af45b21b08366b6465b8a8aa453f7af0fd760ced3952aa'
'947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8'
'df883042a5bad262e74b69e2ca0cd8c9c21a4e4eb5132aed0041a07050b5ab7f280e94681ffe106e6de547d00b621fd2a019cf5b669e00876a32e637687395f8'
@@ -31,16 +30,19 @@ sha512sums=('200b955147b10c5fc084f3413f710bb4563ae293fad45144a0178cdada92f3043e6
prepare() {
msg2 "Extract ISO..."
- bsdtar -xf "Memtest86-$_shortver.iso"
+ 7z x -y "$srcdir/memtest86-usb.img" > /dev/null
+ 7z x -y "$srcdir/EFI System Partition.img" -oc:"$srcdir/$pkgname-$pkgver" > /dev/null
}
package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
msg2 "Move MemTest86 stuff in share directory..."
- [[ "$CARCH" == "i686" ]] && install -Dvm755 "$srcdir/EFI/BOOT/BOOTIA32.EFI" "$pkgdir/usr/share/$pkgname/bootia32.efi"
- [[ "$CARCH" == "x86_64" ]] && install -Dvm755 "$srcdir/EFI/BOOT/BOOTX64.EFI" "$pkgdir/usr/share/$pkgname/bootx64.efi"
- install -Dvm644 "$srcdir/EFI/BOOT/MT86.PNG" "$pkgdir/usr/share/$pkgname/mt86.png"
- install -Dvm644 "$srcdir/EFI/BOOT/UNIFONT.BIN" "$pkgdir/usr/share/$pkgname/unifont.bin"
- install -Dvm644 "$srcdir/LICENSE.RTF" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf"
+ [[ "$CARCH" == "i686" ]] && install -Dvm755 "EFI/BOOT/BOOTIA32.efi" "$pkgdir/usr/share/$pkgname/bootia32.efi"
+ [[ "$CARCH" == "x86_64" ]] && install -Dvm755 "EFI/BOOT/BOOTX64.efi" "$pkgdir/usr/share/$pkgname/bootx64.efi"
+ install -Dvm644 "EFI/BOOT/mt86.png" "$pkgdir/usr/share/$pkgname/mt86.png"
+ install -Dvm644 "EFI/BOOT/unifont.bin" "$pkgdir/usr/share/$pkgname/unifont.bin"
+ install -Dvm644 "license.rtf" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf"
msg2 "Install AUR provided script..."
install -Dvm755 "$srcdir/memtest86-efi" "$pkgdir/usr/bin/memtest86-efi"