Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1395 - in trunk: . targets/livecd-stage2
Date: Sun, 13 Apr 2008 21:55:08
Message-Id: E1JlAAC-0002bX-LB@stork.gentoo.org
1 Author: wolf31o2
2 Date: 2008-04-13 21:55:03 +0000 (Sun, 13 Apr 2008)
3 New Revision: 1395
4
5 Modified:
6 trunk/ChangeLog
7 trunk/targets/livecd-stage2/livecd-stage2-controller.sh
8 Log:
9 Added initial framework for creating the CD's root on livecd/livedvd. Currently, the end result is the same, but I'll be adding code to automatically copy the stages and to automatically download the distfiles.
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2008-04-13 15:47:55 UTC (rev 1394)
14 +++ trunk/ChangeLog 2008-04-13 21:55:03 UTC (rev 1395)
15 @@ -2,6 +2,12 @@
16 # $Id: $
17
18 13 Apr 2008; Chris Gianelloni <wolf31o2@g.o>
19 + targets/livecd-stage2/livecd-stage2-controller.sh:
20 + Added initial framework for creating the CD's root on livecd/livedvd.
21 + Currently, the end result is the same, but I'll be adding code to
22 + automatically copy the stages and to automatically download the distfiles.
23 +
24 + 13 Apr 2008; Chris Gianelloni <wolf31o2@g.o>
25 targets/livecd-stage2/livecd-stage2-controller.sh,
26 targets/support/kmerge.sh, targets/support/livecdfs-update.sh,
27 targets/support/rc-update.sh:
28
29 Modified: trunk/targets/livecd-stage2/livecd-stage2-controller.sh
30 ===================================================================
31 --- trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-04-13 15:47:55 UTC (rev 1394)
32 +++ trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-04-13 21:55:03 UTC (rev 1395)
33 @@ -142,7 +142,7 @@
34 esac
35
36 case ${clst_livecd_type} in
37 - gentoo-release-live*)
38 + gentoo-release-livecd)
39 mkdir -p $1/snapshots
40 if [ -n "${clst_livecd_overlay}" ]
41 then
42 @@ -156,6 +156,37 @@
43 cp -f ${clst_snapshot_path} $1/snapshots
44 cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
45 ;;
46 + gentoo-release-livedvd)
47 + targets="distfiles snapshots stages"
48 + for i in ${targets}
49 + do
50 + mkdir -p $1/$i
51 + if [ -n "${clst_livecd_overlay}" ]
52 + then
53 + if [ -e ${clst_livecd_overlay}/$i ] && \
54 + [ -n "$(ls ${clst_livecd_overlay}/$i |grep -v README)" ]
55 + then
56 + echo "ERROR: You have files in $i in your overlay!"
57 + echo "This directory is now populated by catalyst."
58 + exit 1
59 + fi
60 + fi
61 + case ${target} in
62 + distfiles)
63 + ### TODO: make this fetch the distfiles
64 + continue
65 + ;;
66 + snapshots)
67 + cp -f ${clst_snapshot_path} $1/snapshots
68 + cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
69 + ;;
70 + stages)
71 + ### TODO: make this copy stages
72 + continue
73 + ;;
74 + esac
75 + done
76 + ;;
77 esac
78
79 ${clst_sharedir}/targets/support/bootloader-setup.sh $1
80
81 --
82 gentoo-commits@l.g.o mailing list