diff options
| author | Erich Eckner <git@eckner.net> | 2018-08-28 19:57:12 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-08-28 19:57:12 +0200 |
| commit | d4351606808ef8bac8b7bbb7bb8f9784e8cd6e58 (patch) | |
| tree | 28067759ce8883be12917917594c7a39ada43a77 /configs/releng/build.sh | |
| parent | 387dbd452a61596b5b70f8815f3352104cce56f7 (diff) | |
| parent | e23dbb4516ffff7e022daf05e8adae4e793cac7f (diff) | |
| download | archiso32-d4351606808ef8bac8b7bbb7bb8f9784e8cd6e58.tar.xz | |
Merge remote-tracking branch 'upstream/master' into dual-bootdual-v39
Diffstat (limited to 'configs/releng/build.sh')
| -rwxr-xr-x | configs/releng/build.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 062ff73..56ed307 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -66,7 +66,7 @@ make_pacman_conf() { # Base installation, plus needed packages (airootfs) make_basefs() { setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" init - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "haveged intel-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh" install + setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install } # Additional packages (airootfs) @@ -134,6 +134,8 @@ make_boot_extra() { cp ${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING cp ${work_dir}/${arch}/airootfs/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img cp ${work_dir}/${arch}/airootfs/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE + cp ${work_dir}/${arch}/airootfs/boot/amd-ucode.img ${work_dir}/iso/${install_dir}/boot/amd_ucode.img + cp ${work_dir}/${arch}/airootfs/usr/share/licenses/amd-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE } # Prepare /${install_dir}/boot/syslinux @@ -198,6 +200,7 @@ make_efiboot() { 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/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 mkdir -p ${work_dir}/efiboot/EFI/boot cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi |