we apparently still need profiles/eclass for building the stage3 from the livecd

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1260 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index f681365848ac5b6b9b32e66c5f7d87295ec3eb52..6692734a9be38ed129826cdec71df8b045b27760 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
+  livecd/files/livecd-local.start,
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/livecdfs-update.sh:
+  we apparently still need profiles/eclass for building the stage3 from the
+  livecd
+
   17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> arch/mips.py:
   apply patch for mips n32 support from Stuart Longland <redhatter@gentoo.org>
   in bug #197917

diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index d4d7fe55e8ab423a14327110b55ecc4b93a1f731..11a7d28a64310efa8042225324ab4e348d7107f6 100644 (file)
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -4,15 +4,15 @@
 # This is a good place to load any misc.
 # programs on startup ( 1>&2 )
 
-if [ -d /usr/livecd/gconf ]
-then
-       ln -sf /usr/livecd/gconf /etc/gconf
-fi
+#if [ -d /usr/livecd/gconf ]
+#then
+#      ln -sf /usr/livecd/gconf /etc/gconf
+#fi
 
-if [ -d /usr/livecd/db ]
-then
-       ln -sf /usr/livecd/db /var/db
-fi
+#if [ -d /usr/livecd/db ]
+#then
+#      ln -sf /usr/livecd/db /var/db
+#fi
 
 if [ -d /usr/livecd/profiles ]
 then

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index f8fdf2172a1e3f869c9d4a736287415ad20ce390..b1649f57e4a2f9dbcba495422777d901018ad949 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -64,8 +64,8 @@ case $1 in
                        ${clst_chroot_path}/root/.bashrc
                cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \
                        ${clst_chroot_path}/root/.bash_profile
-#              cp -f ${clst_sharedir}/livecd/files/livecd-local.start \
-#                      ${clst_chroot_path}/etc/conf.d/local.start
+               cp -f ${clst_sharedir}/livecd/files/livecd-local.start \
+                       ${clst_chroot_path}/etc/conf.d/local.start
                
                # execute copy gamecd.conf if we're a gamecd
                if [ "${clst_livecd_type}" = "gentoo-gamecd" ]

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 741be3474e6c0391f261e0f06d90014204f935e7..2d07bd57ad02b9d5cab2c656f098c2973fb717c2 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -325,9 +325,9 @@ case ${clst_livecd_type} in
                USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
 
                # This is my hack to reduce tmpfs usage
-#              cp -r /usr/portage/profiles /usr/livecd
-#              cp -r /usr/portage/eclass /usr/livecd
-#              rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
+               cp -r /usr/portage/profiles /usr/livecd
+               cp -r /usr/portage/eclass /usr/livecd
+               rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
                mv -f /etc/gconf /usr/livecd
                ln -sf /usr/livecd/gconf /etc/gconf
                mv -f /var/db /usr/livecd