Ubuntu CD Images

Merge lp:~mcasadevall/ubuntu-cdimage/tocd-removal into lp:~cjwatson/ubuntu-cdimage/mainline

  1. tocd-removal
  2. Merge into mainline
Proposed by Michael Casadevall
Status: Needs review
Proposed branch: lp:~mcasadevall/ubuntu-cdimage/tocd-removal
Merge into: lp:~cjwatson/ubuntu-cdimage/mainline
Diff against target: 259 lines (+4/-187)
4 files modified
bin/download-live-filesystems (+0/-12)
bin/find-live-filesystem (+1/-162)
bin/for-project (+0/-10)
etc/anonftpsync (+3/-3)
To merge this branch: bzr merge lp:~mcasadevall/ubuntu-cdimage/tocd-removal
Reviewer Review Type Date Requested Status
Colin Watson Pending
Review via email: mp+14752@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Casadevall (mcasadevall) wrote :

This branch removed TheOpenCD support from CD image build scripts.

Reply
lp:~mcasadevall/ubuntu-cdimage/tocd-removal updated
757. By Michael Casadevall

Also zap winfoss as edubuntu doesn't use it any more either

Unmerged revisions

757. By Michael Casadevall

Also zap winfoss as edubuntu doesn't use it any more either

756. By Michael Casadevall

Remove TheOpenCD code as we haven't built this favor in years, and unlikely to build it again

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/download-live-filesystems'
2--- bin/download-live-filesystems 2009-08-24 11:25:47 +0000
3+++ bin/download-live-filesystems 2009-11-12 05:18:09 +0000
4@@ -120,15 +120,3 @@
5 exit 1
6 fi
7 fi
8-
9-if ([ "$PROJECT" = edubuntu ] && [ "$CDIMAGE_INSTALL" ]); then
10- case $DIST in
11- warty|hoary|breezy|dapper|edgy|feisty|gutsy|hardy)
12- for arch in $CPUARCHES; do
13- if winfoss="$(find-live-filesystem "$arch" winfoss)"; then
14- fetch "$winfoss" "$LIVE_OUT/$arch.winfoss.tgz"
15- fi
16- done
17- ;;
18- esac
19-fi
20
21=== modified file 'bin/find-live-filesystem'
22--- bin/find-live-filesystem 2009-10-28 00:02:35 +0000
23+++ bin/find-live-filesystem 2009-11-12 05:18:09 +0000
24@@ -5,7 +5,7 @@
25 . "$CDIMAGE_ROOT/etc/config"
26
27 if [ -z "$1" ] || [ -z "$2" ]; then
28- echo 'Usage: find-live-filesystem ARCH cloop|squashfs|kernel|initrd|manifest|manifest-desktop|winfoss|wubi|wubi-cdboot|umenu|usb-creator' >&2
29+ echo 'Usage: find-live-filesystem ARCH cloop|squashfs|kernel|initrd|manifest|manifest-desktop|wubi|wubi-cdboot|umenu|usb-creator' >&2
30 exit 1
31 fi
32 ARCH="$1"
33@@ -97,9 +97,6 @@
34 livecd-base)
35 LIVEPROJECT=base
36 ;;
37- tocd3.1)
38- LIVEPROJECT=tocd
39- ;;
40 *)
41 LIVEPROJECT="$PROJECT"
42 ;;
43@@ -131,10 +128,6 @@
44 case $ITEM in
45 cloop|squashfs|manifest|manifest-desktop)
46 case $PROJECT in
47- tocd3)
48- # auto-purged - reverting to plan B
49- echo "/home/cjwatson/tocd3/livecd.tocd3.$ITEM"
50- ;;
51 ubuntu)
52 case $DIST in
53 breezy)
54@@ -156,160 +149,6 @@
55 echo "$LIVECD/$DIST/$LIVEPROJECT/current/livecd.$LIVEPROJECT.$ITEM-$flavour"
56 done
57 ;;
58- winfoss)
59- if [ "$DIST" = warty ]; then
60- exit 1
61- fi
62- case $PROJECT in
63- ubuntu)
64- case $DIST in
65- hoary)
66- case $CPUARCH in
67- i386)
68- echo http://maitri.ubuntu.com/theopencd/ubuntu/winfoss/latest/Hoary-WinFOSS.tgz
69- ;;
70- amd64)
71- echo http://maitri.ubuntu.com/theopencd/ubuntu/amd64/latest/Hoary-WinFOSS-amd64.tgz
72- ;;
73- *) exit 1 ;;
74- esac
75- ;;
76- breezy)
77- case $CPUARCH in
78- i386|amd64)
79- echo http://maitri.ubuntu.com/theopencd/winfoss/ubuntu/current/Ubuntu-WinFOSS-5.10.tgz
80- ;;
81- *) exit 1 ;;
82- esac
83- ;;
84- dapper)
85- case $CPUARCH in
86- i386|amd64)
87- echo http://people.ubuntu.com/~henrik/winfoss/dapper/ubuntu/current/ubuntu-winfoss-6.06.tar.gz
88- ;;
89- *) exit 1 ;;
90- esac
91- ;;
92- edgy)
93- case $CPUARCH in
94- i386|amd64)
95- echo http://people.ubuntu.com/~henrik/winfoss/edgy/ubuntu/current/ubuntu-winfoss-6.10.tar.gz
96- ;;
97- *) exit 1 ;;
98- esac
99- ;;
100- feisty)
101- case $CPUARCH in
102- i386|amd64)
103- echo http://people.ubuntu.com/~henrik/winfoss/feisty/ubuntu/current/ubuntu-winfoss-7.04.tar.gz
104- ;;
105- *) exit 1 ;;
106- esac
107- ;;
108- gutsy|hardy|intrepid|jaunty|karmic)
109- case $CPUARCH in
110- i386|amd64)
111- echo http://people.ubuntu.com/~henrik/winfoss/gutsy/ubuntu/current/ubuntu-winfoss-7.10.tar.gz
112- ;;
113- *) exit 1 ;;
114- esac
115- ;;
116- esac
117- ;;
118- kubuntu)
119- case $DIST in
120- hoary)
121- case $CPUARCH in
122- i386)
123- echo http://maitri.ubuntu.com/theopencd/kubuntu/winfoss/latest/Kubuntu-WinFOSS-i386.tgz
124- ;;
125- *) exit 1 ;;
126- esac
127- ;;
128- breezy)
129- case $CPUARCH in
130- i386)
131- echo http://maitri.ubuntu.com/theopencd/winfoss/kubuntu/current/Kubuntu-WinFOSS-5.10.tgz
132- ;;
133- amd64)
134- echo http://maitri.ubuntu.com/theopencd/winfoss/kubuntu-AMD/current/Kubuntu-WinFOSS-5.10-AMD.tgz
135- ;;
136- *) exit 1 ;;
137- esac
138- ;;
139- dapper)
140- case $CPUARCH in
141- i386|amd64)
142- echo http://people.ubuntu.com/~henrik/winfoss/dapper/kubuntu/current/kubuntu-winfoss-6.06.tar.gz
143- ;;
144- *) exit 1 ;;
145- esac
146- ;;
147- edgy)
148- case $CPUARCH in
149- i386|amd64)
150- echo http://people.ubuntu.com/~henrik/winfoss/edgy/kubuntu/current/kubuntu-winfoss-6.10.tar.gz
151- ;;
152- *) exit 1 ;;
153- esac
154- ;;
155- feisty)
156- case $CPUARCH in
157- i386|amd64)
158- echo http://people.ubuntu.com/~henrik/winfoss/feisty/kubuntu/current/kubuntu-winfoss-7.04.tar.gz
159- ;;
160- *) exit 1 ;;
161- esac
162- ;;
163- gutsy|hardy|intrepid|jaunty|karmic)
164- case $CPUARCH in
165- i386|amd64)
166- echo http://people.ubuntu.com/~henrik/winfoss/gutsy/kubuntu/current/kubuntu-winfoss-7.10.tar.gz
167- ;;
168- *) exit 1 ;;
169- esac
170- ;;
171- esac
172- ;;
173- edubuntu)
174- case $DIST in
175- feisty)
176- case $CPUARCH in
177- i386|amd64)
178- echo http://people.ubuntu.com/~henrik/winfoss/feisty/edubuntu/current/edubuntu-winfoss-7.04.tar.gz
179- ;;
180- *) exit 1 ;;
181- esac
182- ;;
183- gutsy|hardy|intrepid|jaunty|karmic)
184- case $CPUARCH in
185- i386|amd64)
186- echo http://people.ubuntu.com/~henrik/winfoss/gutsy/edubuntu/current/edubuntu-winfoss-7.10.tar.gz
187- ;;
188- *) exit 1 ;;
189- esac
190- ;;
191- esac
192- ;;
193- tocd3)
194- case $CPUARCH in
195- i386)
196- echo http://maitri.ubuntu.com/theopencd/tocd3/fsm/TOCD3.tgz
197- ;;
198- *) exit 1 ;;
199- esac
200- ;;
201- tocd3.1)
202- case $CPUARCH in
203- i386)
204- echo http://maitri.ubuntu.com/theopencd/winfoss/tocd3.1/current/TOCD-31.tgz
205- ;;
206- *) exit 1 ;;
207- esac
208- ;;
209- *) exit 1 ;;
210- esac
211- ;;
212 wubi)
213 case $ARCH in
214 amd64|i386)
215
216=== modified file 'bin/for-project'
217--- bin/for-project 2009-08-24 11:25:47 +0000
218+++ bin/for-project 2009-11-12 05:18:10 +0000
219@@ -48,14 +48,6 @@
220 export PROJECT=ubuntu-moblin-remix
221 export CAPPROJECT=Ubuntu-Moblin-Remix
222 ;;
223- tocd3)
224- export PROJECT=tocd3
225- export CAPPROJECT=TheOpenCDv3
226- ;;
227- tocd3.1)
228- export PROJECT=tocd3.1
229- export CAPPROJECT=TheOpenCDv3.1
230- ;;
231 *)
232 cat <<EOF >&2
233 Usage: for-project PROJECT [COMMAND ARGS...]
234@@ -71,8 +63,6 @@
235 ubuntustudio
236 mythbuntu
237 ubuntu-moblin-remix
238- tocd3
239- tocd3.1
240 EOF
241 exit 1
242 ;;
243
244=== modified file 'etc/anonftpsync'
245--- etc/anonftpsync 2006-09-15 05:36:53 +0000
246+++ etc/anonftpsync 2009-11-12 05:18:10 +0000
247@@ -9,9 +9,9 @@
248 # For a list of public mirrors, see: https://wiki.ubuntu.com/Archive
249 #
250 # RSYNC_SRC=mirnyy.ubuntu.com::ftp
251+RSYNC_SRC=us.archive.ubuntu.com::ubuntu
252
253 # Additional rsync options when synchronizing our local Ubuntu mirror before the
254-# build. Use this to exclude architectures, file types etc. that you don't need
255+# buil. Use this to exclude architectures, file types etc. that you don't need
256 # synchronized.
257-#RSYNC_EXCLUDE="--exclude **/universe --exclude **/universe/** --exclude **/multiverse --exclude **/multiverse/**"
258-
259+RSYNC_EXCLUDE="--exclude **/universe --exclude **/universe/** --exclude **/multiverse --exclude **/multiverse/** --exclude binary-amd64/ --exclude *_amd64.deb --exclude *_amd64.udeb --exclude installer-amd64/ --exclude Contents-amd64* --exclude binary-sparc/ --exclude *_sparc.deb --exclude *_sparc.udeb --exclude installer-sparc/ --exclude Contents-sparc* --exclude binary-powerpc/ --exclude *_powerpc.deb --exclude *_powerpc.udeb --exclude installer-powerpc/ --exclude Contents-powerpc* --exclude *.orig.tar.gz --exclude *.diff.gz --exclude *.dsc --exclude source/"

Subscribers

People subscribed via source and target branches

to status/vote changes: