From 1eae9886333032a6454fc7815d06ec9ce1c0dcaf Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 14 Aug 2024 19:40:14 +0200
Subject: [PATCH] Final fixes for bootstrap

---
 gentoo-2024.8/gentoo.txt | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/gentoo-2024.8/gentoo.txt b/gentoo-2024.8/gentoo.txt
index d9475c1..465a781 100644
--- a/gentoo-2024.8/gentoo.txt
+++ b/gentoo-2024.8/gentoo.txt
@@ -270,7 +270,11 @@ PORTAGE_CONFIGROOT=/gentoo.cfg ROOT=/gentoo SYSROOT=/gentoo emerge -O1n \
     \
     dev-libs/openssl \
     net-misc/wget \
-    app-misc/ca-certificates
+    app-misc/ca-certificates \
+    \
+    app-crypt/libmd \
+    dev-libs/libbsd \
+    sys-apps/shadow
 
 # Set up final system
 mkdir -p /gentoo/etc/portage
@@ -283,6 +287,12 @@ rsync -aP /var/db/repos/ /gentoo/var/db/repos
 
 # From here you just chroot into /gentoo, and run "emerge -e @world", untangling dependencies until it works
 # This is an example:
+cd /gentoo
+mount -t proc proc proc
+mount -t sysfs sysfs sys
+mount -t devtmpfs devtmpfs dev
+mount -t devpts devpts dev/pts
+env -i TERM="$TERM" chroot . /bin/bash -l
 
 # TODO: How does catalyst stage1 resolve these?
 emerge -O1n \
@@ -294,25 +304,20 @@ emerge -O1n \
     app-alternatives/tar \
     app-alternatives/yacc
 
-USE="-* build $(portageq envvar BOOTSTRAP_USE)" emerge -O1n \
-    sys-apps/gentoo-functions \
-    app-portage/elt-patches \
-    app-crypt/libmd \
-    dev-libs/libbsd \
-    dev-util/pkgconf \
-    sys-apps/shadow
-
 # Finish installing stage1 dependencies
 pkgs_build="$(python3 -c 'import portage
 print(*portage.util.stack_lists([portage.util.grabfile_package("%s/packages.build" % x) for x in portage.settings.profiles], incremental=1))')"
 USE="-* build $(portageq envvar BOOTSTRAP_USE)" CHOST="$(gcc -dumpmachine)" \
-    emerge -1Dn --with-bdeps=n $pkgs_build
+    emerge -1Dn $pkgs_build
+emerge -c
 
-# Change CHOST and build OpenMP support
-emerge -O1 sys-devel/binutils
+# Change CHOST and build OpenMP support (stage2-ish)
+emerge -1 sys-devel/binutils
+emerge -o sys-devel/gcc
 EXTRA_ECONF=--disable-bootstrap emerge -O1 sys-devel/gcc
-emerge -O1 $(portageq expand_virtual / virtual/libc)
+emerge -1 $(portageq expand_virtual / virtual/libc)
+emerge -1 dev-lang/perl
 
-# Rebuild everything
+# Rebuild everything (stage3)
 USE='-filecaps -http2' emerge -e @system
 emerge -c