From: Jeremy Huddleston Date: Wed, 12 Jan 2005 23:49:31 +0000 (+0000) Subject: Moved so-symlinks into a sub-profile as there isn't sufficient time to ensure QA... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=67580864920c4f53b51f937009bdfc7300d4f8dc;p=gentoo.git Moved so-symlinks into a sub-profile as there isn't sufficient time to ensure QA of that method before release. 2005.0 is ready for testing. --- diff --git a/profiles/default-linux/amd64/2005.0/README b/profiles/default-linux/amd64/2005.0/README index 95c3c8a3eb32..dc682c92fc77 100644 --- a/profiles/default-linux/amd64/2005.0/README +++ b/profiles/default-linux/amd64/2005.0/README @@ -1,36 +1,30 @@ HOWTO upgrade from 2004.3 and 2004.3/lib64 to 2005.0 1) emerge -v '>=sys-apps/portage-2.0.51-r9' - 2) emerge unmerge app-emulation/emul-linux-x86-glibc - 3) rm /lib32 /usr/lib32 /usr/X11R6/lib32 - 4) mkdir /lib32 - 5) cp /emul/linux/x86/lib32/libsandbox.so /lib32 - 6) emerge -v '>=sys-apps/baselayout-1.11.8-r1' - 7) rm /etc/make.profile - 8) ln -s /usr/portage/profiles/default-linux/amd64/2005.0 /etc/make.profile - 9) cd /usr/tmp -10) emerge unmerge linux26-headers -11) emerge -v linux-headers -12) wget http://dev.gentoo.org/~eradicator/grp/amd64/2005.0/glibc-2.3.4.20040808-r1.tbz2 -13) emerge -v glibc-2.3.4.20040808-r1.tbz2 -14) lynx -source http://dev.gentoo.org/~eradicator/fix_lib_symlinks.sh | sh -15) (OPTIONAL) emerge -uv glibc -16) emerge -upv system -17) emerge -uv system + 2) emerge unmerge linux26-headers + 3) emerge -v linux-headers + 4) emerge unmerge app-emulation/emul-linux-x86-glibc + 5) rm /lib32 /usr/lib32 + 6) mkdir /lib32 /usr/lib32 + 7) cp /emul/linux/x86/lib32/libsandbox.so /lib32 + 8) rm /etc/make.profile + 9) ln -s /usr/portage/profiles/default-linux/amd64/2005.0 /etc/make.profile +10) cd /usr/tmp +11) wget http://dev.gentoo.org/~eradicator/grp/amd64/2005.0/glibc-2.3.4.20040808-r1.tbz2 +12) emerge -v glibc-2.3.4.20040808-r1.tbz2 +13) (OPTIONAL) emerge -uv glibc +14) emerge -upv system +15) emerge -uv system Notes: The order is VERY important. -baselayout-1.11.8-r1 isn't in portage yet, but you can use -http://dev.gentoo.org/~eradicator/baselayout-ml.patch to make what I'm using -for it. When base-system releases 1.11.8-r1, it might have other fixes too, -so be sure to re-emerge, but this one should be fine for building stages. - You MUST do every step even if you already have that version installed. -emerging glibc the second time is optional if you don't want to use my -options. -The script for step 14 isn't yet ready. It's safe to skip for now. +Emerging glibc the second time is optional if you don't want to use my +options. It was made with gcc-3.4.3-r1: +CFLAGS="-O2 -pipe -fomit-frame-pointer" +USE: -build -debug +emul-linux-x86 -erandom -hardened +multilib +nls +nptl +pic -userlocales linux-headers is masked in the main package.mask still, so unmask it yourself. linux26-headers-2.6.8.1-r3 will probably work, but I noticed it doesn't get diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/README b/profiles/default-linux/amd64/2005.0/no-symlinks/README new file mode 100644 index 000000000000..299ff1b89f24 --- /dev/null +++ b/profiles/default-linux/amd64/2005.0/no-symlinks/README @@ -0,0 +1,21 @@ +HOWTO upgrade from 2005.0 to 2005.0/no-symlinks + + 1) emerge -v '>=sys-apps/baselayout-1.11.8-r1' + 2) rm /etc/make.profile + 3) ln -s /usr/portage/profiles/default-linux/amd64/2005.0/no-symlinks /etc/make.profile + 4) lynx -source http://dev.gentoo.org/~eradicator/fix_lib_symlinks.sh | sh + 5) emerge -upv system + 6) emerge -uv system + +Notes: +baselayout-1.11.8-r1 isn't in portage yet, but you can use +http://dev.gentoo.org/~eradicator/baselayout-ml.patch to make what I'm using +for it. When base-system releases 1.11.8-r1, it might have other fixes too, +so be sure to re-emerge, but this one should be fine for building stages. + +The script for step 4 isn't yet ready. It's safe to skip for now. + +linux-headers is masked in the main package.mask still, so unmask it yourself. +linux26-headers-2.6.8.1-r3 will probably work, but I noticed it doesn't get +the headers in asm-i386/mach-*/, but my updated multilib.eclass method does +for linux-headers. diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/packages b/profiles/default-linux/amd64/2005.0/no-symlinks/packages new file mode 100644 index 000000000000..7f497ebb5196 --- /dev/null +++ b/profiles/default-linux/amd64/2005.0/no-symlinks/packages @@ -0,0 +1,7 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-symlinks/packages,v 1.1 2005/01/12 23:49:31 eradicator Exp $ + +# Don't use packages which do ugly symlink hackery for lib/lib64 +*>=sys-apps/baselayout-1.11.8-r1 + diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/parent b/profiles/default-linux/amd64/2005.0/no-symlinks/parent new file mode 100644 index 000000000000..6b0271ae1579 --- /dev/null +++ b/profiles/default-linux/amd64/2005.0/no-symlinks/parent @@ -0,0 +1,8 @@ +# Copyright 2004-2005 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/parent,v 1.2 +# 2004/03/18 00:16:43 seemant Exp $ + +# This file describes the parent profile to this. In most cases this will +# just be the name of the parent directory +.. diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc b/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc new file mode 100644 index 000000000000..b9c0ab574112 --- /dev/null +++ b/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc @@ -0,0 +1,13 @@ +for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do + if [ -L "${dir}" ]; then + ewarn "${dir} is a symlink" + #exit 1 + fi +done + +if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then + eerror "The amd64 2005.0/no-symlinks profile is still in active development" + eerror "and not yet ready for user testing. An announcement will be made" + eerror "on gentoo-amd64@gentoo.org once we are ready for testers." + exit 1 +fi diff --git a/profiles/default-linux/amd64/2005.0/packages b/profiles/default-linux/amd64/2005.0/packages index 5e238a46260c..210c7b5c8aa0 100644 --- a/profiles/default-linux/amd64/2005.0/packages +++ b/profiles/default-linux/amd64/2005.0/packages @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/packages,v 1.3 2005/01/11 02:26:44 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/packages,v 1.4 2005/01/12 23:49:31 eradicator Exp $ *>=sys-devel/binutils-2.15.90.0.1.1-r4 *>=sys-devel/gcc-3.3.5-r1 @@ -11,6 +11,5 @@ *>=sys-devel/gcc-config-1.3.9 >=sys-devel/distcc-2.18.3-r1 -# Don't use packages which do ugly symlink hackery for lib/lib64 -*>=sys-apps/baselayout-1.11.8-r1 +*>=sys-apps/baselayout-1.9.4-r6 diff --git a/profiles/default-linux/amd64/2005.0/profile.bashrc b/profiles/default-linux/amd64/2005.0/profile.bashrc index 58e24eb41546..d40d27333fb4 100644 --- a/profiles/default-linux/amd64/2005.0/profile.bashrc +++ b/profiles/default-linux/amd64/2005.0/profile.bashrc @@ -9,17 +9,3 @@ fi export CFLAGS_amd64 export CFLAGS_x86 - -#for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do -# if [ -L "${dir}" ]; then -# ewarn "${dir} is a symlink" -# #exit 1 -# fi -#done - -if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then - eerror "The amd64 2005.0 profile is still in active development and" - eerror "not yet ready for user testing. An announcement will be made" - eerror "on gentoo-amd64@gentoo.org once we are ready for testers." - exit 1 -fi