Codebase list live-build / 86fdafb
Fix build with memtest86+ 6.00 memtest86+ 6.00-1 (in testing as of this date) adds and changes its available binaries: - /boot/memtest86+x32.bin - /boot/memtest86+x32.efi - /boot/memtest86+x64.bin - /boot/memtest86+x64.efi Future live-build functionality would ideally incorporate these new binaries (x64 for amd64 builds, efi for grub-efi), but in the meantime, this is an MVP update which supports either old memtest86.bin or new memtest86+x32.bin. Ryan Finnie authored 1 year, 5 months ago Arnaud Rebillout committed 1 year, 5 months ago
1 changed file(s) with 17 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
+17
-3
scripts/build/binary_memtest less more
5555 fi
5656
5757 # Checking depends
58 _MEMTEST_BIN="${LB_MEMTEST}"
5859 case "${LB_MEMTEST}" in
5960 memtest86)
6061 Check_package chroot /boot/memtest86.bin memtest86
6162 ;;
6263
6364 memtest86+)
64 Check_package chroot /boot/memtest86+.bin memtest86+
65 Check_package chroot /usr/share/doc/memtest86+/copyright memtest86+
6566 ;;
6667 esac
6768
7071
7172 # Installing depends
7273 Install_packages
74
75 case "${LB_MEMTEST}" in
76 memtest86+)
77 case "${LB_BUILD_WITH_CHROOT}" in
78 true)
79 [ -e "chroot/boot/${LB_MEMTEST}x32.bin" ] && _MEMTEST_BIN="${LB_MEMTEST}x32"
80 ;;
81 false)
82 [ -e "/boot/${LB_MEMTEST}x32.bin" ] && _MEMTEST_BIN="${LB_MEMTEST}x32"
83 ;;
84 esac
85 ;;
86 esac
7387
7488 # Setting destination directory
7589 case "${LB_INITRAMFS}" in
88102 # Installing memtest
89103 case "${LB_BUILD_WITH_CHROOT}" in
90104 true)
91 cp -a chroot/boot/${LB_MEMTEST}.bin "${DESTDIR}"/memtest
105 cp -a "chroot/boot/${_MEMTEST_BIN}.bin" "${DESTDIR}"/memtest
92106 ;;
93107
94108 false)
95 cp -a /boot/${LB_MEMTEST}.bin "${DESTDIR}"/memtest
109 cp -a "/boot/${_MEMTEST_BIN}.bin" "${DESTDIR}"/memtest
96110 ;;
97111 esac
98112