From 9ae6878a664bb6eebf4c2839feb6b51560ac06d0 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 9 Apr 2014 07:31:47 +0000 Subject: [PATCH] Re-enabled HP-PA PALO boot preparations --- libisoburn/trunk/xorriso/emulators.c | 6 - libisoburn/trunk/xorriso/iso_img.c | 29 ---- libisoburn/trunk/xorriso/opts_d_h.c | 15 +- libisoburn/trunk/xorriso/xorriso.1 | 28 +++- libisoburn/trunk/xorriso/xorriso.info | 161 +++++++++++-------- libisoburn/trunk/xorriso/xorriso.texi | 29 +++- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisofs.1 | 27 +++- libisoburn/trunk/xorriso/xorrisofs.texi | 39 ++++- 9 files changed, 209 insertions(+), 127 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index e28b737c..c3e36ce8 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -854,18 +854,12 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -mipsel-boot FILE Set mipsel boot image name (relative to image root)", " -B FILES, -sparc-boot FILES Set sparc boot image names", " -sparc-label label text Set sparc boot disk label", - -#ifdef Libisofs_enable_unreleased_hppa_palO - " -hppa-cmdline CMDLINE Set hppa boot command line", " -hppa-kernel-32 FILE Set hppa 32-bit image name (relative to image root)", " -hppa-kernel-64 FILE Set hppa 64-bit image name (relative to image root)", " -hppa-bootloader FILE Set hppa boot loader file name (relative to image root)", " -hppa-ramdisk FILE Set hppa ramdisk file name (relative to image root)", " -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5", - -#endif /* Libisofs_enable_unreleased_hppa_palO */ - " --grub2-sparc-core FILE Set path of core file for disk label patching", " -efi-boot-part DISKFILE|--efi-boot-image", " Set data source for EFI System Partition", diff --git a/libisoburn/trunk/xorriso/iso_img.c b/libisoburn/trunk/xorriso/iso_img.c index c54124d9..00b915af 100644 --- a/libisoburn/trunk/xorriso/iso_img.c +++ b/libisoburn/trunk/xorriso/iso_img.c @@ -556,15 +556,10 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, { int i, num_boots, sa_type; char *paths[15], *line; - -#ifdef Libisofs_enable_unreleased_hppa_palO - int ret; char num[4]; char *cmdline, *bootloader, *kernel_32, *kernel_64, *ramdisk; -#endif - line= xorriso->result_line; sa_type= (xorriso->system_area_options & 0xfc) >> 2; @@ -598,9 +593,6 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, return(num_boots); } if(sa_type == 4 || sa_type == 5) { - -#ifdef Libisofs_enable_unreleased_hppa_palO - ret= iso_image_get_hppa_palo(image, &cmdline, &bootloader, &kernel_32, &kernel_64, &ramdisk); if(ret == 1) { @@ -612,9 +604,6 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, sprintf(num, "%d", sa_type); Xorriso_status_hppa(xorriso, "hdrversion", num, filter, fp, 0); } - -#endif /* ! Libisofs_enable_unreleased_hppa_palO */ - return(0); } return(0); @@ -1299,14 +1288,8 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, par[0]= par[1]= par[2]= par[3]= par[4]= NULL; if(flag & 1) { /* Give up HP-PA boot parameters */ - -#ifdef Libisofs_enable_unreleased_hppa_palO - iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4], 1); - -#endif - return(1); } if(strcmp(what, "cmdline") == 0) { @@ -1340,9 +1323,6 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); return(0); } - -#ifdef Libisofs_enable_unreleased_hppa_palO - ret= iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4], 0); if (ret < 0) { @@ -1352,15 +1332,6 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, return(0); } return(1); - -#else - - strcpy(xorriso->info_text, "HP-PA boot preparations are not yet supported"); - Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); - return(0); - -#endif /* ! Libisofs_enable_unreleased_hppa_palO */ - } diff --git a/libisoburn/trunk/xorriso/opts_d_h.c b/libisoburn/trunk/xorriso/opts_d_h.c index df7517c3..2516b189 100644 --- a/libisoburn/trunk/xorriso/opts_d_h.c +++ b/libisoburn/trunk/xorriso/opts_d_h.c @@ -1684,14 +1684,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " |\"efi_boot_part=\"|\"efi_boot_part=--efi-boot-image\"", " |\"mips_path=\"|\"mipsel_path=\"|\"mips_discard\"", " |\"sparc_label=\"|\"grub2_sparc_core=\"|\"sparc_discard\"", - -#ifdef Libisofs_enable_unreleased_hppa_palO - -" |\"hppa_cmdline=\"|\"hppa_bootloader=\"|\"hppa_kernel_32\"", -" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"|\"hppa_hdrversion\"", - -#endif - +" |\"hppa_cmdline=\"|\"hppa_bootloader=\"|\"hppa_kernel_32=\"", +" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"|\"hppa_hdrversion=\"", " |\"hfsplus_serial=\"|\"hfsplus_block_size=\"", " |\"apm_block_size=\"|\"show_status\"", " Whether to discard or keep an exiting El Torito boot image.", @@ -1706,8 +1700,9 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " efi_boot_part= is for booting EFI systems from USB stick.", " mips_path= adds Big Endian MIPS boot files. mipsel_path=", " sets one Little Endian MIPS boot file. sparc_label=", -" activates SUN Disk Label. All three are mutually exclusive", -" and exclusive to MBR production.", +" activates SUN Disk Label. hppa_* is for HP PA-RISC via PALO.", +" All four are mutually exclusive and exclusive to production", +" of MBR and to booting via EFI from USB stick.", " -append_partition partition_number type_code disk_path", " Append a prepared filesystem image after the end of the", " ISO image. Caution: Will be overwritten by multi-session.", diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index ce22589b..ed3c08b5 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Version 1.3.7, Apr 07, 2014" +.TH XORRISO 1 "Version 1.3.7, Apr 09, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -429,7 +429,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. .br There is support for further facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP\-PA. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. .br @@ -2893,7 +2893,7 @@ can assume overwriteable media. There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC\-BIOS MBR for hard\-disk\-like devices, MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation, -SUN Disk Label for SPARC machines. +SUN Disk Label for SPARC machines, HP\-PA boot sector for HP PA\-RISC machines. .br The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -3152,6 +3152,28 @@ of the given file to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit big\-endian number to byte 0x228. The size is written as 32 bit big\-endian number to byte 0x230. .br +\fBhppa_cmdline=\fRtext sets the PALO command line for HP\-PA. Up to 1023 +characters are permitted by default. With hppa_hdrversion=4 the limit is 127. +.br +Note that the first five hppa_ bootspecs are mandatory, if any of the +hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to be missing. +.br +\fBhppa_bootloader=\fRiso_rr_path designates the given path as HP\-PA +bootloader file. +.br +\fBhppa_kernel_32=\fRiso_rr_path designates the given path as HP\-PA +32 bit kernel file. +.br +\fBhppa_kernel_64=\fRiso_rr_path designates the given path as HP\-PA +64 bit kernel file. +.br +\fBhppa_ramdisk=\fRiso_rr_path designates the given path as HP\-PA +RAM disk file. +.br +\fBhppa_hdrversion=\fRnumber chooses between PALO header version 5 (default) +and version 4. +For the appropriate value see in PALO source code: PALOHDRVERSION. +.br \fBmips_discard\fR and \fBsparc_discard\fR revoke any boot file declarations made for mips or mipsel resp. sparc. This removes the ban on production of other boot blocks. diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 47adc578..cc1b2783 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -373,8 +373,8 @@ Macs for booting and for mounting. MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. There is support for further facilities: MIPS Big Endian (SGI), MIPS -Little Endian (DEC), SUN SPARC. Those are mutually not combinable and -also not combinable with MBR, GPT, or APM. +Little Endian (DEC), SUN SPARC, HP-PA. Those are mutually not +combinable and also not combinable with MBR, GPT, or APM. *ACL* are an advanced way of controlling access permissions to file objects. Neither ISO 9660 nor Rock Ridge specify a way to record ACLs. @@ -2555,7 +2555,8 @@ of the existing sessions, unless one can assume overwriteable media. There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC-BIOS MBR for hard-disk-like devices, MIPS Volume Header for old SGI computers, DEC -Boot Block for old DECstation, SUN Disk Label for SPARC machines. +Boot Block for old DECstation, SUN Disk Label for SPARC machines, HP-PA +boot sector for HP PA-RISC machines. The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -2766,6 +2767,23 @@ filesystem and announced by an MBR partition table entry. numbers are counted in bytes. The address is written as 64 bit big-endian number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. + *hppa_cmdline=*text sets the PALO command line for HP-PA. Up to + 1023 characters are permitted by default. With hppa_hdrversion=4 + the limit is 127. + Note that the first five hppa_ bootspecs are mandatory, if any of + the hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to + be missing. + *hppa_bootloader=*iso_rr_path designates the given path as HP-PA + bootloader file. + *hppa_kernel_32=*iso_rr_path designates the given path as HP-PA 32 + bit kernel file. + *hppa_kernel_64=*iso_rr_path designates the given path as HP-PA 64 + bit kernel file. + *hppa_ramdisk=*iso_rr_path designates the given path as HP-PA RAM + disk file. + *hppa_hdrversion=*number chooses between PALO header version 5 + (default) and version 4. For the appropriate value see in PALO + source code: PALOHDRVERSION. *mips_discard* and *sparc_discard* revoke any boot file declarations made for mips or mipsel resp. sparc. This removes the ban on production of other boot blocks. @@ -4909,7 +4927,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date sets timestamps in ISO image: Manip. (line 154) * -alter_date_r sets timestamps in ISO image: Manip. (line 187) * -append_partition adds arbitrary file after image end: Bootable. - (line 250) + (line 268) * -application_id sets application id: SetWrite. (line 196) * -application_use sets application use field: SetWrite. (line 262) * -as emulates mkisofs or cdrecord: Emulation. (line 13) @@ -4919,7 +4937,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -ban_stdio_write demands real drive: Loading. (line 278) * -biblio_file sets biblio file name: SetWrite. (line 244) * -blank erases media: Writing. (line 61) -* -boot_image controls bootability: Bootable. (line 26) +* -boot_image controls bootability: Bootable. (line 27) * -calm_drive reduces drive activity: Loading. (line 267) * -cd sets working directory in ISO: Navigate. (line 7) * -cdx sets working directory on disk: Navigate. (line 16) @@ -5144,10 +5162,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, set in ISO image, -setfacl_r: Manip. (line 105) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) -* APM block size: Bootable. (line 241) +* APM block size: Bootable. (line 259) * APM, _definition: Extras. (line 41) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 250) +* Appended Filesystem Image, -append_partition: Bootable. (line 268) * Automatic execution order, of arguments, -x: ArgSort. (line 16) * Backslash Interpretation, _definition: Processing. (line 52) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 217) @@ -5155,7 +5173,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 179) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) -* Bootability, control, -boot_image: Bootable. (line 26) +* Bootability, control, -boot_image: Bootable. (line 27) * Bugs, reporting: Bugreport. (line 6) * cdrecord, Emulation: Emulation. (line 118) * Character Set, _definition: Charset. (line 6) @@ -5164,13 +5182,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character Set, for output, -out_charset: SetWrite. (line 276) * Character set, learn from image, -auto_charset: Loading. (line 122) * Character Set, of terminal, -local_charset: Charset. (line 58) -* CHRP partition, _definition: Bootable. (line 160) +* CHRP partition, _definition: Bootable. (line 161) * Closed media, _definition: Media. (line 43) * Comment, #: Scripting. (line 173) * Control, signal handling, -signal_handling: Exception. (line 69) * Create, new ISO image, _definition: Methods. (line 6) -* Cylinder alignment, _definition: Bootable. (line 200) -* Cylinder size, _definition: Bootable. (line 189) +* Cylinder alignment, _definition: Bootable. (line 201) +* Cylinder size, _definition: Bootable. (line 190) * Damaged track and session, close, -close_damaged: Writing. (line 170) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) @@ -5202,7 +5220,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, write and eject, -commit_eject: Writing. (line 56) * EA, _definition: Extras. (line 65) * ECMA-119, _definition: Model. (line 6) -* EFI system partition, _definition: Bootable. (line 169) +* EFI system partition, _definition: Bootable. (line 170) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) * Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 153) @@ -5228,9 +5246,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Group, in ISO image, -chgrp_r: Manip. (line 62) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 134) -* HFS+ allocation block size: Bootable. (line 238) -* HFS+ serial number: Bootable. (line 235) +* HFS+ allocation block size: Bootable. (line 256) +* HFS+ serial number: Bootable. (line 253) * hidden, set in ISO image, -hide: Manip. (line 191) +* HP-PA boot sector, production: Bootable. (line 233) * Image reading, cache size, -data_cache_size: Loading. (line 296) * Image, _definition: Model. (line 9) * Image, demand volume ID, -assert_volid: Loading. (line 108) @@ -5280,13 +5299,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * List delimiter, _definition: Processing. (line 9) * Local Character Set, _definition: Charset. (line 11) * MBR, _definition: Extras. (line 26) -* MBR, set, -boot_image system_area=: Bootable. (line 126) +* MBR, set, -boot_image system_area=: Bootable. (line 127) * MD5, control handling, -md5: Loading. (line 183) * Media, erase, -blank: Writing. (line 61) * Media, format, -format: Writing. (line 91) * Media, list formats, -list_formats: Writing. (line 134) * Media, list write speeds, -list_speeds: Writing. (line 146) -* MIPS boot file, activation: Bootable. (line 211) +* MIPS boot file, activation: Bootable. (line 212) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) @@ -5313,15 +5332,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Ownership, global in ISO image, -uid: SetWrite. (line 282) * Ownership, in ISO image, -chown: Manip. (line 49) * Ownership, in ISO image, -chown_r: Manip. (line 54) -* Partition offset, _definition: Bootable. (line 179) -* Partition table, _definition: Bootable. (line 140) +* Partition offset, _definition: Bootable. (line 180) +* Partition table, _definition: Bootable. (line 141) * Pathspec, _definition: SetInsert. (line 120) * Pattern expansion, _definition: Processing. (line 24) * Pattern expansion, for disk paths, -disk_pattern: Insert. (line 36) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) * Permissions, in ISO image, -chmod: Manip. (line 65) * Permissions, in ISO image, -chmod_r: Manip. (line 77) -* PReP partition, _definition: Bootable. (line 164) +* PReP partition, _definition: Bootable. (line 165) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) * Process, control abort on error, -abort_on: Exception. (line 27) @@ -5380,10 +5399,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Session, mount parameters, -mount_opts: Inquiry. (line 68) * Session, select as input, -load: Loading. (line 35) * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) -* SUN Disk Label, production: Bootable. (line 222) -* SUN SPARC boot images, activation: Bootable. (line 271) +* SUN Disk Label, production: Bootable. (line 223) +* SUN SPARC boot images, activation: Bootable. (line 289) * Symbolic link, create, -lns: Insert. (line 176) -* System area, _definition: Bootable. (line 126) +* System area, _definition: Bootable. (line 127) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 238) * Table-of-content, show, -toc: Inquiry. (line 28) * Timestamps, set in ISO image, -alter_date: Manip. (line 154) @@ -5399,7 +5418,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, file tree checksums, -check_md5_r: Verify. (line 174) * Verify, preset -check_media, -check_media_defaults: Verify. (line 41) * Write, block size, -dvd_obs: SetWrite. (line 333) -* Write, bootability, -boot_image: Bootable. (line 26) +* Write, bootability, -boot_image: Bootable. (line 27) * Write, buffer syncing, -stdio_sync: SetWrite. (line 340) * Write, close media, -close: SetWrite. (line 359) * Write, compliance to specs, -compliance: SetWrite. (line 58) @@ -5435,53 +5454,53 @@ Node: Media6311 Node: Methods8982 Node: Drives11557 Node: Extras15099 -Node: Processing19551 -Node: Dialog23171 -Node: Commands24849 -Node: ArgSort26526 -Node: AqDrive28018 -Node: Loading31063 -Node: Insert47992 -Node: SetInsert58206 -Node: Manip66783 -Node: CmdFind76563 -Node: Filter93164 -Node: Writing97720 -Node: SetWrite107851 -Node: Bootable128557 -Node: Jigdo145023 -Node: Charset149270 -Node: Exception152585 -Node: DialogCtl158705 -Node: Inquiry161303 -Node: Navigate167620 -Node: Verify175918 -Node: Restore185182 -Node: Emulation192269 -Node: Scripting202657 -Node: Frontend210428 -Node: Examples220035 -Node: ExDevices221213 -Node: ExCreate221879 -Node: ExDialog223164 -Node: ExGrowing224429 -Node: ExModifying225234 -Node: ExBootable225738 -Node: ExCharset226290 -Node: ExPseudo227182 -Node: ExCdrecord228080 -Node: ExMkisofs228397 -Node: ExGrowisofs229737 -Node: ExException230872 -Node: ExTime231326 -Node: ExIncBackup231785 -Node: ExRestore235765 -Node: ExRecovery236698 -Node: Files237268 -Node: Seealso238567 -Node: Bugreport239290 -Node: Legal239871 -Node: CommandIdx240882 -Node: ConceptIdx257544 +Node: Processing19558 +Node: Dialog23178 +Node: Commands24856 +Node: ArgSort26533 +Node: AqDrive28025 +Node: Loading31070 +Node: Insert47999 +Node: SetInsert58213 +Node: Manip66790 +Node: CmdFind76570 +Node: Filter93171 +Node: Writing97727 +Node: SetWrite107858 +Node: Bootable128564 +Node: Jigdo145931 +Node: Charset150178 +Node: Exception153493 +Node: DialogCtl159613 +Node: Inquiry162211 +Node: Navigate168528 +Node: Verify176826 +Node: Restore186090 +Node: Emulation193177 +Node: Scripting203565 +Node: Frontend211336 +Node: Examples220943 +Node: ExDevices222121 +Node: ExCreate222787 +Node: ExDialog224072 +Node: ExGrowing225337 +Node: ExModifying226142 +Node: ExBootable226646 +Node: ExCharset227198 +Node: ExPseudo228090 +Node: ExCdrecord228988 +Node: ExMkisofs229305 +Node: ExGrowisofs230645 +Node: ExException231780 +Node: ExTime232234 +Node: ExIncBackup232693 +Node: ExRestore236673 +Node: ExRecovery237606 +Node: Files238176 +Node: Seealso239475 +Node: Bugreport240198 +Node: Legal240779 +Node: CommandIdx241790 +Node: ConceptIdx258452  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 792bcf0d..9e04dfe4 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/xorriso/xorriso.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Version 1.3.7, Apr 07, 2014" +@c man .TH XORRISO 1 "Version 1.3.7, Apr 09, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -571,7 +571,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. @* There is support for further facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP-PA. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. @* @@ -3406,7 +3406,7 @@ can assume overwriteable media. There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC-BIOS MBR for hard-disk-like devices, MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation, -SUN Disk Label for SPARC machines. +SUN Disk Label for SPARC machines, HP-PA boot sector for HP PA-RISC machines. @* The boot firmware EFI may use programs which are located in a FAT filesystem and announced by an MBR partition table entry. @@ -3684,6 +3684,29 @@ of the given file to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit big-endian number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. @* +@cindex HP-PA boot sector, production +@strong{hppa_cmdline=}text sets the PALO command line for HP-PA. Up to 1023 +characters are permitted by default. With hppa_hdrversion=4 the limit is 127. +@* +Note that the first five hppa_ bootspecs are mandatory, if any of the +hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to be missing. +@* +@strong{hppa_bootloader=}iso_rr_path designates the given path as HP-PA +bootloader file. +@* +@strong{hppa_kernel_32=}iso_rr_path designates the given path as HP-PA +32 bit kernel file. +@* +@strong{hppa_kernel_64=}iso_rr_path designates the given path as HP-PA +64 bit kernel file. +@* +@strong{hppa_ramdisk=}iso_rr_path designates the given path as HP-PA +RAM disk file. +@* +@strong{hppa_hdrversion=}number chooses between PALO header version 5 (default) +and version 4. +For the appropriate value see in PALO source code: PALOHDRVERSION. +@* @strong{mips_discard} and @strong{sparc_discard} revoke any boot file declarations made for mips or mipsel resp. sparc. This removes the ban on production of other boot blocks. diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 078dcaca..154d4e50 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2014.04.08.094441" +#define Xorriso_timestamP "2014.04.09.073038" diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 44e83522..5967f25e 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/xorriso/xorrisofs.1 @@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISOFS 1 "Version 1.3.7, Apr 07, 2014" +.TH XORRISOFS 1 "Version 1.3.7, Apr 09, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1014,7 +1014,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. .br \fBxorrisofs\fR supports further boot facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP\-PA. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. .br @@ -1209,6 +1209,29 @@ to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit big\-endian number to byte 0x228. The size is written as 32 bit big\-endian number to byte 0x230. .TP +\fB\-hppa-cmdline\fR text +Set the PALO command line for HP\-PA. Up to 1023 characters are permitted +by default. With \-hppa\-hdrversion 4 the limit is 127. +.br +Note that the first five \-hppa options are mandatory, if any of the \-hppa +options is given. Only option \-hppa\-hdrversion is allowed to be missing. +.TP +\fB\-hppa-bootloader\fR iso_rr_path +Designate the given path as HP\-PA bootloader file. +.TP +\fB\-hppa-kernel-32\fR iso_rr_path +Designate the given path as HP\-PA 32 bit kernel file. +.TP +\fB\-hppa-kernel-64\fR iso_rr_path +Designate the given path as HP\-PA 64 bit kernel file. +.TP +\fB\-hppa-ramdisk\fR iso_rr_path +Designate the given path as HP\-PA RAM disk file. +.TP +\fB\-hppa-hdrversion\fR number +Choose between PALO header version 5 (default) and version 4. +For the appropriate value see in PALO source code: PALOHDRVERSION. +.TP .B Character sets: .PP Character sets should not matter as long as only english alphanumeric diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index 4e9aafba..0dc671fd 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/xorriso/xorrisofs.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISOFS 1 "Version 1.3.7, Apr 07, 2014" +@c man .TH XORRISOFS 1 "Version 1.3.7, Apr 09, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1386,7 +1386,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. @* @command{xorrisofs} supports further boot facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP-PA. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. @* @@ -1625,6 +1625,41 @@ Cause the content address and size of the given data file in the image to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit big-endian number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. +@c man .TP +@item -hppa-cmdline text +@kindex -hppa-cmdline HP-PA PALO command line +@cindex Bootability, control, -hppa-cmdline +Set the PALO command line for HP-PA. Up to 1023 characters are permitted +by default. With -hppa-hdrversion 4 the limit is 127. +@* +Note that the first five -hppa options are mandatory, if any of the -hppa +options is given. Only option -hppa-hdrversion is allowed to be missing. +@c man .TP +@item -hppa-bootloader iso_rr_path +@kindex -hppa-bootloader HP-PA bootloader file +@cindex Bootability, control, -hppa-bootloader +Designate the given path as HP-PA bootloader file. +@c man .TP +@item -hppa-kernel-32 iso_rr_path +@kindex -hppa-kernel_32 HP-PA kernel_32 file +@cindex Bootability, control, -hppa-kernel_32 +Designate the given path as HP-PA 32 bit kernel file. +@c man .TP +@item -hppa-kernel-64 iso_rr_path +@kindex -hppa-kernel_64 HP-PA kernel_64 file +@cindex Bootability, control, -hppa-kernel_64 +Designate the given path as HP-PA 64 bit kernel file. +@c man .TP +@item -hppa-ramdisk iso_rr_path +@kindex -hppa-ramdisk HP-PA ramdisk file +@cindex Bootability, control, -hppa-ramdisk +Designate the given path as HP-PA RAM disk file. +@c man .TP +@item -hppa-hdrversion number +@kindex -hppa-hdrversion HP-PA PALO header version +@cindex Bootability, control, -hppa-hdrversion +Choose between PALO header version 5 (default) and version 4. +For the appropriate value see in PALO source code: PALOHDRVERSION. @end table @c man .TP @c man .B Character sets: