libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New -as mkisofs option -hppa-hdrversion

Browse Source
This commit is contained in:
Thomas Schmitt 2014-01-16 11:36:30 +00:00
parent d32230fd37
commit be38d186c0
5 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libisoburn/trunk/xorriso/emulators.c
View File

@ -636,7 +636,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-hfsplus-block-size", "-apm-block-size", "--grub2-mbr", "-hfsplus-block-size", "-apm-block-size", "--grub2-mbr",
"--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns", "--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns",
"-hppa-bootloader", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64", "-hppa-bootloader", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64",
"-hppa-ramdisk", "-hppa-ramdisk", "-hppa-hdrversion",
"" ""
}; };
static char arg2_options[][41]= { static char arg2_options[][41]= {
@ -860,6 +860,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -hppa-kernel-64 FILE Set hppa 64-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-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-ramdisk FILE Set hppa ramdisk file name (relative to image root)",
" -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5",
" --grub2-sparc-core FILE Set path of core file for disk label patching", " --grub2-sparc-core FILE Set path of core file for disk label patching",
" -efi-boot-part DISKFILE|--efi-boot-image", " -efi-boot-part DISKFILE|--efi-boot-image",
" Set data source for EFI System Partition", " Set data source for EFI System Partition",
@ -1163,7 +1164,7 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
int argc, char **argv, int flag) int argc, char **argv, int flag)
{ {
int ret, i, j, was_path= 0, was_other_option= 0, mem_graft_points, mem; int ret, i, j, was_path= 0, was_other_option= 0, mem_graft_points, mem;
int do_print_size= 0, fd, idx, iso_level= -1; int do_print_size= 0, fd, idx, iso_level= -1, palohdrversion;
int was_failure= 0, fret, lower_r= 0, zero= 0; int was_failure= 0, fret, lower_r= 0, zero= 0;
int dir_mode= -1, file_mode= -1, count, partition_number; int dir_mode= -1, file_mode= -1, count, partition_number;
int allow_dir_id_ext= -1; int allow_dir_id_ext= -1;
@ -2425,7 +2426,10 @@ problem_handler_2:;
goto not_enough_args; goto not_enough_args;
i++; i++;
sprintf(sfe, "-as mkisofs %s %s", argpt, argv[i]); sprintf(sfe, "-as mkisofs %s %s", argpt, argv[i]);
ret= Xorriso_coordinate_system_area(xorriso, 4, 0, sfe, 0); palohdrversion= (xorriso->system_area_options >> 2) & 0x3f;
if(palohdrversion != 4)
palohdrversion= 5;
ret= Xorriso_coordinate_system_area(xorriso, palohdrversion, 0, sfe, 0);
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
ret= Xorriso_set_hppa_boot_parm(xorriso, argv[i], argpt + 6, 0); ret= Xorriso_set_hppa_boot_parm(xorriso, argv[i], argpt + 6, 0);

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2014.01.16.113247" #define Xorriso_timestamP "2014.01.16.113503"

13
libisoburn/trunk/xorriso/xorrisofs.1
View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISOFS 1 "Version 1.3.5, Jan 14, 2014" .TH XORRISOFS 1 "Version 1.3.5, Jan 15, 2014"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -1207,10 +1207,11 @@ 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. The size is written as 32 bit big\-endian number to byte 0x230.
.TP .TP
\fB\-hppa-cmdline\fR text \fB\-hppa-cmdline\fR text
Set the PALO command line for HP\-PA. Up to 127 characters are permitted. 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 .br
Note that if one of the \-hppa options is given, then the other four Note that the first five \-hppa options are mandatory, if any of the \-hppa
must be given with valid parameters, too. options is given. Only option \-hppa\-hdrversion is allowed to be missing.
.TP .TP
\fB\-hppa-bootloader\fR iso_rr_path \fB\-hppa-bootloader\fR iso_rr_path
Designate the given path as HP\-PA bootloader file. Designate the given path as HP\-PA bootloader file.
@ -1224,6 +1225,10 @@ Designate the given path as HP\-PA 64 bit kernel file.
\fB\-hppa-ramdisk\fR iso_rr_path \fB\-hppa-ramdisk\fR iso_rr_path
Designate the given path as HP\-PA RAM disk file. Designate the given path as HP\-PA RAM disk file.
.TP .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: .B Character sets:
.PP .PP
Character sets should not matter as long as only english alphanumeric Character sets should not matter as long as only english alphanumeric

65
libisoburn/trunk/xorriso/xorrisofs.info
View File

@ -1184,10 +1184,11 @@ and also not combinable with MBR, GPT, or APM.
number to byte 0x230. number to byte 0x230.
-hppa-cmdline text -hppa-cmdline text
Set the PALO command line for HP-PA. Up to 127 characters are Set the PALO command line for HP-PA. Up to 1023 characters are
permitted. permitted by default. With -hppa-hdrversion 4 the limit is 127.
Note that if one of the -hppa options is given, then the other four Note that the first five -hppa options are mandatory, if any of
must be given with valid parameters, too. the -hppa options is given. Only option -hppa-hdrversion is
allowed to be missing.
-hppa-bootloader iso_rr_path -hppa-bootloader iso_rr_path
Designate the given path as HP-PA bootloader file. Designate the given path as HP-PA bootloader file.
@ -1201,6 +1202,10 @@ and also not combinable with MBR, GPT, or APM.
-hppa-ramdisk iso_rr_path -hppa-ramdisk iso_rr_path
Designate the given path as HP-PA RAM disk file. Designate the given path as HP-PA RAM disk file.
-hppa-hdrversion number
Choose between PALO header version 5 (default) and version 4. For
the appropriate value see in PALO source code: PALOHDRVERSION.
 
File: xorrisofs.info, Node: Charset, Next: Jigdo, Prev: SystemArea, Up: Options File: xorrisofs.info, Node: Charset, Next: Jigdo, Prev: SystemArea, Up: Options
@ -1915,11 +1920,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
(line 16) (line 16)
* -hide-rr-moved set deep directory relocation target: SetExtras. * -hide-rr-moved set deep directory relocation target: SetExtras.
(line 64) (line 64)
* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 215) * -hppa-bootloader HP-PA bootloader file: SystemArea. (line 216)
* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 209) * -hppa-cmdline HP-PA PALO command line: SystemArea. (line 209)
* -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 218) * -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 228)
* -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 221) * -hppa-kernel_32 HP-PA kernel_32 file: SystemArea. (line 219)
* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 224) * -hppa-kernel_64 HP-PA kernel_64 file: SystemArea. (line 222)
* -hppa-ramdisk HP-PA ramdisk file: SystemArea. (line 225)
* -input-charset set character set of disk file names: Charset. * -input-charset set character set of disk file names: Charset.
(line 17) (line 17)
* -iso-level define ISO 9660 limitations: SetCompl. (line 7) * -iso-level define ISO 9660 limitations: SetCompl. (line 7)
@ -2049,11 +2055,12 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Bootability, control, -b, -eltorito-boot: Bootable. (line 32) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32)
* Bootability, control, -B, -sparc-boot: SystemArea. (line 184) * Bootability, control, -B, -sparc-boot: SystemArea. (line 184)
* Bootability, control, -e: Bootable. (line 50) * Bootability, control, -e: Bootable. (line 50)
* Bootability, control, -hppa-bootloader: SystemArea. (line 215) * Bootability, control, -hppa-bootloader: SystemArea. (line 216)
* Bootability, control, -hppa-cmdline: SystemArea. (line 209) * Bootability, control, -hppa-cmdline: SystemArea. (line 209)
* Bootability, control, -hppa-kernel_32: SystemArea. (line 218) * Bootability, control, -hppa-hdrversion: SystemArea. (line 228)
* Bootability, control, -hppa-kernel_64: SystemArea. (line 221) * Bootability, control, -hppa-kernel_32: SystemArea. (line 219)
* Bootability, control, -hppa-ramdisk: SystemArea. (line 224) * Bootability, control, -hppa-kernel_64: SystemArea. (line 222)
* Bootability, control, -hppa-ramdisk: SystemArea. (line 225)
* Bootability, control, -mips-boot: SystemArea. (line 171) * Bootability, control, -mips-boot: SystemArea. (line 171)
* Bootability, control, -mipsel-boot: SystemArea. (line 178) * Bootability, control, -mipsel-boot: SystemArea. (line 178)
* Bootability, El Torito section id string, -eltorito-id: Bootable. * Bootability, El Torito section id string, -eltorito-id: Bootable.
@ -2236,22 +2243,22 @@ Node: SetHide30412
Node: ImageId31720 Node: ImageId31720
Node: Bootable35888 Node: Bootable35888
Node: SystemArea40882 Node: SystemArea40882
Node: Charset51745 Node: Charset52006
Node: Jigdo52771 Node: Jigdo53032
Node: Miscellaneous57038 Node: Miscellaneous57299
Node: Examples58682 Node: Examples58943
Node: ExSimple59168 Node: ExSimple59429
Node: ExGraft59647 Node: ExGraft59908
Node: ExMkisofs60894 Node: ExMkisofs61155
Node: ExGrowisofs62147 Node: ExGrowisofs62408
Node: ExIncBackup63319 Node: ExIncBackup63580
Node: ExIncBckAcc66427 Node: ExIncBckAcc66688
Node: ExBootable68103 Node: ExBootable68364
Node: Files70195 Node: Files70456
Node: Seealso71269 Node: Seealso71530
Node: Bugreport71925 Node: Bugreport72186
Node: Legal72506 Node: Legal72767
Node: CommandIdx73401 Node: CommandIdx73662
Node: ConceptIdx88468 Node: ConceptIdx88802
 
End Tag Table End Tag Table

15
libisoburn/trunk/xorriso/xorrisofs.texi
View File

@ -50,7 +50,7 @@
@c man .\" First parameter, NAME, should be all caps @c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @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 .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISOFS 1 "Version 1.3.5, Jan 14, 2014" @c man .TH XORRISOFS 1 "Version 1.3.5, Jan 15, 2014"
@c man .\" Please adjust this date whenever revising the manpage. @c man .\" Please adjust this date whenever revising the manpage.
@c man .\" @c man .\"
@c man .\" Some roff macros, for reference: @c man .\" Some roff macros, for reference:
@ -1626,10 +1626,11 @@ The size is written as 32 bit big-endian number to byte 0x230.
@item -hppa-cmdline text @item -hppa-cmdline text
@kindex -hppa-cmdline HP-PA PALO command line @kindex -hppa-cmdline HP-PA PALO command line
@cindex Bootability, control, -hppa-cmdline @cindex Bootability, control, -hppa-cmdline
Set the PALO command line for HP-PA. Up to 127 characters are permitted. 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 if one of the -hppa options is given, then the other four Note that the first five -hppa options are mandatory, if any of the -hppa
must be given with valid parameters, too. options is given. Only option -hppa-hdrversion is allowed to be missing.
@c man .TP @c man .TP
@item -hppa-bootloader iso_rr_path @item -hppa-bootloader iso_rr_path
@kindex -hppa-bootloader HP-PA bootloader file @kindex -hppa-bootloader HP-PA bootloader file
@ -1650,6 +1651,12 @@ Designate the given path as HP-PA 64 bit kernel file.
@kindex -hppa-ramdisk HP-PA ramdisk file @kindex -hppa-ramdisk HP-PA ramdisk file
@cindex Bootability, control, -hppa-ramdisk @cindex Bootability, control, -hppa-ramdisk
Designate the given path as HP-PA RAM disk file. 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 @end table
@c man .TP @c man .TP
@c man .B Character sets: @c man .B Character sets: