diff --git a/build/build-image.sh b/build/build-image.sh index 875cc86..ea84ef7 100755 --- a/build/build-image.sh +++ b/build/build-image.sh @@ -43,13 +43,13 @@ eselect profile set default/linux/amd64/23.0/musl/hardened/selinux # STOP TELLING ME ABOUT THE NEWS eselect news read new > /dev/null +# Copy in host configs +cp -r /build/include-host/* / + # squashfs-tools needed for image mksquashfs for image generation # gentoolkit needed for euse for setting use flags # btrfs-progs needed for mkfs.btrfs for generating usr partition fs -emerge --quiet squashfs-tools gentoolkit btrfs-progs - -# Copy in host configs -cp -r /build/include-host/* / +emerge --quiet @halogenos-host # We have to ensure use.disable contains at least one flag # Otherwise euse -D will disable all global use flags @@ -64,7 +64,7 @@ export ROOT="$DISTPATH" #emerge -j "$NPROC" --quiet --update --deep --newuse @world # Emerge all packages -emerge -j "$NPROC" --quiet @halogenos +#emerge -j "$NPROC" --quiet @halogenos-image emerge --unmerge portage emerge gentoolkit diff --git a/build/include-host/etc/portage/sets/halogenos-host b/build/include-host/etc/portage/sets/halogenos-host new file mode 100644 index 0000000..a5a24ae --- /dev/null +++ b/build/include-host/etc/portage/sets/halogenos-host @@ -0,0 +1,4 @@ +app-portage/gentoolkit +sys-apps/busybox +sys-fs/btrfs-progs +sys-fs/squashfs-tools \ No newline at end of file diff --git a/build/include-host/etc/portage/sets/halogenos b/build/include-host/etc/portage/sets/halogenos-image similarity index 71% rename from build/include-host/etc/portage/sets/halogenos rename to build/include-host/etc/portage/sets/halogenos-image index 8c39310..41f2330 100644 --- a/build/include-host/etc/portage/sets/halogenos +++ b/build/include-host/etc/portage/sets/halogenos-image @@ -1,9 +1,11 @@ app-containers/distrobox app-containers/docker +app-containers/slirp4netns app-crypt/gnupg app-shells/bash sys-apps/bubblewrap sys-apps/flatpak sys-apps/fwupd +sys-apps/shadow sys-libs/musl virtual/tmpfiles \ No newline at end of file