Browse Source

Re-enabled HP-PA PALO boot preparations

release-1.5.4.branch
Thomas Schmitt 7 years ago
parent
commit
e6e037f87e
  1. 6
      libisofs/image.c
  2. 20
      libisofs/libisofs.h
  3. 2
      libisofs/libisofs.ver
  4. 2
      libisofs/system_area.c

6
libisofs/image.c

@ -146,13 +146,7 @@ void iso_image_unref(IsoImage *image)
iso_image_give_up_mips_boot(image, 0);
if (image->sparc_core_node != NULL)
iso_node_unref((IsoNode *) image->sparc_core_node);
#ifdef Libisofs_enable_unreleased_hppa_palO
iso_image_set_hppa_palo(image, NULL, NULL, NULL, NULL, NULL, 1);
#endif
free(image->volset_id);
free(image->volume_id);
free(image->publisher_id);

20
libisofs/libisofs.h

@ -2136,15 +2136,6 @@ int iso_write_opts_set_overwrite_buf(IsoWriteOpts *opts, uint8_t *overwrite);
*/
int iso_write_opts_set_fifo_size(IsoWriteOpts *opts, size_t fifo_size);
/*
* Release 1.3.6 contains an incomplete implementation of preparations for the
* HP-PA bootloader PALO. Its header version 5 is not completely defined yet.
* To enable the code for these preparations, you have to define the macro
* Libisofs_enable_unreleased_hppa_palO
* and to insert into libisofs/libisofs.ver the lines
* iso_image_set_hppa_palo;
* iso_image_get_hppa_palo;
*/
/*
* Attach 32 kB of binary data which shall get written to the first 32 kB
* of the ISO image, the ECMA-119 System Area. This space is intended for
@ -2195,13 +2186,11 @@ int iso_write_opts_set_fifo_size(IsoWriteOpts *opts, size_t fifo_size);
* This will overwrite the first 512 bytes of the submitted
* data.
* 4= HP-PA PALO boot sector version 4 for HP PA-RISC
* <<< only ifdef Libisofs_enable_unreleased_hppa_palO
* @since 1.3.8
* Suitable for older PALO of e.g. Debian 4 and 5.
* Submit all five parameters of iso_image_set_hppa_palo():
* cmdline, bootloader, kernel_32, kernel_64, ramdisk
* 5= HP-PA PALO boot sector version 5 for HP PA-RISC
* <<< only ifdef Libisofs_enable_unreleased_hppa_palO
* @since 1.3.8
* Suitable for newer PALO, where PALOHDRVERSION in
* lib/common.h is defined as 5.
@ -3757,13 +3746,6 @@ int iso_image_set_sparc_core(IsoImage *img, IsoFile *sparc_core, int flag);
*/
int iso_image_get_sparc_core(IsoImage *img, IsoFile **sparc_core, int flag);
#ifdef Libisofs_enable_unreleased_hppa_palO
/* <<< This API call and the implementation of its consequences are not yet
stable. So it gets excluded from releases.
*/
/**
* Define a command line and submit the paths of four mandatory files for
* production of a HP-PA PALO boot sector for PA-RISC machines.
@ -3819,8 +3801,6 @@ int iso_image_set_hppa_palo(IsoImage *img, char *cmdline, char *bootloader,
int iso_image_get_hppa_palo(IsoImage *img, char **cmdline, char **bootloader,
char **kernel_32, char **kernel_64, char **ramdisk);
#endif /* Libisofs_enable_unreleased_hppa_palO */
/**
* Increments the reference counting of the given node.
*

2
libisofs/libisofs.ver

@ -97,6 +97,7 @@ iso_image_get_bootcat;
iso_image_get_boot_image;
iso_image_get_copyright_file_id;
iso_image_get_data_preparer_id;
iso_image_get_hppa_palo;
iso_image_get_mips_boot_files;
iso_image_get_msg_id;
iso_image_get_publisher_id;
@ -124,6 +125,7 @@ iso_image_set_boot_catalog_weight;
iso_image_set_boot_image;
iso_image_set_copyright_file_id;
iso_image_set_data_preparer_id;
iso_image_set_hppa_palo;
iso_image_set_ignore_aclea;
iso_image_set_publisher_id;
iso_image_set_sparc_core;

2
libisofs/system_area.c

@ -887,8 +887,6 @@ static int make_hppa_palo_sector(Ecma119Image *t, uint8_t *buf, int hdrversion,
iso_msb(buf + 240, adr, 4);
iso_msb(buf + 244, len, 4);
/* >>> ??? iso_msb(buf + 248, ipl_entry, 4); */
if (hdrversion == 5) {
if (strlen(img->hppa_cmdline) > 1023) {
iso_msg_submit(img->id, ISO_HPPA_PALO_CMDLEN, 0,

Loading…
Cancel
Save