From 1da2d027c578b3dcff65ca2748adb5404f44279d Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 21 Dec 2014 18:54:24 -0300 Subject: [configs/releng] Always install needed pkgs from build.sh Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'configs/releng/build.sh') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 8f402db..ad127f0 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -54,7 +54,7 @@ make_pacman_conf() { # Base installation, plus needed packages (airootfs) make_basefs() { setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install + setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "haveged intel-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh" install } # Additional packages (airootfs) @@ -62,6 +62,11 @@ make_packages() { setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install } +# Needed packages for x86_64 EFI boot +make_packages_efi() { + setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "gummiboot prebootloader refind-efi" install +} + # Copy mkinitcpio archiso hooks and build initramfs (airootfs) make_setup_mkinitcpio() { local _hook @@ -238,6 +243,11 @@ run_once make_pacman_conf for arch in i686 x86_64; do run_once make_basefs run_once make_packages +done + +run_once make_packages_efi + +for arch in i686 x86_64; do run_once make_setup_mkinitcpio run_once make_customize_airootfs done -- cgit v1.2.3-54-g00ecf