From 2f1f5c31b2474a5d994a9775423d4eb7669b6872 Mon Sep 17 00:00:00 2001
From: Marcos Mello <marcosfrm@gmail.com>
Date: Mon, 6 Apr 2020 15:35:45 -0300
Subject: [PATCH 1/2] Drop packages pulled in by base metapackage

mkarchiso init installs them.
---
 packages | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/packages b/packages
index c2f3c66..89f8915 100644
--- a/packages
+++ b/packages
@@ -2,17 +2,14 @@ alsa-utils
 arch-install-scripts
 atop
 b43-fwcutter
-bash
 bash-completion
 borg
 btrfs-progs
 busybox
-bzip2
 cabextract
 chntpw
 cifs-utils
 clonezilla
-coreutils
 cpio
 crda
 darkhttpd
@@ -32,35 +29,24 @@ ethtool
 exfat-utils
 f2fs-tools
 featherpad
-file
-filesystem
-findutils
 firefox-esr-bin
 flashrom
 fsarchiver
-gawk
-gcc-libs
 geany
-gettext
 git
-glibc
 gnu-netcat
 gparted
 gpm
 gptfdisk
-grep
 grml-zsh-config
 growpart
 grsync
 grub
-gzip
 hdparm
 htop
 iftop
 iotop
 iperf3
-iproute2
-iputils
 ipw2100-fw
 ipw2200-fw
 irssi
@@ -68,7 +54,6 @@ jfsutils
 joe
 keepassxc
 lftp
-licenses
 linux-atm
 linux-firmware
 linux-lts
@@ -105,17 +90,13 @@ openconnect
 openssh
 openvpn
 p7zip
-pacman
 par2cmdline
 partclone
 parted
 partimage
 pavucontrol
-pciutils
 ppp
 pptpclient
-procps-ng
-psmisc
 pulseaudio-alsa
 pv
 rdesktop
@@ -127,18 +108,13 @@ rsync
 ruby
 screen
 sdparm
-sed
 sg3_utils
-shadow
 smartmontools
 squashfs-tools
 strace
 stress
 sudo
 sysstat
-systemd
-systemd-sysvcompat
-tar
 tcpdump
 testdisk
 tigervnc
@@ -150,7 +126,6 @@ udpcast
 unzip
 usb_modeswitch
 usbutils
-util-linux
 vi
 vim-minimal
 vpnc
@@ -178,7 +153,6 @@ xorg-apps
 xorg-drivers
 xorg-server
 xorg-xinit
-xz
 yubikey-manager
 yubikey-personalization-gui
 zerofree

From 3f3405049b9d32261987e5b47b50efc5e6cdfe43 Mon Sep 17 00:00:00 2001
From: Marcos Mello <marcosfrm@gmail.com>
Date: Mon, 6 Apr 2020 15:49:14 -0300
Subject: [PATCH 2/2] Move hardcoded package list from build.sh to packages
 file

---
 build.sh | 3 +--
 packages | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index e2cae74..891b071 100755
--- a/build.sh
+++ b/build.sh
@@ -79,10 +79,9 @@ make_pacman_conf() {
     sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g; s|^Architecture\s*=.*$|Architecture = ${arch}|" ${script_path}/pacman.conf > ${work_dir}/pacman.conf
 }
 
-# Base installation, plus needed packages (airootfs)
+# Base installation: base metapackage + syslinux (airootfs)
 make_basefs() {
     setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
-    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -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)
diff --git a/packages b/packages
index 89f8915..4979ae3 100644
--- a/packages
+++ b/packages
@@ -1,4 +1,5 @@
 alsa-utils
+amd-ucode
 arch-install-scripts
 atop
 b43-fwcutter
@@ -24,6 +25,7 @@ dnsutils
 dosfstools
 dstat
 dvd+rw-tools
+efitools
 elinks
 ethtool
 exfat-utils
@@ -42,9 +44,11 @@ grml-zsh-config
 growpart
 grsync
 grub
+haveged
 hdparm
 htop
 iftop
+intel-ucode
 iotop
 iperf3
 ipw2100-fw
@@ -67,12 +71,15 @@ man-db
 man-pages
 mc
 mdadm
+memtest86+
 memtester
 mkinitcpio
+mkinitcpio-nfs-utils
 mlocate
 ms-sys
 mtools
 nano
+nbd
 ncdu
 ndisc6
 netctl
@@ -158,3 +165,4 @@ yubikey-personalization-gui
 zerofree
 zile
 zip
+zsh