From 47e11125e4672fc3448caefa6728439160daedd3 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Tue, 28 Jul 2020 11:38:04 +0200
Subject: Copy files more generically

configs/*:
Copy all files that do not need a rename generically (not specifying a destination file name).
Do not rename vmlinuz-linux to vmlinuz or vmlinuz.efi (as this serves no purpose and makes the scripts more
complicated).
Do not rename microcode (i.e. {amd,intel}-ucode.img) when copying them and change all boot loader configuration files
that assume a renamed microcode image.
Add note and link to Arch Linux wiki to state why memtest.bin is renamed to memtest.
Copy license files for {amd,intel}-ucode and memtest more generically by placing them into subdirectories with the same
name as the package (to circumenvent overwriting one other).

Closes #33
---
 configs/baseline/build.sh              | 2 +-
 configs/baseline/syslinux/syslinux.cfg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'configs/baseline')

diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 6001cd8..0649d4b 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -77,7 +77,7 @@ make_setup_mkinitcpio() {
 make_boot() {
     mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
     cp "${work_dir}/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img"
-    cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz"
+    cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/"
 }
 
 # Prepare /${install_dir}/boot/syslinux
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 4f7ce4d..e31bb8c 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -7,6 +7,6 @@ TIMEOUT 30
 
 LABEL arch
 MENU LABEL Arch Linux
-LINUX boot/%ARCH%/vmlinuz
+LINUX boot/%ARCH%/vmlinuz-linux
 INITRD boot/%ARCH%/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-- 
cgit v1.2.3-70-g09d2