Commit 1da2d027 authored by Gerardo Exequiel Pozzi's avatar Gerardo Exequiel Pozzi
Browse files

[configs/releng] Always install needed pkgs from build.sh


Signed-off-by: default avatarGerardo Exequiel Pozzi <vmlinuz386@gmail.com>
parent f5518de7
...@@ -54,7 +54,7 @@ make_pacman_conf() { ...@@ -54,7 +54,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (airootfs) # Base installation, plus needed packages (airootfs)
make_basefs() { 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}" 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) # Additional packages (airootfs)
...@@ -62,6 +62,11 @@ make_packages() { ...@@ -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 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) # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
make_setup_mkinitcpio() { make_setup_mkinitcpio() {
local _hook local _hook
...@@ -238,6 +243,11 @@ run_once make_pacman_conf ...@@ -238,6 +243,11 @@ run_once make_pacman_conf
for arch in i686 x86_64; do for arch in i686 x86_64; do
run_once make_basefs run_once make_basefs
run_once make_packages 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_setup_mkinitcpio
run_once make_customize_airootfs run_once make_customize_airootfs
done done
......
...@@ -20,9 +20,7 @@ gpm ...@@ -20,9 +20,7 @@ gpm
gptfdisk gptfdisk
grml-zsh-config grml-zsh-config
grub grub
haveged
hdparm hdparm
intel-ucode
ipw2100-fw ipw2100-fw
ipw2200-fw ipw2200-fw
irssi irssi
...@@ -59,4 +57,3 @@ wpa_actiond ...@@ -59,4 +57,3 @@ wpa_actiond
wvdial wvdial
xl2tpd xl2tpd
zd1211-firmware zd1211-firmware
zsh
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment