summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2019-07-26 21:21:14 +0200
committerFlorian Pritz <bluewind@xinu.at>2019-07-26 21:25:01 +0200
commit487e5c1fdba3907f47dfddd1a1ef165aeeb9b467 (patch)
tree76c654671038e870ef2b17d39e281fb55b462ed4
parenta4dee33e8b3935ff55fa1ab14bf80ba9aeeefd12 (diff)
downloadarchiso-config-487e5c1fdba3907f47dfddd1a1ef165aeeb9b467.tar.gz
archiso-config-487e5c1fdba3907f47dfddd1a1ef165aeeb9b467.tar.xz
Upstream updatesHEADmaster
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rwxr-xr-xbuild.sh9
-rw-r--r--packages.x86_643
2 files changed, 8 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index f5524e8..659e8de 100755
--- a/build.sh
+++ b/build.sh
@@ -61,7 +61,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (airootfs)
make_basefs() {
mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
- mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
+ mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
}
# Additional packages (airootfs)
@@ -120,6 +120,8 @@ make_boot_extra() {
cp ${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING
cp ${work_dir}/x86_64/airootfs/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img
cp ${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE
+ cp ${work_dir}/x86_64/airootfs/boot/amd-ucode.img ${work_dir}/iso/${install_dir}/boot/amd_ucode.img
+ cp ${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE
}
# Prepare /${install_dir}/boot/syslinux
@@ -166,9 +168,9 @@ make_efi() {
${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf
# EFI Shell 2.0 for UEFI 2.3+
- curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/master/ShellBinPkg/UefiShell/X64/Shell.efi
+ curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/ShellBinPkg/UefiShell/X64/Shell.efi
# EFI Shell 1.0 for non UEFI 2.3+
- curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://raw.githubusercontent.com/tianocore/edk2/master/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
+ curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
}
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -185,6 +187,7 @@ make_efiboot() {
cp ${work_dir}/iso/${install_dir}/boot/x86_64/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}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
diff --git a/packages.x86_64 b/packages.x86_64
index ed3d41d..79ca2c6 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -34,6 +34,7 @@ htop
ipw2100-fw
ipw2200-fw
irssi
+iwd
lftp
linux-atm
lsof
@@ -76,7 +77,7 @@ vpnc
wget
wireless-regdb
wireless_tools
-wpa_actiond
+wpa_supplicant
wvdial
xl2tpd
zsh