diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
| commit | e2b054c74fd0c1852f94d9af80f44297125742f4 (patch) | |
| tree | f7c978cdf3458758f838d60edbb6a54f20f34ea9 /configs/profile/build.sh | |
| parent | 04d8551cb78ff9a691fd4ead51e4f8f27c5b851e (diff) | |
| parent | 17803d20925a72d31dbdbacf56cb0a7d2db6efcb (diff) | |
Merge branch 'rebrand/releng'
Conflicts:
Makefile
configs/profile/build.sh
configs/profile/mkinitcpio.conf
configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch
configs/profile/root-image/root/customize_root_image.sh
configs/profile/root-image/root/install.txt
configs/profile/syslinux/splash.png
Diffstat (limited to 'configs/profile/build.sh')
| -rwxr-xr-x | configs/profile/build.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 5b07b7b..7d9fdac 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -80,8 +80,6 @@ make_setup_mkinitcpio() { make_customize_root_image() { cp -af ${script_path}/root-image ${work_dir}/${arch} - patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh } @@ -127,7 +125,10 @@ make_isolinux() { # Prepare /EFI make_efi() { mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/ + + cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi mkdir -p ${work_dir}/iso/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ @@ -158,7 +159,10 @@ make_efiboot() { cp ${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img ${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.img mkdir -p ${work_dir}/efiboot/EFI/boot - cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/ + + cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi mkdir -p ${work_dir}/efiboot/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ |