From a97c7ee492473603fca0031bccc6607f3c030af2 Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 11 Apr 2008 15:55:54 +0000
Subject: [PATCH] Updated TODO.  Added code to livecd-stage1 to generate a
 package list, which will be used in livecd-stage2 with the upcoming livedvd
 livecd/type to fetch the distfiles automatically.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1393 d1e1f19c-881f-0410-ab34-b69fee027534
---
 ChangeLog                                         |  7 +++++++
 TODO                                              |  5 +++++
 targets/livecd-stage1/livecd-stage1-controller.sh |  3 ++-
 targets/livecd-stage2/livecd-stage2-controller.sh | 11 +++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d669c465..883c25bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  11 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> TODO,
+  targets/livecd-stage1/livecd-stage1-controller.sh,
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Updated TODO. Added code to livecd-stage1 to generate a package list, which
+  will be used in livecd-stage2 with the upcoming livedvd livecd/type to fetch
+  the distfiles automatically.
+
   11 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:
   Fix seedcache output so it fits in 80 columns.
diff --git a/TODO b/TODO
index b17635e4..618afa99 100644
--- a/TODO
+++ b/TODO
@@ -2,4 +2,9 @@
 - sign materials automatically
 - create logs
 - send emails
+- add multiple target support
 - separate out options that control catalyst versus the package manager
+- add a new livecd/type for livedvd
+  - make livedvd type perform several actions automatically
+    - auto-fetch distfiles
+	- automatically pull stages
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index 06418bd2..1099b1df 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -7,9 +7,10 @@ case $1 in
 	build_packages)
 		shift
 		export clst_packages="$*"
-		mkdir -p ${clst_chroot_path}/usr/livecd
+		mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
 		exec_in_chroot \
 			${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+		echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
 		;;
 	clean)
 		find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 43f5f0fb..73717f70 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -99,15 +99,18 @@ case $1 in
 		|| [ "${clst_livecd_type}" = "gentoo-release-universal" ]
 		then
 			# Clean out man, info and doc files
-			rm -rf usr/share/{man,doc,info}/*
+			rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/*
 			# Zap all .pyc and .pyo files
-			find usr/lib -iname "*.py[co]" -exec rm -f {} \;
+			find ${clst_chroot_path}/usr/lib -iname "*.py[co]" -exec rm -f {} \;
 		fi
 		# Cleanup all .a files except libgcc.a, *_nonshared.a and
 		# /usr/lib/portage/bin/*.a
-		find usr/lib -type f -iname "*.a" | grep -v 'libgcc.a' | \
-			grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
+		find ${clst_chroot_path}usr/lib -type f -iname "*.a" | \
+			grep -v 'libgcc.a' | \
+			grep -v 'nonshared.a' | \
+			grep -v '/usr/lib/portage/bin/' | \
 			grep -v 'libgcc_eh.a' | xargs rm -f
+		rm -f ${clst_chroot_path}/tmp/packages.txt
 		;;
 	bootloader)
 		shift
-- 
2.26.2