From a4036575de835600b3085b97974d0766ef7c7bc2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Mar 2024 05:41:39 +0000 Subject: gentoo auto-resync : 02:03:2024 - 05:41:39 --- profiles/Manifest.gz | Bin 202356 -> 202679 bytes profiles/features/split-usr/make.defaults | 2 ++ profiles/releases/23.0/profile.bashrc | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 profiles/features/split-usr/make.defaults create mode 100644 profiles/releases/23.0/profile.bashrc (limited to 'profiles') diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index c4cfb203b271..ee8b7cff4375 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz 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 -- cgit v1.2.3