Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1343 - in trunk: . targets/support
Date: Thu, 28 Feb 2008 17:59:46
Message-Id: E1JUn2l-0004yK-I1@stork.gentoo.org
1 Author: wolf31o2
2 Date: 2008-02-28 17:59:42 +0000 (Thu, 28 Feb 2008)
3 New Revision: 1343
4
5 Modified:
6 trunk/ChangeLog
7 trunk/targets/support/bootloader-setup.sh
8 trunk/targets/support/create-iso.sh
9 Log:
10 Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match, no matter what.
11
12 Modified: trunk/ChangeLog
13 ===================================================================
14 --- trunk/ChangeLog 2008-02-28 17:33:29 UTC (rev 1342)
15 +++ trunk/ChangeLog 2008-02-28 17:59:42 UTC (rev 1343)
16 @@ -2,6 +2,11 @@
17 # $Id: $
18
19 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
20 + targets/support/bootloader-setup.sh, targets/support/create-iso.sh:
21 + Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match,
22 + no matter what.
23 +
24 + 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
25 targets/support/bootloader-setup.sh:
26 Let's change our splash checking to a global check so it only needs to be
27 done once. This makes much more sense than having all of those if ... else
28
29 Modified: trunk/targets/support/bootloader-setup.sh
30 ===================================================================
31 --- trunk/targets/support/bootloader-setup.sh 2008-02-28 17:33:29 UTC (rev 1342)
32 +++ trunk/targets/support/bootloader-setup.sh 2008-02-28 17:59:42 UTC (rev 1343)
33 @@ -48,57 +48,20 @@
34 echo "--bootloader=boot/iplboot" >> ${icfg}
35 echo "--ramdisk=boot/${first}.igz" >> ${icfg}
36 ;;
37 - ppc)
38 + ppc*|powerpc*)
39 # NO SOFTLEVEL SUPPORT YET
40 icfg=$1/boot/yaboot.conf
41 kmsg=$1/boot/boot.msg
42
43 - echo "default ${first}" > ${icfg}
44 - echo "timeout 300" >> ${icfg}
45 echo "device=cd:" >> ${icfg}
46 echo "root=/dev/ram" >> ${icfg}
47 echo "fgcolor=white" >> ${icfg}
48 echo "bgcolor=black" >> ${icfg}
49 echo "message=/boot/boot.msg" >> ${icfg}
50 -
51 - # Here is where I fix up the boot.msg file.
52 - sed -e 's/ARCH/PowerPC/' \
53 - -e 's/HARDWARE/32-bit Apple and Pegasos hardware/' \
54 - -i $kmsg
55 -
56 - # Here we wipe out the /ppc directory, if it exists.
57 - rm -rf $1/ppc
58 -
59 - for x in ${clst_boot_kernel}
60 - do
61 - eval custom_kopts=\$${x}_kernelopts
62 - echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
63 - echo "image=/boot/${x}" >> ${icfg}
64 -
65 - if [ -e "$1/boot/${x}.igz" ]
66 - then
67 - echo "initrd=/boot/${x}.igz" >> ${icfg}
68 - fi
69 -
70 - echo "label=${x}" >> ${icfg}
71 - echo "read-write" >> ${icfg}
72 - echo "append=\"${default_append_line}\"" >> ${icfg}
73 - done
74 - ;;
75 - ppc64)
76 - # NO SOFTLEVEL SUPPORT YET
77 - icfg=$1/boot/yaboot.conf
78 - kmsg=$1/boot/boot.msg
79 -
80 - echo "device=cd:" >> ${icfg}
81 - echo "root=/dev/ram" >> ${icfg}
82 - echo "fgcolor=white" >> ${icfg}
83 - echo "bgcolor=black" >> ${icfg}
84 - echo "message=/boot/boot.msg" >> ${icfg}
85
86 # Here is where I fix up the boot.msg file.
87 sed -e 's/ARCH/PowerPC/' \
88 - -e 's/HARDWARE/64-bit Apple and IBM hardware/' \
89 + -e 's/HARDWARE/Apple and IBM hardware/' \
90 -i $kmsg
91
92 # Setup the IBM yaboot.conf
93 @@ -163,6 +126,8 @@
94 echo "append=\"${default_append_line}\"" >> ${etc_icfg}
95 fi
96 else
97 + # Here we wipe out the /ppc directory, if it exists.
98 + rm -rf $1/ppc
99 if [ -n "${clst_kernel_console}" ]
100 then
101 echo >> ${icfg}
102
103 Modified: trunk/targets/support/create-iso.sh
104 ===================================================================
105 --- trunk/targets/support/create-iso.sh 2008-02-28 17:33:29 UTC (rev 1342)
106 +++ trunk/targets/support/create-iso.sh 2008-02-28 17:59:42 UTC (rev 1343)
107 @@ -49,12 +49,9 @@
108 mips)
109 clst_iso_volume_id="Gentoo Linux - MIPS"
110 ;;
111 - ppc)
112 - clst_iso_volume_id="Gentoo Linux - PPC"
113 + ppc*|powerpc*)
114 + clst_iso_volume_id="Gentoo Linux - PowerPC"
115 ;;
116 - ppc64)
117 - clst_iso_volume_id="Gentoo Linux - PPC64"
118 - ;;
119 s390)
120 clst_iso_volume_id="Gentoo Linux - S390"
121 ;;
122 @@ -65,7 +62,7 @@
123 clst_iso_volume_id="Gentoo Linux - SPARC"
124 ;;
125 x86)
126 - clst_iso_volume_id="Gentoo Linux - X86"
127 + clst_iso_volume_id="Gentoo Linux - x86"
128 ;;
129 *)
130 clst_iso_volume_id="Catalyst LiveCD"
131 @@ -74,46 +71,27 @@
132 esac
133 fi
134
135 +if [ "${clst_fstype}" == "zisofs" ]
136 +then
137 + mkisofs_opts="-J -z -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
138 +else
139 + mkisofs_opts="-J -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
140 +fi
141 +
142 # Here we actually create the ISO images for each architecture
143 case ${clst_hostarch} in
144 alpha)
145 - case ${clst_fstype} in
146 - zisofs)
147 - echo "Running mkisofs to create iso image...."
148 - echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o \
149 - ${1} ${clst_target_path}"
150 - mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \
151 - ${clst_target_path} || die "Cannot make ISO image"
152 - ;;
153 - *)
154 - echo "Running mkisofs to create iso image...."
155 - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \
156 - ${clst_target_path}"
157 - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \
158 - ${clst_target_path} || die "Cannot make ISO image"
159 - ;;
160 - esac
161 + echo ">> Running mkisofs to create iso image...."
162 + echo ">> mkisofs -R -l ${mkisofs_opts}"
163 + mkisofs -R -l ${mkisofs_opts} || die "Cannot make ISO image"
164 isomarkboot ${1} /boot/bootlx
165 ;;
166 arm)
167 ;;
168 hppa)
169 - case ${clst_fstype} in
170 - zisofs)
171 - echo "Running mkisofs to create iso image...."
172 - echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o \
173 - ${1} ${clst_target_path}"
174 - mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \
175 - ${clst_target_path} || die "Cannot make ISO image"
176 - ;;
177 - *)
178 - echo "Running mkisofs to create iso image...."
179 - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \
180 - ${clst_target_path}"
181 - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \
182 - ${clst_target_path} || die "Cannot make ISO image"
183 - ;;
184 - esac
185 + echo ">> Running mkisofs to create iso image...."
186 + echo ">> mkisofs -R -l ${mkisofs_opts}"
187 + mkisofs -R -l ${mkisofs_opts} || die "Cannot make ISO image"
188 palo -f boot/palo.conf -C ${1}
189 ;;
190 ia64)
191 @@ -144,12 +122,9 @@
192 echo '>> Removing /boot...'
193 rm -rf ${clst_target_path}/boot
194
195 - echo '>> Generating ISO...'
196 - echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} -b \
197 - gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}"
198 - mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c \
199 - boot.cat -no-emul-boot \
200 - ${clst_target_path} || die "Cannot make ISO image"
201 + echo ">> Running mkisofs to create iso image...."
202 + echo ">> mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot ${mkisofs_opts}"
203 + mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot ${mkisofs_opts} || die "Cannot make ISO image"
204 ;;
205 mips)
206 case ${clst_fstype} in
207 @@ -205,40 +180,10 @@
208 # o= output image (burnable to CD; readable by fdisk)
209 /usr/bin/sgibootcd c=${cfg} o=${clst_iso}
210 ;;
211 - *) die "SGI LiveCDs only support the 'normal' fstype!" ;;
212 + *) die "SGI LiveCD(s) only support the 'squashfs' fstype!" ;;
213 esac
214 ;;
215 - ppc)
216 - case ${clst_fstype} in
217 - zisofs)
218 - echo "Running mkisofs to create iso image...."
219 - echo "mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe \
220 - -map ${clst_target_path}boot/map.hfs -part -no-desktop \
221 - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
222 - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \
223 - ${1} ${clst_target_path}"
224 - mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe -map \
225 - ${clst_target_path}boot/map.hfs -part -no-desktop \
226 - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \
227 - ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \
228 - ${1} ${clst_target_path} || die "Cannot make ISO image"
229 - ;;
230 - *)
231 - echo "Running mkisofs to create iso image...."
232 - echo "mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \
233 - ${clst_target_path}boot/map.hfs -part -no-desktop \
234 - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
235 - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \
236 - ${1} ${clst_target_path}"
237 - mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \
238 - ${clst_target_path}boot/map.hfs -part -no-desktop \
239 - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \
240 - ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \
241 - ${1} ${clst_target_path} || die "Cannot make ISO image"
242 - ;;
243 - esac
244 - ;;
245 - ppc64)
246 + ppc*|powerpc*)
247 if [ -f ${clst_target_path}/ppc/bootinfo.txt ]
248 then
249 echo "bootinfo.txt found .. updating it"
250 @@ -250,38 +195,9 @@
251 ${clst_target_path}/ppc/bootinfo.txt
252 fi
253
254 - case ${clst_fstype} in
255 - zisofs)
256 - echo "Running mkisofs to create iso image...."
257 - echo "mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
258 - mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map \
259 - ${clst_target_path}boot/map.hfs -part -no-desktop \
260 - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \
261 - ${clst_target_path}boot -hide-hfs "zisofs" -hide-hfs "stages" \
262 - -hide-hfs "distfiles" -hide-hfs "snapshots" \
263 - -V "${clst_iso_volume_id}" -o \
264 - ${1} ${clst_target_path} || die "Cannot make ISO image"
265 - ;;
266 - *)
267 - echo "Running mkisofs to create iso image...."
268 - echo "mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \
269 - ${clst_target_path}boot/map.hfs -part -no-desktop \
270 - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
271 - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" \
272 - -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" \
273 - -hide-hfs \"image.loop\" -hide-hfs \"image.squashfs\" -hide-hfs \"image.jffs\" \
274 - -hide-hfs \"image.cramfs\" \
275 - -o ${1} ${clst_target_path}"
276 - mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \
277 - ${clst_target_path}boot/map.hfs -part -no-desktop \
278 - -hfs-volid "${clst_iso_volume_id}" -hfs-bless \
279 - ${clst_target_path}boot -V "${clst_iso_volume_id}" \
280 - -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" \
281 - -hide-hfs "image.loop" -hide-hfs "image.squashfs" -hide-hfs "image.jffs" \
282 - -hide-hfs "image.cramfs" \
283 - -o ${1} ${clst_target_path} || die "Cannot make ISO image"
284 - ;;
285 - esac
286 + echo ">> Running mkisofs to create iso image...."
287 + echo ">> mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" ${mkisofs_opts}"
288 + mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" ${mkisofs_opts} || die "Cannot make ISO image"
289 ;;
290 sparc*)
291 # Old silo (<=1.2.6) requires a specially built mkisofs
292
293 --
294 gentoo-commits@l.g.o mailing list