diff options
Diffstat (limited to 'profiles/default')
45 files changed, 6 insertions, 748 deletions
diff --git a/profiles/default/linux/ia64/17.0/deprecated b/profiles/default/linux/ia64/17.0/deprecated deleted file mode 100644 index db515b7e21ae..000000000000 --- a/profiles/default/linux/ia64/17.0/deprecated +++ /dev/null @@ -1,104 +0,0 @@ -default/linux/ia64/23.0/split-usr - -A profile upgrade to version 23.0 is available for your architecture. -The new 23.0 profiles enable some toolchain hardening features and -performance enhancements by default, and standardize settings. -You can find the list of changes on the wiki tracking page [1]. - -Upgrade instructions - -Note 1: If you have manually changed your CHOST to a value different from -what the stages and profiles set, you may have to do that in the future too. -In that case you should know what you are doing, hopefully; please read the -instructions with a critical eye then. - -Note 2: In case you are already familiar with binary packages, you should be -able to add "--getbinpkg" to the emerge calls to speed things up. -The use of binary packages is completely optional though, and also not -as much tested as the source-based upgrade path yet. - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - glibc older than 2.36 and musl older than 1.2.4 is not supported anymore. - -2. If you are still using one of the long-deprecated amd64 17.0 profiles - (other than x32 or musl), then first complete the migration to the - corresponding 17.1 profile. Instructions can be found at [3]. - -3. If you are currently using systemd in a split-usr configuration, then first - complete the migration to the corresponding merged-usr profile of the - same profile version. Details on how to do this can be found in the news - item [4]. - If you are currently using openrc, migrate to 23.0 first, keeping your disk - layout. If you want to move from split-usr to merged-usr, do that afterwards. - -4. Run "emerge --info" and note down the value of the CHOST variable. - -5. Edit /etc/portage/make.conf; if there is a line defining the CHOST variable, - remove it. Also delete all lines defining CHOST_... variables. - -6. Select the 23.0 profile corresponding to your current profile, either using - "eselect profile" or by manually setting the profile symlink. - Note that old profiles are by default split-usr and the 23.0 profiles by - default merged-usr. Do NOT change directory scheme now, since this will - mess up your system! - Instead, make sure that the new profile has the same property: for example, - OLD default/linux/amd64/17.1 - ==> NEW default/linux/amd64/23.0/split-usr - (added "split-usr") - OLD default/linux/amd64/17.1/systemd/merged-usr - ==> NEW default/linux/amd64/23.0/systemd - (removed "merged-usr") - A detailed table of the upgrade paths can be found at [5]. Please consult it. - In some cases (hppa, x86) the table will tell you to pick between two choices. - What you need should be obvious from your *old* CHOST value (from step 4). - -7. Delete the contents of your binary package cache at ${PKGDIR} - rm -r /var/cache/binpkgs/* - -8. In the file or directory /etc/portage/binrepos.conf (if existing), update - the URI in all configuration such that they point to 23.0 profile binhost - directories. The exact paths can be found in the table at [5], too. - -9. Rebuild or reinstall from binary (if available) the following packages in - this order, with the same version as already active: - emerge --ask --oneshot sys-devel/binutils - (you may have to run binutils-config and re-select your binutils now) - emerge --ask --oneshot sys-devel/gcc - (IMPORTANT: If this command wants to rebuild glibc first, do *not* let it do - that; instead, abort and try again with --nodeps added to the command line.) - (you may have to run gcc-config and re-select your gcc now) - and the C library, i.e. for glibc-based systems - emerge --ask --oneshot sys-libs/glibc - or for musl-based systems - emerge --ask --oneshot sys-libs/musl - -10. Re-run "emerge --info" and check if CHOST has changed compared to step 4. - -If the CHOST has NOT changed, skip to step 13 (env-update). Otherwise, - -11. Recheck with binutils-config and gcc-config that valid installed versions - of binutils and gcc are selected. - -12. Check /etc/env.d, /etc/env.d/binutils, and /etc/env.d/gcc for files that - refer to the *OLD* CHOST value, and remove them. - Examples how to do this can be found in the similar procedure at [6]. - -13. Run env-update && source /etc/profile - -14. Re-emerge libtool: - emerge --ask --oneshot libtool - -15. Just for safety, delete the contents of your binary package cache at - ${PKGDIR} again: - rm -r /var/cache/binpkgs/* - -16. Rebuild world: - emerge --ask --emptytree @world - -[1] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition -[2] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_timeline -[3] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html -[4] https://www.gentoo.org/support/news-items/2022-12-01-systemd-usrmerge.html -[5] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_update_table -[6] https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable#Verifying_things_work diff --git a/profiles/default/linux/ia64/17.0/desktop/deprecated b/profiles/default/linux/ia64/17.0/desktop/deprecated deleted file mode 100644 index 79f71ff58857..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/deprecated +++ /dev/null @@ -1,104 +0,0 @@ -default/linux/ia64/23.0/split-usr/desktop - -A profile upgrade to version 23.0 is available for your architecture. -The new 23.0 profiles enable some toolchain hardening features and -performance enhancements by default, and standardize settings. -You can find the list of changes on the wiki tracking page [1]. - -Upgrade instructions - -Note 1: If you have manually changed your CHOST to a value different from -what the stages and profiles set, you may have to do that in the future too. -In that case you should know what you are doing, hopefully; please read the -instructions with a critical eye then. - -Note 2: In case you are already familiar with binary packages, you should be -able to add "--getbinpkg" to the emerge calls to speed things up. -The use of binary packages is completely optional though, and also not -as much tested as the source-based upgrade path yet. - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - glibc older than 2.36 and musl older than 1.2.4 is not supported anymore. - -2. If you are still using one of the long-deprecated amd64 17.0 profiles - (other than x32 or musl), then first complete the migration to the - corresponding 17.1 profile. Instructions can be found at [3]. - -3. If you are currently using systemd in a split-usr configuration, then first - complete the migration to the corresponding merged-usr profile of the - same profile version. Details on how to do this can be found in the news - item [4]. - If you are currently using openrc, migrate to 23.0 first, keeping your disk - layout. If you want to move from split-usr to merged-usr, do that afterwards. - -4. Run "emerge --info" and note down the value of the CHOST variable. - -5. Edit /etc/portage/make.conf; if there is a line defining the CHOST variable, - remove it. Also delete all lines defining CHOST_... variables. - -6. Select the 23.0 profile corresponding to your current profile, either using - "eselect profile" or by manually setting the profile symlink. - Note that old profiles are by default split-usr and the 23.0 profiles by - default merged-usr. Do NOT change directory scheme now, since this will - mess up your system! - Instead, make sure that the new profile has the same property: for example, - OLD default/linux/amd64/17.1 - ==> NEW default/linux/amd64/23.0/split-usr - (added "split-usr") - OLD default/linux/amd64/17.1/systemd/merged-usr - ==> NEW default/linux/amd64/23.0/systemd - (removed "merged-usr") - A detailed table of the upgrade paths can be found at [5]. Please consult it. - In some cases (hppa, x86) the table will tell you to pick between two choices. - What you need should be obvious from your *old* CHOST value (from step 4). - -7. Delete the contents of your binary package cache at ${PKGDIR} - rm -r /var/cache/binpkgs/* - -8. In the file or directory /etc/portage/binrepos.conf (if existing), update - the URI in all configuration such that they point to 23.0 profile binhost - directories. The exact paths can be found in the table at [5], too. - -9. Rebuild or reinstall from binary (if available) the following packages in - this order, with the same version as already active: - emerge --ask --oneshot sys-devel/binutils - (you may have to run binutils-config and re-select your binutils now) - emerge --ask --oneshot sys-devel/gcc - (IMPORTANT: If this command wants to rebuild glibc first, do *not* let it do - that; instead, abort and try again with --nodeps added to the command line.) - (you may have to run gcc-config and re-select your gcc now) - and the C library, i.e. for glibc-based systems - emerge --ask --oneshot sys-libs/glibc - or for musl-based systems - emerge --ask --oneshot sys-libs/musl - -10. Re-run "emerge --info" and check if CHOST has changed compared to step 4. - -If the CHOST has NOT changed, skip to step 13 (env-update). Otherwise, - -11. Recheck with binutils-config and gcc-config that valid installed versions - of binutils and gcc are selected. - -12. Check /etc/env.d, /etc/env.d/binutils, and /etc/env.d/gcc for files that - refer to the *OLD* CHOST value, and remove them. - Examples how to do this can be found in the similar procedure at [6]. - -13. Run env-update && source /etc/profile - -14. Re-emerge libtool: - emerge --ask --oneshot libtool - -15. Just for safety, delete the contents of your binary package cache at - ${PKGDIR} again: - rm -r /var/cache/binpkgs/* - -16. Rebuild world: - emerge --ask --emptytree @world - -[1] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition -[2] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_timeline -[3] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html -[4] https://www.gentoo.org/support/news-items/2022-12-01-systemd-usrmerge.html -[5] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_update_table -[6] https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable#Verifying_things_work diff --git a/profiles/default/linux/ia64/17.0/desktop/eapi b/profiles/default/linux/ia64/17.0/desktop/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/deprecated b/profiles/default/linux/ia64/17.0/desktop/gnome/deprecated deleted file mode 100644 index 0eb67ae8064e..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/deprecated +++ /dev/null @@ -1,104 +0,0 @@ -default/linux/ia64/23.0/split-usr/desktop/gnome - -A profile upgrade to version 23.0 is available for your architecture. -The new 23.0 profiles enable some toolchain hardening features and -performance enhancements by default, and standardize settings. -You can find the list of changes on the wiki tracking page [1]. - -Upgrade instructions - -Note 1: If you have manually changed your CHOST to a value different from -what the stages and profiles set, you may have to do that in the future too. -In that case you should know what you are doing, hopefully; please read the -instructions with a critical eye then. - -Note 2: In case you are already familiar with binary packages, you should be -able to add "--getbinpkg" to the emerge calls to speed things up. -The use of binary packages is completely optional though, and also not -as much tested as the source-based upgrade path yet. - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - glibc older than 2.36 and musl older than 1.2.4 is not supported anymore. - -2. If you are still using one of the long-deprecated amd64 17.0 profiles - (other than x32 or musl), then first complete the migration to the - corresponding 17.1 profile. Instructions can be found at [3]. - -3. If you are currently using systemd in a split-usr configuration, then first - complete the migration to the corresponding merged-usr profile of the - same profile version. Details on how to do this can be found in the news - item [4]. - If you are currently using openrc, migrate to 23.0 first, keeping your disk - layout. If you want to move from split-usr to merged-usr, do that afterwards. - -4. Run "emerge --info" and note down the value of the CHOST variable. - -5. Edit /etc/portage/make.conf; if there is a line defining the CHOST variable, - remove it. Also delete all lines defining CHOST_... variables. - -6. Select the 23.0 profile corresponding to your current profile, either using - "eselect profile" or by manually setting the profile symlink. - Note that old profiles are by default split-usr and the 23.0 profiles by - default merged-usr. Do NOT change directory scheme now, since this will - mess up your system! - Instead, make sure that the new profile has the same property: for example, - OLD default/linux/amd64/17.1 - ==> NEW default/linux/amd64/23.0/split-usr - (added "split-usr") - OLD default/linux/amd64/17.1/systemd/merged-usr - ==> NEW default/linux/amd64/23.0/systemd - (removed "merged-usr") - A detailed table of the upgrade paths can be found at [5]. Please consult it. - In some cases (hppa, x86) the table will tell you to pick between two choices. - What you need should be obvious from your *old* CHOST value (from step 4). - -7. Delete the contents of your binary package cache at ${PKGDIR} - rm -r /var/cache/binpkgs/* - -8. In the file or directory /etc/portage/binrepos.conf (if existing), update - the URI in all configuration such that they point to 23.0 profile binhost - directories. The exact paths can be found in the table at [5], too. - -9. Rebuild or reinstall from binary (if available) the following packages in - this order, with the same version as already active: - emerge --ask --oneshot sys-devel/binutils - (you may have to run binutils-config and re-select your binutils now) - emerge --ask --oneshot sys-devel/gcc - (IMPORTANT: If this command wants to rebuild glibc first, do *not* let it do - that; instead, abort and try again with --nodeps added to the command line.) - (you may have to run gcc-config and re-select your gcc now) - and the C library, i.e. for glibc-based systems - emerge --ask --oneshot sys-libs/glibc - or for musl-based systems - emerge --ask --oneshot sys-libs/musl - -10. Re-run "emerge --info" and check if CHOST has changed compared to step 4. - -If the CHOST has NOT changed, skip to step 13 (env-update). Otherwise, - -11. Recheck with binutils-config and gcc-config that valid installed versions - of binutils and gcc are selected. - -12. Check /etc/env.d, /etc/env.d/binutils, and /etc/env.d/gcc for files that - refer to the *OLD* CHOST value, and remove them. - Examples how to do this can be found in the similar procedure at [6]. - -13. Run env-update && source /etc/profile - -14. Re-emerge libtool: - emerge --ask --oneshot libtool - -15. Just for safety, delete the contents of your binary package cache at - ${PKGDIR} again: - rm -r /var/cache/binpkgs/* - -16. Rebuild world: - emerge --ask --emptytree @world - -[1] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition -[2] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_timeline -[3] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html -[4] https://www.gentoo.org/support/news-items/2022-12-01-systemd-usrmerge.html -[5] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_update_table -[6] https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable#Verifying_things_work diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/eapi b/profiles/default/linux/ia64/17.0/desktop/gnome/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/parent deleted file mode 100644 index 6589a0e01478..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../targets/desktop/gnome diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated deleted file mode 100644 index e91b42445e45..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated +++ /dev/null @@ -1,33 +0,0 @@ -default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr - -As warned about previously in a news item, systemd-255 has dropped -support for split-usr systems. All Gentoo systems running systemd will -need to be migrated to merged-usr. - -Migrating to merged-usr will move all data from /bin, /sbin, and /lib -into the /usr/bin and /usr/lib directories. The directories in / are -replaced with symlinks. - -To facilitate this, a new set of sub-profiles has been created, and a -script is available to perform the actual migration. - -To migrate a system to merged-usr, follow this procedure: - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - -2. Install sys-apps/merge-usr. - -3. Run "merge-usr --dryrun" as root to check for conflicts. These will - appear with the word ERROR at the start of the line. - -4. Resolve any conflicts. This may involve deleting duplicate files. If - in doubt, seek support in a Gentoo support channel. - -5. Run the merge-usr script from a root shell. Avoid running it via sudo - directly to avoid locking yourself out if an unexpected error occurs. - -6. Switch to a merged-usr profile. - -7. Run emerge with the --newuse or --changed-use option to rebuild - any packages that have a "split-usr" USE flag. diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/eapi b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/deprecated b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/deprecated deleted file mode 100644 index b367562fd18c..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/deprecated +++ /dev/null @@ -1,104 +0,0 @@ -default/linux/ia64/23.0/desktop/gnome/systemd - -A profile upgrade to version 23.0 is available for your architecture. -The new 23.0 profiles enable some toolchain hardening features and -performance enhancements by default, and standardize settings. -You can find the list of changes on the wiki tracking page [1]. - -Upgrade instructions - -Note 1: If you have manually changed your CHOST to a value different from -what the stages and profiles set, you may have to do that in the future too. -In that case you should know what you are doing, hopefully; please read the -instructions with a critical eye then. - -Note 2: In case you are already familiar with binary packages, you should be -able to add "--getbinpkg" to the emerge calls to speed things up. -The use of binary packages is completely optional though, and also not -as much tested as the source-based upgrade path yet. - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - glibc older than 2.36 and musl older than 1.2.4 is not supported anymore. - -2. If you are still using one of the long-deprecated amd64 17.0 profiles - (other than x32 or musl), then first complete the migration to the - corresponding 17.1 profile. Instructions can be found at [3]. - -3. If you are currently using systemd in a split-usr configuration, then first - complete the migration to the corresponding merged-usr profile of the - same profile version. Details on how to do this can be found in the news - item [4]. - If you are currently using openrc, migrate to 23.0 first, keeping your disk - layout. If you want to move from split-usr to merged-usr, do that afterwards. - -4. Run "emerge --info" and note down the value of the CHOST variable. - -5. Edit /etc/portage/make.conf; if there is a line defining the CHOST variable, - remove it. Also delete all lines defining CHOST_... variables. - -6. Select the 23.0 profile corresponding to your current profile, either using - "eselect profile" or by manually setting the profile symlink. - Note that old profiles are by default split-usr and the 23.0 profiles by - default merged-usr. Do NOT change directory scheme now, since this will - mess up your system! - Instead, make sure that the new profile has the same property: for example, - OLD default/linux/amd64/17.1 - ==> NEW default/linux/amd64/23.0/split-usr - (added "split-usr") - OLD default/linux/amd64/17.1/systemd/merged-usr - ==> NEW default/linux/amd64/23.0/systemd - (removed "merged-usr") - A detailed table of the upgrade paths can be found at [5]. Please consult it. - In some cases (hppa, x86) the table will tell you to pick between two choices. - What you need should be obvious from your *old* CHOST value (from step 4). - -7. Delete the contents of your binary package cache at ${PKGDIR} - rm -r /var/cache/binpkgs/* - -8. In the file or directory /etc/portage/binrepos.conf (if existing), update - the URI in all configuration such that they point to 23.0 profile binhost - directories. The exact paths can be found in the table at [5], too. - -9. Rebuild or reinstall from binary (if available) the following packages in - this order, with the same version as already active: - emerge --ask --oneshot sys-devel/binutils - (you may have to run binutils-config and re-select your binutils now) - emerge --ask --oneshot sys-devel/gcc - (IMPORTANT: If this command wants to rebuild glibc first, do *not* let it do - that; instead, abort and try again with --nodeps added to the command line.) - (you may have to run gcc-config and re-select your gcc now) - and the C library, i.e. for glibc-based systems - emerge --ask --oneshot sys-libs/glibc - or for musl-based systems - emerge --ask --oneshot sys-libs/musl - -10. Re-run "emerge --info" and check if CHOST has changed compared to step 4. - -If the CHOST has NOT changed, skip to step 13 (env-update). Otherwise, - -11. Recheck with binutils-config and gcc-config that valid installed versions - of binutils and gcc are selected. - -12. Check /etc/env.d, /etc/env.d/binutils, and /etc/env.d/gcc for files that - refer to the *OLD* CHOST value, and remove them. - Examples how to do this can be found in the similar procedure at [6]. - -13. Run env-update && source /etc/profile - -14. Re-emerge libtool: - emerge --ask --oneshot libtool - -15. Just for safety, delete the contents of your binary package cache at - ${PKGDIR} again: - rm -r /var/cache/binpkgs/* - -16. Rebuild world: - emerge --ask --emptytree @world - -[1] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition -[2] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_timeline -[3] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html -[4] https://www.gentoo.org/support/news-items/2022-12-01-systemd-usrmerge.html -[5] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_update_table -[6] https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable#Verifying_things_work diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent deleted file mode 100644 index 1b7f7eef0a7e..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../../features/merged-usr diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent deleted file mode 100644 index f5c1ae438de4..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/ia64/17.0/desktop/parent b/profiles/default/linux/ia64/17.0/desktop/parent deleted file mode 100644 index ad6c5e126fbb..000000000000 --- a/profiles/default/linux/ia64/17.0/desktop/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/desktop diff --git a/profiles/default/linux/ia64/17.0/developer/deprecated b/profiles/default/linux/ia64/17.0/developer/deprecated deleted file mode 100644 index db515b7e21ae..000000000000 --- a/profiles/default/linux/ia64/17.0/developer/deprecated +++ /dev/null @@ -1,104 +0,0 @@ -default/linux/ia64/23.0/split-usr - -A profile upgrade to version 23.0 is available for your architecture. -The new 23.0 profiles enable some toolchain hardening features and -performance enhancements by default, and standardize settings. -You can find the list of changes on the wiki tracking page [1]. - -Upgrade instructions - -Note 1: If you have manually changed your CHOST to a value different from -what the stages and profiles set, you may have to do that in the future too. -In that case you should know what you are doing, hopefully; please read the -instructions with a critical eye then. - -Note 2: In case you are already familiar with binary packages, you should be -able to add "--getbinpkg" to the emerge calls to speed things up. -The use of binary packages is completely optional though, and also not -as much tested as the source-based upgrade path yet. - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - glibc older than 2.36 and musl older than 1.2.4 is not supported anymore. - -2. If you are still using one of the long-deprecated amd64 17.0 profiles - (other than x32 or musl), then first complete the migration to the - corresponding 17.1 profile. Instructions can be found at [3]. - -3. If you are currently using systemd in a split-usr configuration, then first - complete the migration to the corresponding merged-usr profile of the - same profile version. Details on how to do this can be found in the news - item [4]. - If you are currently using openrc, migrate to 23.0 first, keeping your disk - layout. If you want to move from split-usr to merged-usr, do that afterwards. - -4. Run "emerge --info" and note down the value of the CHOST variable. - -5. Edit /etc/portage/make.conf; if there is a line defining the CHOST variable, - remove it. Also delete all lines defining CHOST_... variables. - -6. Select the 23.0 profile corresponding to your current profile, either using - "eselect profile" or by manually setting the profile symlink. - Note that old profiles are by default split-usr and the 23.0 profiles by - default merged-usr. Do NOT change directory scheme now, since this will - mess up your system! - Instead, make sure that the new profile has the same property: for example, - OLD default/linux/amd64/17.1 - ==> NEW default/linux/amd64/23.0/split-usr - (added "split-usr") - OLD default/linux/amd64/17.1/systemd/merged-usr - ==> NEW default/linux/amd64/23.0/systemd - (removed "merged-usr") - A detailed table of the upgrade paths can be found at [5]. Please consult it. - In some cases (hppa, x86) the table will tell you to pick between two choices. - What you need should be obvious from your *old* CHOST value (from step 4). - -7. Delete the contents of your binary package cache at ${PKGDIR} - rm -r /var/cache/binpkgs/* - -8. In the file or directory /etc/portage/binrepos.conf (if existing), update - the URI in all configuration such that they point to 23.0 profile binhost - directories. The exact paths can be found in the table at [5], too. - -9. Rebuild or reinstall from binary (if available) the following packages in - this order, with the same version as already active: - emerge --ask --oneshot sys-devel/binutils - (you may have to run binutils-config and re-select your binutils now) - emerge --ask --oneshot sys-devel/gcc - (IMPORTANT: If this command wants to rebuild glibc first, do *not* let it do - that; instead, abort and try again with --nodeps added to the command line.) - (you may have to run gcc-config and re-select your gcc now) - and the C library, i.e. for glibc-based systems - emerge --ask --oneshot sys-libs/glibc - or for musl-based systems - emerge --ask --oneshot sys-libs/musl - -10. Re-run "emerge --info" and check if CHOST has changed compared to step 4. - -If the CHOST has NOT changed, skip to step 13 (env-update). Otherwise, - -11. Recheck with binutils-config and gcc-config that valid installed versions - of binutils and gcc are selected. - -12. Check /etc/env.d, /etc/env.d/binutils, and /etc/env.d/gcc for files that - refer to the *OLD* CHOST value, and remove them. - Examples how to do this can be found in the similar procedure at [6]. - -13. Run env-update && source /etc/profile - -14. Re-emerge libtool: - emerge --ask --oneshot libtool - -15. Just for safety, delete the contents of your binary package cache at - ${PKGDIR} again: - rm -r /var/cache/binpkgs/* - -16. Rebuild world: - emerge --ask --emptytree @world - -[1] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition -[2] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_timeline -[3] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html -[4] https://www.gentoo.org/support/news-items/2022-12-01-systemd-usrmerge.html -[5] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_update_table -[6] https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable#Verifying_things_work diff --git a/profiles/default/linux/ia64/17.0/developer/eapi b/profiles/default/linux/ia64/17.0/developer/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/developer/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/developer/parent b/profiles/default/linux/ia64/17.0/developer/parent deleted file mode 100644 index 4c893748ce71..000000000000 --- a/profiles/default/linux/ia64/17.0/developer/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/developer diff --git a/profiles/default/linux/ia64/17.0/eapi b/profiles/default/linux/ia64/17.0/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/parent b/profiles/default/linux/ia64/17.0/parent deleted file mode 100644 index 4ce24f0217a8..000000000000 --- a/profiles/default/linux/ia64/17.0/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../releases/17.0 diff --git a/profiles/default/linux/ia64/17.0/systemd/deprecated b/profiles/default/linux/ia64/17.0/systemd/deprecated deleted file mode 100644 index 37010bfe7dbf..000000000000 --- a/profiles/default/linux/ia64/17.0/systemd/deprecated +++ /dev/null @@ -1,33 +0,0 @@ -default/linux/ia64/17.0/systemd/merged-usr - -As warned about previously in a news item, systemd-255 has dropped -support for split-usr systems. All Gentoo systems running systemd will -need to be migrated to merged-usr. - -Migrating to merged-usr will move all data from /bin, /sbin, and /lib -into the /usr/bin and /usr/lib directories. The directories in / are -replaced with symlinks. - -To facilitate this, a new set of sub-profiles has been created, and a -script is available to perform the actual migration. - -To migrate a system to merged-usr, follow this procedure: - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - -2. Install sys-apps/merge-usr. - -3. Run "merge-usr --dryrun" as root to check for conflicts. These will - appear with the word ERROR at the start of the line. - -4. Resolve any conflicts. This may involve deleting duplicate files. If - in doubt, seek support in a Gentoo support channel. - -5. Run the merge-usr script from a root shell. Avoid running it via sudo - directly to avoid locking yourself out if an unexpected error occurs. - -6. Switch to a merged-usr profile. - -7. Run emerge with the --newuse or --changed-use option to rebuild - any packages that have a "split-usr" USE flag. diff --git a/profiles/default/linux/ia64/17.0/systemd/eapi b/profiles/default/linux/ia64/17.0/systemd/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/systemd/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/deprecated b/profiles/default/linux/ia64/17.0/systemd/merged-usr/deprecated deleted file mode 100644 index be9bc4b25696..000000000000 --- a/profiles/default/linux/ia64/17.0/systemd/merged-usr/deprecated +++ /dev/null @@ -1,104 +0,0 @@ -default/linux/ia64/23.0/systemd - -A profile upgrade to version 23.0 is available for your architecture. -The new 23.0 profiles enable some toolchain hardening features and -performance enhancements by default, and standardize settings. -You can find the list of changes on the wiki tracking page [1]. - -Upgrade instructions - -Note 1: If you have manually changed your CHOST to a value different from -what the stages and profiles set, you may have to do that in the future too. -In that case you should know what you are doing, hopefully; please read the -instructions with a critical eye then. - -Note 2: In case you are already familiar with binary packages, you should be -able to add "--getbinpkg" to the emerge calls to speed things up. -The use of binary packages is completely optional though, and also not -as much tested as the source-based upgrade path yet. - -1. Ensure your system backups are up to date. Please also update - your system fully and depclean before proceeding. - glibc older than 2.36 and musl older than 1.2.4 is not supported anymore. - -2. If you are still using one of the long-deprecated amd64 17.0 profiles - (other than x32 or musl), then first complete the migration to the - corresponding 17.1 profile. Instructions can be found at [3]. - -3. If you are currently using systemd in a split-usr configuration, then first - complete the migration to the corresponding merged-usr profile of the - same profile version. Details on how to do this can be found in the news - item [4]. - If you are currently using openrc, migrate to 23.0 first, keeping your disk - layout. If you want to move from split-usr to merged-usr, do that afterwards. - -4. Run "emerge --info" and note down the value of the CHOST variable. - -5. Edit /etc/portage/make.conf; if there is a line defining the CHOST variable, - remove it. Also delete all lines defining CHOST_... variables. - -6. Select the 23.0 profile corresponding to your current profile, either using - "eselect profile" or by manually setting the profile symlink. - Note that old profiles are by default split-usr and the 23.0 profiles by - default merged-usr. Do NOT change directory scheme now, since this will - mess up your system! - Instead, make sure that the new profile has the same property: for example, - OLD default/linux/amd64/17.1 - ==> NEW default/linux/amd64/23.0/split-usr - (added "split-usr") - OLD default/linux/amd64/17.1/systemd/merged-usr - ==> NEW default/linux/amd64/23.0/systemd - (removed "merged-usr") - A detailed table of the upgrade paths can be found at [5]. Please consult it. - In some cases (hppa, x86) the table will tell you to pick between two choices. - What you need should be obvious from your *old* CHOST value (from step 4). - -7. Delete the contents of your binary package cache at ${PKGDIR} - rm -r /var/cache/binpkgs/* - -8. In the file or directory /etc/portage/binrepos.conf (if existing), update - the URI in all configuration such that they point to 23.0 profile binhost - directories. The exact paths can be found in the table at [5], too. - -9. Rebuild or reinstall from binary (if available) the following packages in - this order, with the same version as already active: - emerge --ask --oneshot sys-devel/binutils - (you may have to run binutils-config and re-select your binutils now) - emerge --ask --oneshot sys-devel/gcc - (IMPORTANT: If this command wants to rebuild glibc first, do *not* let it do - that; instead, abort and try again with --nodeps added to the command line.) - (you may have to run gcc-config and re-select your gcc now) - and the C library, i.e. for glibc-based systems - emerge --ask --oneshot sys-libs/glibc - or for musl-based systems - emerge --ask --oneshot sys-libs/musl - -10. Re-run "emerge --info" and check if CHOST has changed compared to step 4. - -If the CHOST has NOT changed, skip to step 13 (env-update). Otherwise, - -11. Recheck with binutils-config and gcc-config that valid installed versions - of binutils and gcc are selected. - -12. Check /etc/env.d, /etc/env.d/binutils, and /etc/env.d/gcc for files that - refer to the *OLD* CHOST value, and remove them. - Examples how to do this can be found in the similar procedure at [6]. - -13. Run env-update && source /etc/profile - -14. Re-emerge libtool: - emerge --ask --oneshot libtool - -15. Just for safety, delete the contents of your binary package cache at - ${PKGDIR} again: - rm -r /var/cache/binpkgs/* - -16. Rebuild world: - emerge --ask --emptytree @world - -[1] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_transition -[2] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_profile_timeline -[3] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html -[4] https://www.gentoo.org/support/news-items/2022-12-01-systemd-usrmerge.html -[5] https://wiki.gentoo.org/wiki/Project:Toolchain/23.0_update_table -[6] https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable#Verifying_things_work diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent deleted file mode 100644 index c407ca65bdc2..000000000000 --- a/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../features/merged-usr diff --git a/profiles/default/linux/ia64/17.0/systemd/parent b/profiles/default/linux/ia64/17.0/systemd/parent deleted file mode 100644 index ced72403bde9..000000000000 --- a/profiles/default/linux/ia64/17.0/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/systemd diff --git a/profiles/default/linux/ia64/23.0/desktop/eapi b/profiles/default/linux/ia64/23.0/desktop/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/desktop/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/eapi b/profiles/default/linux/ia64/23.0/desktop/gnome/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/desktop/gnome/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/parent b/profiles/default/linux/ia64/23.0/desktop/gnome/parent deleted file mode 100644 index 6589a0e01478..000000000000 --- a/profiles/default/linux/ia64/23.0/desktop/gnome/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../targets/desktop/gnome diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/eapi b/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/parent deleted file mode 100644 index f5c1ae438de4..000000000000 --- a/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../targets/desktop/gnome/systemd diff --git a/profiles/default/linux/ia64/23.0/desktop/parent b/profiles/default/linux/ia64/23.0/desktop/parent deleted file mode 100644 index ad6c5e126fbb..000000000000 --- a/profiles/default/linux/ia64/23.0/desktop/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/desktop diff --git a/profiles/default/linux/ia64/23.0/eapi b/profiles/default/linux/ia64/23.0/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/parent b/profiles/default/linux/ia64/23.0/parent deleted file mode 100644 index 50be433109ef..000000000000 --- a/profiles/default/linux/ia64/23.0/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../releases/23.0 diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/eapi b/profiles/default/linux/ia64/23.0/split-usr/desktop/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/split-usr/desktop/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/eapi b/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/parent b/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/parent deleted file mode 100644 index 9e06c4505a75..000000000000 --- a/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../targets/desktop/gnome diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/parent b/profiles/default/linux/ia64/23.0/split-usr/desktop/parent deleted file mode 100644 index db8ce088c69a..000000000000 --- a/profiles/default/linux/ia64/23.0/split-usr/desktop/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../targets/desktop diff --git a/profiles/default/linux/ia64/23.0/split-usr/eapi b/profiles/default/linux/ia64/23.0/split-usr/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/split-usr/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/split-usr/parent b/profiles/default/linux/ia64/23.0/split-usr/parent deleted file mode 100644 index 598ca888c8c2..000000000000 --- a/profiles/default/linux/ia64/23.0/split-usr/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../features/split-usr diff --git a/profiles/default/linux/ia64/23.0/systemd/eapi b/profiles/default/linux/ia64/23.0/systemd/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/23.0/systemd/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/23.0/systemd/parent b/profiles/default/linux/ia64/23.0/systemd/parent deleted file mode 100644 index ced72403bde9..000000000000 --- a/profiles/default/linux/ia64/23.0/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/systemd diff --git a/profiles/default/linux/ia64/eapi b/profiles/default/linux/ia64/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/ia64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/ia64/parent b/profiles/default/linux/ia64/parent deleted file mode 100644 index 10d6c4b38690..000000000000 --- a/profiles/default/linux/ia64/parent +++ /dev/null @@ -1,3 +0,0 @@ -../../../base -.. -../../../arch/ia64 diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask index e4e8702dc01d..af581ea60ca0 100644 --- a/profiles/default/linux/package.use.mask +++ b/profiles/default/linux/package.use.mask @@ -1,10 +1,6 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Matt Turner <mattst88@gentoo.org> (2024-01-29) -# Causes various issues. See bugs #919858, #923054 -media-libs/mesa zink - # Sam James <sam@gentoo.org> (2023-06-06) # Needs linux-only dev-libs/libaio. app-emulation/qemu -aio diff --git a/profiles/default/linux/x86/23.0/i686/time64/make.defaults b/profiles/default/linux/x86/23.0/i686/time64/make.defaults index 983829cdc512..e842848fb66c 100644 --- a/profiles/default/linux/x86/23.0/i686/time64/make.defaults +++ b/profiles/default/linux/x86/23.0/i686/time64/make.defaults @@ -1,5 +1,5 @@ # Copyright 2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -CHOST="i686-pc_t64-linux-gnu" +CHOST="i686-pc-linux-gnut64" CHOST_x86="${CHOST}" diff --git a/profiles/default/linux/x86/23.0/i686/time64/package.accept_keywords b/profiles/default/linux/x86/23.0/i686/time64/package.accept_keywords index f065ec275cad..0d0241ad4db0 100644 --- a/profiles/default/linux/x86/23.0/i686/time64/package.accept_keywords +++ b/profiles/default/linux/x86/23.0/i686/time64/package.accept_keywords @@ -4,3 +4,7 @@ # For better testing of time64, we use gcc-14 here already in an otherwise stable # environment. sys-devel/gcc:14 ~x86 + +# We need glibc-2.39-r11 at least so we can handle the compiler that auto-sets _TIME_BITS +# etc +=sys-libs/glibc-2.39* ~x86 |