diff options
| author | nl6720 <nl6720@gmail.com> | 2024-01-18 09:41:31 +0200 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2024-01-18 15:26:59 +0200 |
| commit | 5aac945f76d2bf8bb92ba16c9c1c08fc5cae5ab2 (patch) | |
| tree | 41e20b3b2b1aeb97f275806aae00cf9adc636131 | |
| parent | e04a40d04bd97569008bc72f93faa28029913d82 (diff) | |
| download | archiso-5aac945f76d2bf8bb92ba16c9c1c08fc5cae5ab2.tar.gz archiso-5aac945f76d2bf8bb92ba16c9c1c08fc5cae5ab2.tar.bz2 | |
mkarchiso: update memtest86+ license file location
The licenses package does not ship
`/usr/share/licenses/common/GPL2/license.txt` anymore, which results in:
/usr/share/licenses/common/GPL2/license.txt': No such file or directory
Use its replacement, `/usr/share/licenses/spdx/GPL-2.0-only.txt` instead.
Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/225
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rwxr-xr-x | archiso/mkarchiso | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4c7a050..75cf2d2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,6 +20,8 @@ Deprecated Fixed ----- +- Update the location where ``mkarchiso`` looks for the memtest86+ license file. + Removed ------- diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 53a638c..7a2587e 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -482,7 +482,7 @@ _make_bootmode_bios.syslinux.mbr() { install -d -m 0755 -- "${isofs_dir}/boot/memtest86+/" # rename for PXE: https://wiki.archlinux.org/title/Syslinux#Using_memtest install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/boot/memtest86+/memtest" - install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/common/GPL2/license.txt" "${isofs_dir}/boot/memtest86+/" + install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt" "${isofs_dir}/boot/memtest86+/LICENSE" fi _msg_info "Done! SYSLINUX set up for BIOS booting from a disk successfully." } @@ -796,7 +796,7 @@ _make_bootmode_uefi-x64.grub.esp() { if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.efi" ]]; then install -d -m 0755 -- "${isofs_dir}/boot/memtest86+/" install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.efi" "${isofs_dir}/boot/memtest86+/memtest.efi" - install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/common/GPL2/license.txt" "${isofs_dir}/boot/memtest86+/" + install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/spdx/GPL-2.0-only.txt" "${isofs_dir}/boot/memtest86+/LICENSE" fi _msg_info "Done! GRUB set up for UEFI booting successfully." |