diff --git a/xorriso/emulators.c b/xorriso/emulators.c index 12d48b8e..a4ee58e0 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2013 Thomas Schmitt, + Copyright 2007-2014 Thomas Schmitt, Provided under GPL version 2 or later. @@ -635,6 +635,8 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv, "-rr_reloc_dir", "-hfsplus-serial-no", "-prep-boot-part", "-efi-boot-part", "-hfsplus-block-size", "-apm-block-size", "--grub2-mbr", "--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns", + "-hppa-bootloader", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64", + "-hppa-ramdisk", "" }; static char arg2_options[][41]= { @@ -853,6 +855,11 @@ 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", +" -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)", " --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", @@ -1782,7 +1789,8 @@ not_enough_args:; strcmp(argpt, "-partition_sec_hd") == 0 || strcmp(argpt, "-partition_cyl_align") == 0 || strcmp(argpt, "-isohybrid-mbr") == 0 || - strcmp(argpt, "--grub2-mbr") == 0) { + strcmp(argpt, "--grub2-mbr") == 0 || + strncmp(argpt, "-hppa-", 6) == 0) { if(i+1>=argc) goto not_enough_args; delay_opt_list[delay_opt_count++]= i; @@ -2412,6 +2420,18 @@ problem_handler_2:; if(ret <= 0) goto problem_handler_boot; + } else if(strncmp(argpt, "-hppa-", 6) == 0) { + if(i + 1 >= argc) + goto not_enough_args; + i++; + sprintf(sfe, "-as mkisofs %s %s", argpt, argv[i]); + ret= Xorriso_coordinate_system_area(xorriso, 4, 0, sfe, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_set_hppa_boot_parm(xorriso, argv[i], argpt + 6, 0); + if(ret <= 0) + goto problem_handler_boot; + } else if(strcmp(argpt, "-hfs-bless") == 0) { static char *bless_arg_data[6]= { "/", "-disk_path", "", "-exec", "set_hfs_bless", "p"}; diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 2f72f5ee..ec53660d 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2014.01.14.090320" +#define Xorriso_timestamP "2014.01.14.091348" diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index 7269d1b5..e6eb1b80 100644 --- a/xorriso/xorrisofs.1 +++ b/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.5, Dec 16, 2013" +.TH XORRISOFS 1 "Version 1.3.5, Jan 14, 2014" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1206,6 +1206,24 @@ 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 127 characters are permitted. +.br +Note that if one of the \-hppa options is given, then the other four +must be given with valid parameters, too. +.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 .B Character sets: .PP Character sets should not matter as long as only english alphanumeric @@ -1831,7 +1849,7 @@ Thomas Schmitt .br for libburnia\-project.org .SH COPYRIGHT -Copyright (c) 2011 \- 2013 Thomas Schmitt +Copyright (c) 2011 \- 2014 Thomas Schmitt .br Permission is granted to distribute this text freely. It shall only be modified in sync with the technical properties of xorriso. If you make use diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index 583d7a8f..a3f609a0 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -7,7 +7,7 @@ START-INFO-DIR-ENTRY END-INFO-DIR-ENTRY xorrisofs - Emulation of ISO 9660 program mkisofs by program xorriso - Copyright (C) 2011 - 2013 Thomas Schmitt + Copyright (C) 2011 - 2014 Thomas Schmitt Permission is granted to distrubute this text freely. @@ -1183,6 +1183,24 @@ and also not combinable with MBR, GPT, or APM. number to byte 0x228. The size is written as 32 bit big-endian number to byte 0x230. +-hppa-cmdline text + Set the PALO command line for HP-PA. Up to 127 characters are + permitted. + Note that if one of the -hppa options is given, then the other four + must be given with valid parameters, too. + +-hppa-bootloader iso_rr_path + Designate the given path as HP-PA bootloader file. + +-hppa-kernel-32 iso_rr_path + Designate the given path as HP-PA 32 bit kernel file. + +-hppa-kernel-64 iso_rr_path + Designate the given path as HP-PA 64 bit kernel file. + +-hppa-ramdisk iso_rr_path + Designate the given path as HP-PA RAM disk file. +  File: xorrisofs.info, Node: Charset, Next: Jigdo, Prev: SystemArea, Up: Options @@ -1760,7 +1778,7 @@ for libburnia-project.org 10.2 Copyright ============== -Copyright (c) 2011 - 2013 Thomas Schmitt +Copyright (c) 2011 - 2014 Thomas Schmitt Permission is granted to distribute this text freely. It shall only be modified in sync with the technical properties of xorriso. If you make use of the license to derive modified versions of xorriso then you are @@ -1897,6 +1915,11 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T (line 16) * -hide-rr-moved set deep directory relocation target: SetExtras. (line 64) +* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 215) +* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 209) +* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 218) +* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 221) +* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 224) * -input-charset set character set of disk file names: Charset. (line 17) * -iso-level define ISO 9660 limitations: SetCompl. (line 7) @@ -2026,6 +2049,11 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) * Bootability, control, -B, -sparc-boot: SystemArea. (line 184) * Bootability, control, -e: Bootable. (line 50) +* Bootability, control, -hppa-bootloader: SystemArea. (line 215) +* Bootability, control, -hppa-cmdline: SystemArea. (line 209) +* Bootability, control, -hppa-kernel_32: SystemArea. (line 218) +* Bootability, control, -hppa-kernel_64: SystemArea. (line 221) +* Bootability, control, -hppa-ramdisk: SystemArea. (line 224) * Bootability, control, -mips-boot: SystemArea. (line 171) * Bootability, control, -mipsel-boot: SystemArea. (line 178) * Bootability, El Torito section id string, -eltorito-id: Bootable. @@ -2208,22 +2236,22 @@ Node: SetHide30412 Node: ImageId31720 Node: Bootable35888 Node: SystemArea40882 -Node: Charset51179 -Node: Jigdo52205 -Node: Miscellaneous56472 -Node: Examples58116 -Node: ExSimple58602 -Node: ExGraft59081 -Node: ExMkisofs60328 -Node: ExGrowisofs61581 -Node: ExIncBackup62753 -Node: ExIncBckAcc65861 -Node: ExBootable67537 -Node: Files69629 -Node: Seealso70703 -Node: Bugreport71359 -Node: Legal71940 -Node: CommandIdx72835 -Node: ConceptIdx87537 +Node: Charset51745 +Node: Jigdo52771 +Node: Miscellaneous57038 +Node: Examples58682 +Node: ExSimple59168 +Node: ExGraft59647 +Node: ExMkisofs60894 +Node: ExGrowisofs62147 +Node: ExIncBackup63319 +Node: ExIncBckAcc66427 +Node: ExBootable68103 +Node: Files70195 +Node: Seealso71269 +Node: Bugreport71925 +Node: Legal72506 +Node: CommandIdx73401 +Node: ConceptIdx88468  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index fc11b6f6..4171544c 100644 --- a/xorriso/xorrisofs.texi +++ b/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.5, Dec 16, 2013" +@c man .TH XORRISOFS 1 "Version 1.3.5, Jan 14, 2014" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -68,7 +68,7 @@ @copying xorrisofs - Emulation of ISO 9660 program mkisofs by program xorriso -Copyright @copyright{} 2011 - 2013 Thomas Schmitt +Copyright @copyright{} 2011 - 2014 Thomas Schmitt @quotation Permission is granted to distrubute this text freely. @@ -1622,6 +1622,34 @@ 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 127 characters are permitted. +@* +Note that if one of the -hppa options is given, then the other four +must be given with valid parameters, too. +@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. @end table @c man .TP @c man .B Character sets: @@ -2441,7 +2469,7 @@ Thomas Schmitt for libburnia-project.org @c man .SH COPYRIGHT @section Copyright -Copyright (c) 2011 - 2013 Thomas Schmitt +Copyright (c) 2011 - 2014 Thomas Schmitt @* Permission is granted to distribute this text freely. It shall only be modified in sync with the technical properties of xorriso. If you make use