diff options
| author | Erich Eckner <git@eckner.net> | 2018-08-28 19:46:32 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-08-28 19:46:32 +0200 |
| commit | c4525c58caed448463cd8e8452ecde9c8d14c3a9 (patch) | |
| tree | 343b53de2c40a25eb592dea4d444a31d9d4f74e7 /configs/releng/build.sh | |
| parent | b6abbd288fbe1dc67266be9f2ce94bcac1d49aed (diff) | |
| parent | e23dbb4516ffff7e022daf05e8adae4e793cac7f (diff) | |
| download | archiso32-c4525c58caed448463cd8e8452ecde9c8d14c3a9.tar.xz | |
Merge remote-tracking branch 'upstream/master'i686-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 0ccc09c..01271c8 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) @@ -130,6 +130,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 @@ -192,6 +194,7 @@ make_efiboot() { cp ${work_dir}/iso/${install_dir}/boot/i686/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}/i686/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/efiboot/EFI/boot/ |