summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-02 05:41:39 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-02 05:41:39 +0000
commita4036575de835600b3085b97974d0766ef7c7bc2 (patch)
tree545e8444bbb80f76c5faf48f8fef3719b931fd44 /profiles
parent1331637681273dc8391d7a7caa6175405dceb735 (diff)
gentoo auto-resync : 02:03:2024 - 05:41:39
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin202356 -> 202679 bytes
-rw-r--r--profiles/features/split-usr/make.defaults2
-rw-r--r--profiles/releases/23.0/profile.bashrc20
3 files changed, 22 insertions, 0 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c4cfb203b271..ee8b7cff4375 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/features/split-usr/make.defaults b/profiles/features/split-usr/make.defaults
new file mode 100644
index 000000000000..9d42deee4999
--- /dev/null
+++ b/profiles/features/split-usr/make.defaults
@@ -0,0 +1,2 @@
+# Set an environment variable so we can easily test for the profile type
+PROFILE_23_USRTYPE=split-usr
diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc
new file mode 100644
index 000000000000..258d9754e5bb
--- /dev/null
+++ b/profiles/releases/23.0/profile.bashrc
@@ -0,0 +1,20 @@
+if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+ if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then
+ eerror ""
+ eerror "Your profile is of type merged-usr, but your directories"
+ eerror "on-disk are of type split-usr."
+ eerror "Please switch back to your last valid profile setting and"
+ eerror "read the documentation about merged-usr and profile changes."
+ eerror ""
+ die "ERROR: 23.0 merged-usr profile, but disk is split-usr"
+ fi
+ if [[ -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" == "split-usr" ]] ; then
+ eerror ""
+ eerror "Your profile is of type split-usr, but your directories"
+ eerror "on-disk are of type merged-usr."
+ eerror "Please switch back to your last valid profile setting and"
+ eerror "read the documentation about merged-usr and profile changes."
+ eerror ""
+ die "ERROR: 23.0 split-usr profile, but disk is merged-usr"
+ fi
+fi