Merge tier-1 to the toplevel

Now we just have a minimal base, and what was tier-1 is now
just the default content.

We still do capture the previous conception of "tier-x" in
`packages-recommended-minimal.txt` so that people starting
from scratch can install using that.

Signed-off-by: Colin Walters <walters@verbum.org>

Containerfile

@@ -3,26 +3,26 @@
 # This is a local reference by default because we haven't shipped this image yet.
 FROM localhost/fedora-bootc:base as rootfs
 # Drop our package sets into /usr/share/doc, so that other things can parse it
-COPY packages-*.txt /usr/share/doc/fedora-bootc/
+COPY packages*.txt /usr/share/doc/fedora-bootc/
 # Overlay our defaults
-COPY tier-1/usr/ /usr/
+COPY usr/ /usr/
 RUN <<EORUN
 set -euo pipefail
 dnf_args=()
 echo "Loading packages-excluded"
-for x in $(grep -E -v '^#' /usr/share/doc/fedora-bootc/packages-excluded.txt); do
+basedir=/usr/share/doc/fedora-bootc/
+for x in $(grep -E -v '^#' ${basedir}/packages-excluded.txt); do
   dnf_args+=(--exclude ${x})
 done
-echo "Loading packages-recommended"
-base_pkgs=$(grep -E -v '^#' /usr/share/doc/fedora-bootc/packages-recommended.txt)
+echo "Loading packages"
+package_files=(${basedir}/packages-recommended-minimal.txt ${basedir}/packages.txt)
 pkgfile_for_arch=/usr/share/doc/fedora-bootc/packages-$(arch).txt
-arch_pkgs=
 if test -f ${pkgfile_for_arch}; then
   echo "Loading ${pkgfile_for_arch}"
-  arch_pkgs=$(grep -E -v '^#' ${pkgfile_for_arch})
+  package_files+=(${pkgfile_for_arch})
 fi
-
-dnf -y ${dnf_args[@]} install $base_pkgs $arch_pkgs
+base_pkgs=$(grep -hE -v '^#' ${package_files[@]})
+dnf -y ${dnf_args[@]} install $base_pkgs
 
 # Ensure we regenerate the initramfs with new content
 # https://docs.fedoraproject.org/en-US/bootc/initramfs/