| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-03-05 17:29:47 +0000 (Wed, 05 Mar 2008) |
| 3 |
New Revision: 1356 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/support/create-iso.sh |
| 8 |
Log: |
| 9 |
Removed any further checks for clst_fstype and making sure everybody is using ${mkisofs_zisofs_opts}. |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-03-05 17:03:09 UTC (rev 1355) |
| 14 |
+++ trunk/ChangeLog 2008-03-05 17:29:47 UTC (rev 1356) |
| 15 |
@@ -2,6 +2,11 @@ |
| 16 |
# $Id: $ |
| 17 |
|
| 18 |
05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
| 19 |
+ targets/support/create-iso.sh: |
| 20 |
+ Removed any further checks for clst_fstype and making sure everybody is |
| 21 |
+ using ${mkisofs_zisofs_opts}. |
| 22 |
+ |
| 23 |
+ 05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
| 24 |
targets/support/livecdfs-update.sh: |
| 25 |
The default theme for GNOME is now Clearlooks, so we can remove the theme |
| 26 |
code, but we still want to set the font size. |
| 27 |
|
| 28 |
Modified: trunk/targets/support/create-iso.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/support/create-iso.sh 2008-03-05 17:03:09 UTC (rev 1355) |
| 31 |
+++ trunk/targets/support/create-iso.sh 2008-03-05 17:29:47 UTC (rev 1356) |
| 32 |
@@ -13,7 +13,7 @@ |
| 33 |
;; |
| 34 |
*) |
| 35 |
cdmaker="mkisofs" |
| 36 |
- cdmakerpkg="app-cdr/cdrtools" |
| 37 |
+ cdmakerpkg="app-cdr/cdrkit or app/cdr-cdrtools" |
| 38 |
;; |
| 39 |
esac |
| 40 |
|
| 41 |
@@ -206,50 +206,14 @@ |
| 42 |
if [ -x ${clst_target_path}/boot/mkisofs.sparc.fu ] |
| 43 |
then |
| 44 |
mv ${clst_target_path}/boot/mkisofs.sparc.fu /tmp |
| 45 |
- case ${clst_fstype} in |
| 46 |
- zisofs) |
| 47 |
- echo "Running mkisofs.sparc.fu to create iso image...." |
| 48 |
- echo "/tmp/mkisofs.sparc.fu -z -o ${1} -D -r -pad -quiet -S \ |
| 49 |
- 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'" |
| 50 |
- echo "-V \"${clst_iso_volume_id}\" ${clst_target_path}" |
| 51 |
- /tmp/mkisofs.sparc.fu -z -o ${1} -D -r -pad -quiet -S 'boot/cd.b' \ |
| 52 |
- -B '/boot/second.b' -s '/boot/silo.conf'\ |
| 53 |
- -V "${clst_iso_volume_id}" ${clst_target_path} \ |
| 54 |
- || die "Cannot make ISO image" |
| 55 |
- ;; |
| 56 |
- *) |
| 57 |
- echo "Running mkisofs.sparc.fu to create iso image...." |
| 58 |
- echo "/tmp/mkisofs.sparc.fu -o ${1} -D -r -pad -quiet -S \ |
| 59 |
- 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'" |
| 60 |
- echo "-V \"${clst_iso_volume_id}\" ${clst_target_path}" |
| 61 |
- /tmp/mkisofs.sparc.fu -o ${1} -D -r -pad -quiet -S 'boot/cd.b' \ |
| 62 |
- -B '/boot/second.b' -s '/boot/silo.conf'\ |
| 63 |
- -V "${clst_iso_volume_id}" ${clst_target_path} \ |
| 64 |
- || die "Cannot make ISO image" |
| 65 |
- ;; |
| 66 |
- esac |
| 67 |
+ echo "Running mkisofs.sparc.fu to create iso image...." |
| 68 |
+ echo "/tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V \"${clst_iso_volume_id}\" ${clst_target_path}" |
| 69 |
+ /tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V "${clst_iso_volume_id}" ${clst_target_path} || die "Cannot make ISO image" |
| 70 |
rm /tmp/mkisofs.sparc.fu |
| 71 |
else |
| 72 |
- case ${clst_fstype} in |
| 73 |
- zisofs) |
| 74 |
- echo "Running mkisofs to create iso image...." |
| 75 |
- echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o ${1} \ |
| 76 |
- -G \"${clst_target_path}/boot/isofs.b\" -B ... \ |
| 77 |
- ${clst_target_path}" |
| 78 |
- mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \ |
| 79 |
- -G "${clst_target_path}/boot/isofs.b" -B ... \ |
| 80 |
- ${clst_target_path} || die "CAnnot make ISO image" |
| 81 |
- ;; |
| 82 |
- *) |
| 83 |
- echo "Running mkisofs to create iso image...." |
| 84 |
- echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \ |
| 85 |
- -G \"${clst_target_path}/boot/isofs.b\" -B ... \ |
| 86 |
- ${clst_target_path}" |
| 87 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ |
| 88 |
- -G "${clst_target_path}/boot/isofs.b" -B ... \ |
| 89 |
- ${clst_target_path} || die "CAnnot make ISO image" |
| 90 |
- ;; |
| 91 |
- esac |
| 92 |
+ echo "Running mkisofs to create iso image...." |
| 93 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -G \"${clst_target_path}/boot/isofs.b\" -B ... ${clst_target_path}" |
| 94 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -G "${clst_target_path}/boot/isofs.b" -B ... ${clst_target_path} || die "CAnnot make ISO image" |
| 95 |
fi |
| 96 |
|
| 97 |
;; |
| 98 |
@@ -296,151 +260,32 @@ |
| 99 |
mv ${clst_target_path}/boot/* ${clst_target_path}/isolinux |
| 100 |
rm -r ${clst_target_path}/boot |
| 101 |
echo "Creating ISO using ISOLINUX bootloader" |
| 102 |
- case ${clst_fstype} in |
| 103 |
- zisofs) |
| 104 |
- echo "mkisofs -J -R -l -V \ |
| 105 |
- \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 106 |
- isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 107 |
- -no-emul-boot -boot-load-size 4 \ |
| 108 |
- -boot-info-table -z ${clst_target_path}" |
| 109 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ |
| 110 |
- ${1} -b isolinux/isolinux.bin -c \ |
| 111 |
- isolinux/boot.cat -no-emul-boot \ |
| 112 |
- -boot-load-size 4 -boot-info-table -z \ |
| 113 |
- ${clst_target_path} \ |
| 114 |
- || die "Cannot make ISO image" |
| 115 |
- ;; |
| 116 |
- *) |
| 117 |
- echo "mkisofs -J -R -l -V \ |
| 118 |
- \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 119 |
- isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 120 |
- -no-emul-boot -boot-load-size 4 \ |
| 121 |
- -boot-info-table ${clst_target_path}" |
| 122 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ |
| 123 |
- ${1} -b isolinux/isolinux.bin -c \ |
| 124 |
- isolinux/boot.cat -no-emul-boot \ |
| 125 |
- -boot-load-size 4 -boot-info-table \ |
| 126 |
- ${clst_target_path} \ |
| 127 |
- || die "Cannot make ISO image" |
| 128 |
- ;; |
| 129 |
- esac |
| 130 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}" |
| 131 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image" |
| 132 |
elif [ -e ${clst_target_path}/gentoo.efimg ] |
| 133 |
then |
| 134 |
echo "Creating ISO using both ISOLINUX and EFI bootloader" |
| 135 |
- case ${clst_fstype} in |
| 136 |
- zisofs) |
| 137 |
- echo "mkisofs -J -R -l -V \ |
| 138 |
- \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 139 |
- isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 140 |
- -no-emul-boot -boot-load-size 4 \ |
| 141 |
- -boot-info-table -eltorito-alt-boot -b \ |
| 142 |
- gentoo.efimg -c boot.cat \ |
| 143 |
- -no-emul-boot -z ${clst_target_path}" |
| 144 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ |
| 145 |
- ${1} -b isolinux/isolinux.bin -c \ |
| 146 |
- isolinux/boot.cat -no-emul-boot \ |
| 147 |
- -boot-load-size 4 -boot-info-table \ |
| 148 |
- -eltorito-alt-boot -b gentoo.efimg -c \ |
| 149 |
- boot.cat -no-emul-boot -z ${clst_target_path} \ |
| 150 |
- || die "Cannot make ISO image" |
| 151 |
- ;; |
| 152 |
- *) |
| 153 |
- echo "mkisofs -J -R -l -V \ |
| 154 |
- \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 155 |
- isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 156 |
- -no-emul-boot -boot-load-size 4 \ |
| 157 |
- -boot-info-table -eltorito-alt-boot -b \ |
| 158 |
- gentoo.efimg -c boot.cat \ |
| 159 |
- -no-emul-boot ${clst_target_path}" |
| 160 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ |
| 161 |
- ${1} -b isolinux/isolinux.bin -c \ |
| 162 |
- isolinux/boot.cat -no-emul-boot \ |
| 163 |
- -boot-load-size 4 -boot-info-table \ |
| 164 |
- -eltorito-alt-boot -b gentoo.efimg -c boot.cat \ |
| 165 |
- -no-emul-boot ${clst_target_path} \ |
| 166 |
- || die "Cannot make ISO image" |
| 167 |
- ;; |
| 168 |
- esac |
| 169 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z ${clst_target_path}" |
| 170 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z ${clst_target_path} || die "Cannot make ISO image" |
| 171 |
fi |
| 172 |
else |
| 173 |
echo "Creating ISO using ISOLINUX bootloader" |
| 174 |
- case ${clst_fstype} in |
| 175 |
- zisofs) |
| 176 |
- echo "mkisofs -J -R -l -V \ |
| 177 |
- \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 178 |
- isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 179 |
- -no-emul-boot -boot-load-size 4 \ |
| 180 |
- -boot-info-table -z ${clst_target_path}" |
| 181 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ |
| 182 |
- ${1} -b isolinux/isolinux.bin -c \ |
| 183 |
- isolinux/boot.cat -no-emul-boot \ |
| 184 |
- -boot-load-size 4 -boot-info-table -z \ |
| 185 |
- ${clst_target_path} \ |
| 186 |
- || die "Cannot make ISO image" |
| 187 |
- ;; |
| 188 |
- *) |
| 189 |
- echo "mkisofs -J -R -l -V \ |
| 190 |
- \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 191 |
- isolinux/isolinux.bin -c isolinux/boot.cat \ |
| 192 |
- -no-emul-boot -boot-load-size 4 \ |
| 193 |
- -boot-info-table ${clst_target_path}" |
| 194 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o \ |
| 195 |
- ${1} -b isolinux/isolinux.bin -c \ |
| 196 |
- isolinux/boot.cat -no-emul-boot \ |
| 197 |
- -boot-load-size 4 -boot-info-table \ |
| 198 |
- ${clst_target_path} \ |
| 199 |
- || die "Cannot make ISO image" |
| 200 |
- ;; |
| 201 |
- esac |
| 202 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}" |
| 203 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image" |
| 204 |
fi |
| 205 |
elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ] |
| 206 |
then |
| 207 |
echo "Creating ISO using GRUB bootloader" |
| 208 |
- case ${clst_fstype} in |
| 209 |
- zisofs) |
| 210 |
- echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ |
| 211 |
- ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat \ |
| 212 |
- -no-emul-boot -boot-load-size 4 -boot-info-table -z \ |
| 213 |
- ${clst_target_path}" |
| 214 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b \ |
| 215 |
- boot/grub/stage2_eltorito -c boot/boot.cat \ |
| 216 |
- -no-emul-boot -boot-load-size 4 -boot-info-table -z \ |
| 217 |
- ${clst_target_path} || die "Cannot make ISO image" |
| 218 |
- ;; |
| 219 |
- *) |
| 220 |
- echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ |
| 221 |
- ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat \ |
| 222 |
- -no-emul-boot -boot-load-size 4 -boot-info-table \ |
| 223 |
- ${clst_target_path}" |
| 224 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b \ |
| 225 |
- boot/grub/stage2_eltorito -c boot/boot.cat \ |
| 226 |
- -no-emul-boot -boot-load-size 4 -boot-info-table \ |
| 227 |
- ${clst_target_path} || die "Cannot make ISO image" |
| 228 |
- ;; |
| 229 |
- esac |
| 230 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}" |
| 231 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image" |
| 232 |
elif [ -e ${clst_target_path}/gentoo.efimg ] |
| 233 |
then |
| 234 |
echo 'Creating ISO using EFI bootloader' |
| 235 |
- echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} -b \ |
| 236 |
- gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" |
| 237 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b \ |
| 238 |
- gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} \ |
| 239 |
- || die "Cannot make ISO image" |
| 240 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" |
| 241 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image" |
| 242 |
else |
| 243 |
- case ${clst_fstype} in |
| 244 |
- zisofs) |
| 245 |
- echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ |
| 246 |
- ${1} -z ${clst_target_path}" |
| 247 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ |
| 248 |
- -z ${clst_target_path} || die "Cannot make ISO image" |
| 249 |
- ;; |
| 250 |
- *) |
| 251 |
- echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o \ |
| 252 |
- ${1} ${clst_target_path}" |
| 253 |
- mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \ |
| 254 |
- ${clst_target_path} || die "Cannot make ISO image" |
| 255 |
- ;; |
| 256 |
- esac |
| 257 |
+ echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}" |
| 258 |
+ mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image" |
| 259 |
fi |
| 260 |
;; |
| 261 |
esac |
| 262 |
|
| 263 |
-- |
| 264 |
gentoo-commits@l.g.o mailing list |
Archives