Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1393 - in trunk: . targets/livecd-stage1 targets/livecd-stage2
Date: Fri, 11 Apr 2008 15:56:01
Message-Id: E1JkLbW-00022z-VE@stork.gentoo.org
1 Author: wolf31o2
2 Date: 2008-04-11 15:55:54 +0000 (Fri, 11 Apr 2008)
3 New Revision: 1393
4
5 Modified:
6 trunk/ChangeLog
7 trunk/TODO
8 trunk/targets/livecd-stage1/livecd-stage1-controller.sh
9 trunk/targets/livecd-stage2/livecd-stage2-controller.sh
10 Log:
11 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.
12
13 Modified: trunk/ChangeLog
14 ===================================================================
15 --- trunk/ChangeLog 2008-04-11 14:44:31 UTC (rev 1392)
16 +++ trunk/ChangeLog 2008-04-11 15:55:54 UTC (rev 1393)
17 @@ -1,6 +1,13 @@
18 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
19 # $Id: $
20
21 + 11 Apr 2008; Chris Gianelloni <wolf31o2@g.o> TODO,
22 + targets/livecd-stage1/livecd-stage1-controller.sh,
23 + targets/livecd-stage2/livecd-stage2-controller.sh:
24 + Updated TODO. Added code to livecd-stage1 to generate a package list, which
25 + will be used in livecd-stage2 with the upcoming livedvd livecd/type to fetch
26 + the distfiles automatically.
27 +
28 11 Apr 2008; Chris Gianelloni <wolf31o2@g.o>
29 modules/generic_stage_target.py:
30 Fix seedcache output so it fits in 80 columns.
31
32 Modified: trunk/TODO
33 ===================================================================
34 --- trunk/TODO 2008-04-11 14:44:31 UTC (rev 1392)
35 +++ trunk/TODO 2008-04-11 15:55:54 UTC (rev 1393)
36 @@ -2,4 +2,9 @@
37 - sign materials automatically
38 - create logs
39 - send emails
40 +- add multiple target support
41 - separate out options that control catalyst versus the package manager
42 +- add a new livecd/type for livedvd
43 + - make livedvd type perform several actions automatically
44 + - auto-fetch distfiles
45 + - automatically pull stages
46
47 Modified: trunk/targets/livecd-stage1/livecd-stage1-controller.sh
48 ===================================================================
49 --- trunk/targets/livecd-stage1/livecd-stage1-controller.sh 2008-04-11 14:44:31 UTC (rev 1392)
50 +++ trunk/targets/livecd-stage1/livecd-stage1-controller.sh 2008-04-11 15:55:54 UTC (rev 1393)
51 @@ -7,9 +7,10 @@
52 build_packages)
53 shift
54 export clst_packages="$*"
55 - mkdir -p ${clst_chroot_path}/usr/livecd
56 + mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
57 exec_in_chroot \
58 ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
59 + echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
60 ;;
61 clean)
62 find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
63
64 Modified: trunk/targets/livecd-stage2/livecd-stage2-controller.sh
65 ===================================================================
66 --- trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-04-11 14:44:31 UTC (rev 1392)
67 +++ trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-04-11 15:55:54 UTC (rev 1393)
68 @@ -99,15 +99,18 @@
69 || [ "${clst_livecd_type}" = "gentoo-release-universal" ]
70 then
71 # Clean out man, info and doc files
72 - rm -rf usr/share/{man,doc,info}/*
73 + rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/*
74 # Zap all .pyc and .pyo files
75 - find usr/lib -iname "*.py[co]" -exec rm -f {} \;
76 + find ${clst_chroot_path}/usr/lib -iname "*.py[co]" -exec rm -f {} \;
77 fi
78 # Cleanup all .a files except libgcc.a, *_nonshared.a and
79 # /usr/lib/portage/bin/*.a
80 - find usr/lib -type f -iname "*.a" | grep -v 'libgcc.a' | \
81 - grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
82 + find ${clst_chroot_path}usr/lib -type f -iname "*.a" | \
83 + grep -v 'libgcc.a' | \
84 + grep -v 'nonshared.a' | \
85 + grep -v '/usr/lib/portage/bin/' | \
86 grep -v 'libgcc_eh.a' | xargs rm -f
87 + rm -f ${clst_chroot_path}/tmp/packages.txt
88 ;;
89 bootloader)
90 shift
91
92 --
93 gentoo-commits@l.g.o mailing list