[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/

[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/

[Brian Evans]

commit:     dcdc33af90ded1a5609a1e3d4aa6ced36249ce90
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 16:19:53 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 16:19:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcdc33af

default/linux/amd64/17.1/profile.bashrc: Create a script to die when /lib is a symlink

 profiles/default/linux/amd64/17.1/profile.bashrc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc
new file mode 100644
index 00000000000..e8fc95af773
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/profile.bashrc
@@ -0,0 +1,7 @@
+if [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then
+	eerror "Please follow the instructions in the news item:"
+	eerror "2017-12-26-experimental-amd64-17-1-profiles"
+	eerror "or choose the 17.0 profile."
+	die "ERROR: 17.1 migration has not been performed!!"
+fi
+

[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/

[Brian Evans]

commit:     d74e991536d896ce95834a031882f375f747fb2d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 17:33:58 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 17:33:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74e9915

default/linux/amd64/17.1/profile.bashrc: Check setup phase

The reason to check this phase is that cleanup is safe and die hooks
are set in portage (if any).  This also gives a resonable error message
to anyone with --quiet-build=y in portage

 profiles/default/linux/amd64/17.1/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc
index e8fc95af773..44dc51c5540 100644
--- a/profiles/default/linux/amd64/17.1/profile.bashrc
+++ b/profiles/default/linux/amd64/17.1/profile.bashrc
@@ -1,4 +1,4 @@
-if [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then
+if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then
 	eerror "Please follow the instructions in the news item:"
 	eerror "2017-12-26-experimental-amd64-17-1-profiles"
 	eerror "or choose the 17.0 profile."

[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/

[Brian Evans]

commit:     6574efff52ced6f4139d31e5e3fa494e3a31e119
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 19:20:06 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed May 16 19:23:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6574efff

profiles: amd64/17.1/profile.bashrc - Dereference symlink to /lib and /usr/lib

Advanced users may want /lib and/or /usr/lib to point somewhere else

This checks what should not be and warns but still lets those
advanced people do what they like.

 profiles/default/linux/amd64/17.1/profile.bashrc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc
index 44dc51c5540..7019782fb8f 100644
--- a/profiles/default/linux/amd64/17.1/profile.bashrc
+++ b/profiles/default/linux/amd64/17.1/profile.bashrc
@@ -1,7 +1,9 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then
-	eerror "Please follow the instructions in the news item:"
-	eerror "2017-12-26-experimental-amd64-17-1-profiles"
-	eerror "or choose the 17.0 profile."
-	die "ERROR: 17.1 migration has not been performed!!"
+if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+	if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then
+		eerror "Please follow the instructions in the news item:"
+		eerror "2017-12-26-experimental-amd64-17-1-profiles"
+		eerror "or choose the 17.0 profile."
+		die "ERROR: 17.1 migration has not been performed!!"
+	fi
 fi
 

[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/

[Brian Evans]

commit:     e467d57216e121bed67896ffd16aa85a5360539d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 14:02:11 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 14:02:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e467d572

profiles: Update safety net message for 17.1 to latest news item release

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 profiles/default/linux/amd64/17.1/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc
index 7019782fb8f..d0fe8acc8be 100644
--- a/profiles/default/linux/amd64/17.1/profile.bashrc
+++ b/profiles/default/linux/amd64/17.1/profile.bashrc
@@ -1,7 +1,7 @@
 if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
 	if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then
 		eerror "Please follow the instructions in the news item:"
-		eerror "2017-12-26-experimental-amd64-17-1-profiles"
+		eerror "2019-06-05-amd64-17-1-profiles-are-now-stable"
 		eerror "or choose the 17.0 profile."
 		die "ERROR: 17.1 migration has not been performed!!"
 	fi