Updated TODO. Added code to livecd-stage1 to generate a package list, which will...

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

diff --git a/ChangeLog b/ChangeLog
index d669c4658086feb8a0e3a9861396d7b710c32a2b..883c25bbd30ea838e995cda315fbd60e2b35d97f 100644 (file)
--- 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 b17635e48c46c975c49377e35a64fac633bb8ddb..618afa99ff41c554fae68acfcff45fed4981720e 100644 (file)
--- 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 06418bd22037eb7dfdf59b08def582160d087443..1099b1df079d2bd9e5ff938a1a1ff8fe594c73c5 100755 (executable)
--- 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 43f5f0fb574d3203f35355e78ad1f1a0e7597b22..73717f70aa455032d80d23ebc3d205f30cf3b82c 100755 (executable)
--- 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