diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@gmail.com> | 2014-12-21 18:54:24 -0300 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@gmail.com> | 2014-12-21 18:54:24 -0300 |
| commit | 1da2d027c578b3dcff65ca2748adb5404f44279d (patch) | |
| tree | 8a43cdd54c74bc17ddebef572bc0943e79b00572 | |
| parent | f5518de7325206a4ccdc74026cfbc35d8adeed37 (diff) | |
| download | archiso32-1da2d027c578b3dcff65ca2748adb5404f44279d.tar.xz | |
[configs/releng] Always install needed pkgs from build.sh
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
| -rwxr-xr-x | configs/releng/build.sh | 12 | ||||
| -rw-r--r-- | configs/releng/packages.both | 3 | ||||
| -rw-r--r-- | configs/releng/packages.x86_64 | 3 |
3 files changed, 11 insertions, 7 deletions
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 diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 7c6d080..5cb60d7 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -20,9 +20,7 @@ gpm gptfdisk grml-zsh-config grub -haveged hdparm -intel-ucode ipw2100-fw ipw2200-fw irssi @@ -59,4 +57,3 @@ wpa_actiond wvdial xl2tpd zd1211-firmware -zsh diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 407ead2..e69de29 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,3 +0,0 @@ -gummiboot -prebootloader -refind-efi |