OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2936 Commits
1 Branch
0 Tags
34 MiB
Tree: eb46ea7ebd
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'eb46ea7ebd'
${ noResults }
rocklinux/package/base/cdrtools/chrp-boot.patch

225 lines
7.2 KiB
Raw Normal View History

fake: cdrtools: add an option to mkisofs that is used in the powerpc boot stuff, it makes creating chrp-bootcds possible. [2004090305052913497] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4136 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. diff -ur cdrtools-2.00.3/mkisofs/mac_label.c cdrtools-2.00.3-local/mkisofs/mac_label.c
  2. --- cdrtools-2.00.3/mkisofs/mac_label.c 2002-05-20 11:58:11.000000000 +0100
  3. +++ cdrtools-2.00.3-local/mkisofs/mac_label.c 2003-07-30 21:23:28.000000000 +0100
  4. @@ -64,16 +64,46 @@
  5. struct directory_entry *de;
  6. int i,
  7. block,
  8. - size;
  9. + size,
  10. + entry = 0;
  11. MacLabel *mac_label = (MacLabel *) ml;
  13. if (verbose > 1) {
  14. fprintf(stderr, "Creating %d PReP boot partition(s)\n",
  15. - use_prep_boot);
  16. + use_prep_boot + use_chrp_boot);
  17. }
  18. mac_label->fdiskMagic[0] = fdiskMagic0;
  19. mac_label->fdiskMagic[1] = fdiskMagic1;
  21. + if (use_chrp_boot) {
  22. + fprintf(stderr, "CHRP boot partition 1\n");
  23. +
  24. + mac_label->image[entry].boot = 0x80;
  25. +
  26. + mac_label->image[entry].CHSstart[0] = 0xff;
  27. + mac_label->image[entry].CHSstart[1] = 0xff;
  28. + mac_label->image[entry].CHSstart[2] = 0xff;
  29. +
  30. + mac_label->image[entry].type = chrpPartType; /* 0x96 */
  31. +
  32. + mac_label->image[entry].CHSend[0] = 0xff;
  33. + mac_label->image[entry].CHSend[1] = 0xff;
  34. + mac_label->image[entry].CHSend[2] = 0xff;
  35. +
  36. + mac_label->image[entry].startSect[0] = 0;
  37. + mac_label->image[entry].startSect[1] = 0;
  38. + mac_label->image[entry].startSect[2] = 0;
  39. + mac_label->image[entry].startSect[3] = 0;
  40. +
  41. + size = (last_extent - session_start) * 2048 / 512;
  42. + mac_label->image[entry].size[0] = size & 0xff;
  43. + mac_label->image[entry].size[1] = (size >> 8) & 0xff;
  44. + mac_label->image[entry].size[2] = (size >> 16) & 0xff;
  45. + mac_label->image[entry].size[3] = (size >> 24) & 0xff;
  46. +
  47. + ++entry;
  48. + }
  49. +
  50. for (i = 0; i < use_prep_boot; i++) {
  51. de = search_tree_file(root, prep_boot_image[i]);
  52. if (!de) {
  53. @@ -88,18 +118,42 @@
  54. fprintf(stderr, "PReP boot partition %d is \"%s\"\n",
  55. i + 1, prep_boot_image[i]);
  57. + mac_label->image[entry].boot = 0x80;
  58. +
  59. + mac_label->image[entry].CHSstart[0] = 0xff;
  60. + mac_label->image[entry].CHSstart[1] = 0xff;
  61. + mac_label->image[entry].CHSstart[2] = 0xff;
  62. +
  63. + mac_label->image[entry].type = prepPartType; /* 0x41 */
  64. +
  65. + mac_label->image[entry].CHSend[0] = 0xff;
  66. + mac_label->image[entry].CHSend[1] = 0xff;
  67. + mac_label->image[entry].CHSend[2] = 0xff;
  68. +
  69. /* deal with endianess */
  70. - mac_label->image[i].type = prepPartType; /* 0x41 */
  71. - mac_label->image[i].startSect[0] = block & 0xff;
  72. - mac_label->image[i].startSect[1] = (block >> 8) & 0xff;
  73. - mac_label->image[i].startSect[2] = (block >> 16) & 0xff;
  74. - mac_label->image[i].startSect[3] = (block >> 24) & 0xff;
  75. - mac_label->image[i].size[0] = size & 0xff;
  76. - mac_label->image[i].size[1] = (size >> 8) & 0xff;
  77. - mac_label->image[i].size[2] = (size >> 16) & 0xff;
  78. - mac_label->image[i].size[3] = (size >> 24) & 0xff;
  79. + mac_label->image[entry].startSect[0] = block & 0xff;
  80. + mac_label->image[entry].startSect[1] = (block >> 8) & 0xff;
  81. + mac_label->image[entry].startSect[2] = (block >> 16) & 0xff;
  82. + mac_label->image[entry].startSect[3] = (block >> 24) & 0xff;
  83. +
  84. + mac_label->image[entry].size[0] = size & 0xff;
  85. + mac_label->image[entry].size[1] = (size >> 8) & 0xff;
  86. + mac_label->image[entry].size[2] = (size >> 16) & 0xff;
  87. + mac_label->image[entry].size[3] = (size >> 24) & 0xff;
  88. +
  89. + ++entry;
  90. }
  91. + while (entry < 4) {
  92. + mac_label->image[entry].CHSstart[0] = 0xff;
  93. + mac_label->image[entry].CHSstart[1] = 0xff;
  94. + mac_label->image[entry].CHSstart[2] = 0xff;
  95. +
  96. + mac_label->image[entry].CHSend[0] = 0xff;
  97. + mac_label->image[entry].CHSend[1] = 0xff;
  98. + mac_label->image[entry].CHSend[2] = 0xff;
  100. + ++entry;
  101. + }
  102. }
  104. #endif /* PREP_BOOT */
  105. diff -ur cdrtools-2.00.3/mkisofs/mac_label.h cdrtools-2.00.3-local/mkisofs/mac_label.h
  106. --- cdrtools-2.00.3/mkisofs/mac_label.h 2000-03-18 18:23:55.000000000 +0000
  107. +++ cdrtools-2.00.3-local/mkisofs/mac_label.h 2003-07-23 12:49:59.000000000 +0100
  108. @@ -37,6 +37,7 @@
  109. #ifdef PREP_BOOT
  110. struct fdiskPartition {
  111. #define prepPartType 0x41
  112. +#define chrpPartType 0x96
  113. unsigned char boot; /* bootable flag; not used */
  114. unsigned char CHSstart[3]; /* start CHS; not used */
  115. unsigned char type; /* Partition type, = 0x41 (PReP bootable) */
  116. diff -ur cdrtools-2.00.3/mkisofs/mkisofs.c cdrtools-2.00.3-local/mkisofs/mkisofs.c
  117. --- cdrtools-2.00.3/mkisofs/mkisofs.c 2003-05-15 15:12:44.000000000 +0100
  118. +++ cdrtools-2.00.3-local/mkisofs/mkisofs.c 2003-07-30 21:24:16.000000000 +0100
  119. @@ -197,7 +197,7 @@
  120. #ifdef PREP_BOOT
  121. char *prep_boot_image[4];
  122. int use_prep_boot = 0;
  123. -
  124. +int use_chrp_boot = 0;
  125. #endif /* PREP_BOOT */
  126. #endif /* APPLE_HYB */
  128. @@ -401,6 +401,8 @@
  129. #define OPTION_HFS_BLESS 2040
  130. #define OPTION_HFS_PARMS 2041
  132. +#define OPTION_CHRP_BOOT 2042
  133. +
  134. #endif /* APPLE_HYB */
  136. static int save_pname = 0;
  137. @@ -661,6 +663,8 @@
  138. #ifdef PREP_BOOT
  139. {{"prep-boot", required_argument, NULL, OPTION_PREP_BOOT},
  140. '\0', "FILE", "PReP boot image file -- up to 4 are allowed", ONE_DASH},
  141. + {{"chrp-boot", no_argument, NULL, OPTION_CHRP_BOOT},
  142. + '\0', NULL, "Add CHRP boot header", ONE_DASH},
  143. #endif /* PREP_BOOT */
  144. {{"cap", no_argument, NULL, OPTION_CAP},
  145. '\0', NULL, "Look for AUFS CAP Macintosh files", TWO_DASHES},
  146. @@ -2073,13 +2077,13 @@
  147. #ifdef PREP_BOOT
  148. case OPTION_PREP_BOOT:
  149. use_prep_boot++;
  150. - if (use_prep_boot > 4) {
  151. + if (use_prep_boot > 4 - use_chrp_boot) {
  152. #ifdef USE_LIBSCHILY
  153. comerrno(EX_BAD,
  154. - "Maximum of 4 PReP boot images are allowed\n");
  155. + "Maximum of 4 partition entries are allowed\n");
  156. #else
  157. fprintf(stderr,
  158. - "Maximum of 4 PReP boot images are allowed\n");
  159. + "Maximum of 4 partition entries are allowed\n");
  160. #endif
  161. exit(1);
  162. }
  163. @@ -2096,6 +2100,21 @@
  164. exit(1);
  165. }
  166. break;
  167. + case OPTION_CHRP_BOOT:
  168. + if (use_chrp_boot)
  169. + break; /* silently allow duplicates */
  170. + use_chrp_boot = 1;
  171. + if (use_prep_boot > 3) {
  172. +#ifdef USE_LIBSCHILY
  173. + comerrno(EX_BAD,
  174. + "Maximum of 4 partition entries are allowed\n");
  175. +#else
  176. + fprintf(stderr,
  177. + "Maximum of 4 partition entries are allowed\n");
  178. +#endif
  179. + exit(1);
  180. + }
  181. + break;
  182. #endif /* PREP_BOOT */
  183. #endif /* APPLE_HYB */
  184. default:
  185. @@ -2957,7 +2976,7 @@
  186. */
  187. #ifdef APPLE_HYB
  188. #ifdef PREP_BOOT
  189. - if (apple_hyb || use_prep_boot)
  190. + if (apple_hyb || use_prep_boot || use_chrp_boot)
  191. #else /* PREP_BOOT */
  192. if (apple_hyb)
  193. #endif /* PREP_BOOT */
  194. diff -ur cdrtools-2.00.3/mkisofs/mkisofs.h cdrtools-2.00.3-local/mkisofs/mkisofs.h
  195. --- cdrtools-2.00.3/mkisofs/mkisofs.h 2002-12-07 19:59:42.000000000 +0000
  196. +++ cdrtools-2.00.3-local/mkisofs/mkisofs.h 2003-07-23 12:54:29.000000000 +0100
  197. @@ -393,6 +393,7 @@
  198. #ifdef PREP_BOOT
  199. extern char *prep_boot_image[4];
  200. extern int use_prep_boot;
  201. +extern int use_chrp_boot;
  203. #endif /* PREP_BOOT */
  204. #endif /* APPLE_HYB */
  205. diff -ur cdrtools-2.00.3/mkisofs/write.c cdrtools-2.00.3-local/mkisofs/write.c
  206. --- cdrtools-2.00.3/mkisofs/write.c 2002-12-23 14:16:45.000000000 +0000
  207. +++ cdrtools-2.00.3-local/mkisofs/write.c 2003-07-30 21:17:53.000000000 +0100
  208. @@ -2131,7 +2131,7 @@
  209. if (apple_hyb)
  210. hfs_file_gen(start_extent);
  211. #ifdef PREP_BOOT
  212. - else if (use_prep_boot)
  213. + else if (use_prep_boot || use_chrp_boot)
  214. gen_prepboot();
  215. #endif /* PREP_BOOT */
  216. #endif /* APPLE_HYB */
  217. @@ -2290,7 +2290,7 @@
  218. /* reserve space for the label partition - if it is needed */
  219. #ifdef PREP_BOOT
  220. /* a PReP bootable partition needs the map.. */
  221. - if (gen_pt || use_prep_boot)
  222. + if (gen_pt || use_prep_boot || use_chrp_boot)
  223. #else
  224. if (gen_pt)
  225. #endif /* PREP_BOOT */