| index : archiso32 | |
| Archlinux32 iso tools | gitolite user |
| summaryrefslogtreecommitdiff |
| -rwxr-xr-x | configs/releng/build.sh | 38 |
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 98f48b0..fd28487 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -154,26 +154,30 @@ make_customize_airootfs() { # Prepare kernel/initramfs ${install_dir}/boot/ make_boot() { mkdir -p "${work_dir}/iso/${install_dir}/boot/x86_64" - cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" - cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" + cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/" + cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/" } # Add other aditional/extra files to ${install_dir}/boot/ make_boot_extra() { if [[ -e "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" ]]; then + # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest" + mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/" cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \ - "${work_dir}/iso/${install_dir}/boot/memtest.COPYING" + "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/" fi if [[ -e "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" ]]; then - cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" - cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/LICENSE" \ - "${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE" + cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/" + mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/" + cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/"* \ + "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/" fi if [[ -e "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" ]]; then - cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" - cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/LICENSE" \ - "${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE" + cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/" + mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/" + cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/"* \ + "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/" fi } @@ -185,10 +189,10 @@ make_syslinux() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}" done - cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux" - cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux" - cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux" - cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux" + cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux/" mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt" gzip -c -9 "${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids" > \ "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz" @@ -235,11 +239,11 @@ make_efiboot() { mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot" mkdir -p "${work_dir}/efiboot/EFI/archiso" - cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/archiso/vmlinuz.efi" - cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" + cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/" + cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/" - cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/archiso/intel_ucode.img" - cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img" + cp "${work_dir}/iso/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/" + cp "${work_dir}/iso/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/" mkdir -p "${work_dir}/efiboot/EFI/boot" cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \ |