From: Andrew Gaffney Date: Sat, 17 Nov 2007 05:36:52 +0000 (+0000) Subject: we apparently still need profiles/eclass for building the stage3 from the livecd X-Git-Tag: CATALYST_2_0_6_916~234 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=35913c7e4621e6709ee6a8d8a7437794f2d59634;p=catalyst.git 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 f6813658..6692734a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 17 Nov 2007; Andrew Gaffney + 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 arch/mips.py: apply patch for mips n32 support from Stuart Longland in bug #197917 diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start index d4d7fe55..11a7d28a 100644 --- 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 f8fdf217..b1649f57 100755 --- 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 741be347..2d07bd57 100755 --- 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