depclean after any stage that might install a new gcc

GenPi64 · Jan 15, 2023 · 4b84a72 · 4b84a72
1 parent 984bf77
commit 4b84a72
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/subtargets/gentoo-base.json b/subtargets/gentoo-base.json
@@ -10,16 +10,18 @@
     {"name": "update_portage", "deps": ["locale"], "parser": "emerge", "args": ["--verbose --oneshot --jobs --tree --ignore-default-opts sys-apps/portage"]},
     {"name": "install_ccache", "deps": ["update_portage"], "parser": "emerge", "args": ["--verbose --jobs --tree --ignore-default-opts --binpkg-respect-use=y --binpkg-changed-deps=y --usepkg=y ccache"]},
     {"name": "update_world", "deps": ["install_ccache"], "parser": "emerge", "args": ["--verbose --update @world"]},
-    {"name": "rebuild_system", "deps": ["update_world"], "parser": "emerge", "args": ["--verbose --emptytree @system"]},
+    {"name": "depclean_update_world", "deps": ["update_world"], "parser": "emerge", "args": ["--verbose --depclean"]},
+    {"name": "rebuild_system", "deps": ["depclean_update_world"], "parser": "emerge", "args": ["--verbose --emptytree @system"]},
     {"name": "rebuild_world", "deps": ["rebuild_system"], "parser": "emerge", "args": ["--verbose --emptytree @world"]},
-    {"name": "set_profile", "deps": ["rebuild_world"], "parser": "setprofile", "args": [""]},
+    {"name": "depclean_rebuild_world", "deps": ["rebuild_world"], "parser": "emerge", "args": ["--verbose --depclean"]},
+    {"name": "set_profile", "deps": ["depclean_rebuild_world"], "parser": "setprofile", "args": [""]},
     {"name": "emerge_new_profile", "deps": ["set_profile"], "parser": "emerge", "args": ["--verbose --update @world"]},
     {"name": "add_sets", "deps": ["emerge_new_profile"], "parser": "addsets", "args": [""]},
     {"name": "emerge_new_sets", "deps": ["add_sets"], "parser": "emerge", "args": ["--verbose --update @world"]},
     {"name": "ccache_stats", "deps": ["emerge_new_sets"], "parser": "rawcommand", "args": ["ccache -d /var/tmp/ccache --show-stats"]},
     {"name": "unmerge_ccache", "deps": ["ccache_stats"], "parser": "emerge", "args": ["--unmerge ccache"]},
-    {"name": "depclean", "deps": ["unmerge_ccache"], "parser": "emerge", "args": ["--verbose --depclean"]},
-    {"name": "eclean-pkg", "deps": ["depclean"], "parser": "rawcommand", "args": ["eclean-pkg --time-limit=1m"]},
+    {"name": "depclean_new_profile", "deps": ["unmerge_ccache"], "parser": "emerge", "args": ["--verbose --depclean"]},
+    {"name": "eclean-pkg", "deps": ["depclean_new_profile"], "parser": "rawcommand", "args": ["eclean-pkg --time-limit=1m"]},
     {"name": "eclean-dist", "deps": ["eclean-pkg"], "parser": "rawcommand", "args": ["eclean-dist --time-limit=1m"]},
     {"name": "users", "deps": ["eclean-dist"], "parser": "users", "args": [""]},
     {"name": "setup_services", "deps": ["users"], "parser": "setupservices", "args": [""]},