summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-07-12 16:28:38 +0300
committernl6720 <nl6720@gmail.com>2020-07-12 16:28:38 +0300
commit51170c53520057d0dbef415974fbfeed008c2a6a (patch)
tree0ab2ef69088e44a1be868be71577b53e3233b0c4 /configs
parente2032db4e74c66d3f8bcba97497ccb5fff88df4b (diff)
downloadarchiso32-51170c53520057d0dbef415974fbfeed008c2a6a.tar.xz
Don't hardcode packages in build.sh
Move all required packages to packages.x86_64. Test file availability before copying them.
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/releng/build.sh32
-rw-r--r--configs/releng/packages.x86_647
2 files changed, 24 insertions, 15 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 51401ed..c787d30 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -59,20 +59,16 @@ make_pacman_conf() {
"${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
}
-# Base installation, plus needed packages (airootfs)
+# Base installation (airootfs)
make_basefs() {
if [ -n "${verbose}" ]; then
mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
- mkarchiso -v -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" install
else
mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
- mkarchiso -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" install
fi
}
-# Additional packages (airootfs)
+# Packages (airootfs)
make_packages() {
if [ -n "${verbose}" ]; then
mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
@@ -141,15 +137,21 @@ make_boot() {
# Add other aditional/extra files to ${install_dir}/boot/
make_boot_extra() {
- cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
- 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"
+ if [[ -e "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" ]]; then
+ cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
+ cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \
+ "${work_dir}/iso/${install_dir}/boot/memtest.COPYING"
+ fi
+ if [[ -e "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" ]]; then
+ 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"
+ fi
+ if [[ -e "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" ]]; then
+ 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"
+ fi
}
# Prepare /${install_dir}/boot/syslinux
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index 6330d4a..74a5586 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -1,3 +1,4 @@
+amd-ucode
arch-install-scripts
b43-fwcutter
bind-tools
@@ -22,7 +23,9 @@ gnu-netcat
gpm
gptfdisk
grml-zsh-config
+haveged
hdparm
+intel-ucode
ipw2100-fw
ipw2200-fw
irssi
@@ -39,8 +42,11 @@ man-db
man-pages
mc
mdadm
+memtest86+
+mkinitcpio-nfs-utils
mtools
nano
+nbd
ndisc6
nfs-utils
nilfs-utils
@@ -79,3 +85,4 @@ wpa_supplicant
wvdial
xfsprogs
xl2tpd
+zsh